xresources clean + vim

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 684ca1c..4665ec5 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -9,13 +9,11 @@
 syntax on
 set number
 set relativenumber
-" set hlsearch
 set incsearch
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
 set expandtab
-set formatoptions-=cro "disables auto comments
 
 " spell check
 setlocal spell
@@ -28,12 +26,17 @@ set conceallevel=2
 " Bindings
 let mapleader = ' '
 
+" File stuff
 " map <leader>e :Ex<cr>
 " map <leader>v :Vex<cr>
 map <leader>l :bn<cr>
 map <leader>h :bp<cr>
 map <leader>d :bd<cr>
 
+" View whitespace
+set lcs=space:·
+map <leader>s :set list!<cr>
+
 " colors
 hi Conceal ctermbg=Black
 hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
@@ -44,6 +47,13 @@ hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
 " let g:netrw_winsize = 25
 " let g:netrw_browse_split = 4
 
+" Templates
+augroup templates
+    autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
+    autocmd BufNewFile *.html 0r ~/.vim/templates/skeleton.html
+    autocmd BufNewFile *.rkt 0r ~/.vim/templates/skeleton.rkt
+augroup END
+
 " vim plug
 " this blob auto installs vim plug if it isnt already
 if empty(glob('~/.vim/autoload/plug.vim'))
@@ -52,6 +62,7 @@ if empty(glob('~/.vim/autoload/plug.vim'))
          autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
          endif
 
+" template stuff
 call plug#begin('~/.vim/plugged')
 
 Plug 'sirver/ultisnips'
@@ -61,6 +72,7 @@ Plug 'PietroPate/vim-tex-conceal'
 Plug 'vim-airline/vim-airline'
 Plug 'tpope/vim-commentary'
 Plug 'ptzz/lf.vim'
+Plug 'voldikss/vim-floaterm'
 " Plug 'ctrlpvim/ctrlp.vim'
 " Plug 'neoclide/coc.nvim', {'branch': 'release'}
 " Plug 'habamax/vim-godot'
@@ -93,3 +105,6 @@ let g:ctrlp_cmd='CtrlPTag'
 
 " Lf
 " let g:lf_replace_netrw = 1 " weird behavior rn
+
+" Run after plugins
+autocmd FileType * set formatoptions-=o