Reorder .vimrc, join tab gang

1 files changed, 39 insertions, 36 deletions

diff --git a/.vimrc b/.vimrc
index 16b9df9..c9283c0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -45,45 +45,58 @@ filetype plugin indent on    " required
 " Put your non-Plugin stuff after this line
 
 syntax on
-set encoding=utf-8
-set fileformat=unix
+set encoding=utf-8 fileformat=unix
 set number
 
-set splitright
-set splitbelow
+set splitright splitbelow
 
-set foldmethod=indent
-set foldlevel=99
+set foldmethod=indent foldlevel=99
 
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set expandtab
-set autoindent
+set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab
+autocmd FileType json,toml,yaml,html    set ts=2 sw=2 sts=2 expandtab
+autocmd FileType python                 set ts=4 sw=4 sts=4 expandtab
+autocmd FileType c,cpp,asm              set ts=8 sw=8 sts=8 noexpandtab
+set autoindent smartindent
 
 set background=dark
 let g:airline_theme='onedark'
 
+" Popup menu colors
+set termguicolors
 highlight Pmenu     guibg=#282C34
 highlight PmenuSel  guibg=#61AFEF
 
+" Generic shortcuts
 inoremap <C-s> <esc>:w<CR>i<right>
+nnoremap <leader>\ :noh<CR>
+autocmd FileType python nnoremap <leader>b :!black %<CR>:e<CR>
 
-nnoremap <leader>n :noh<CR>
-nnoremap <leader>b :!black %<CR>:e<CR>
-
-nnoremap <leader>s :ToggleWorkspace<CR>
-let g:workspace_session_directory = $HOME . '/.vim/sessions/'
-let g:workspace_session_disable_on_args = 1
-let g:workspace_autosave = 0
+" ale
+nnoremap <leader>a :ALEToggle<CR>
 
+" telescope
 nnoremap <leader>f :Telescope find_files<CR>
 nnoremap <leader>g :Telescope live_grep<CR>
 nnoremap <leader>fb :Telescope buffers<CR>
 nnoremap <leader>fh :Telescope help_tags<CR>
 
-nnoremap <leader>c :Cmus<CR>
+" deoplete
+let g:deoplete#enable_at_startup = 1
+nnoremap <leader>d :call deoplete#toggle()<CR>
+
+" vimtex
+let g:vimtex_view_general_viewer = 'okular'
+let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
+let g:vimtex_compiler_method = 'latexmk'
+
+" nvim-tree
+nnoremap <C-e> :NvimTreeToggle<CR>
+nnoremap <leader>t :NvimTreeFocus<CR>
+nnoremap <leader>r :NvimTreeRefresh<CR>
+" a list of groups can be found at `:help nvim_tree_highlight`
+highlight NvimTreeFolderIcon guibg=blue
 
+" vim-pencil
 nnoremap <leader>p :PencilToggle<CR>
 let g:pencil#map#suspend_af = 'K'
 let g:pencil#textwidth = 74
@@ -93,23 +106,13 @@ augroup pencil
     autocmd FileType text         call pencil#init()
 augroup END
 
-nnoremap <leader>a :ALEToggle<CR>
-
-nnoremap <C-e> :NvimTreeToggle<CR>
-nnoremap <leader>t :NvimTreeFocus<CR>
-nnoremap <leader>r :NvimTreeRefresh<CR>
-" NvimTreeOpen, NvimTreeClose, NvimTreeFocus, NvimTreeFindFileToggle, and NvimTreeResize are also available if you need them
-
-set termguicolors " this variable must be enabled for colors to be applied properly
-
-" a list of groups can be found at `:help nvim_tree_highlight`
-highlight NvimTreeFolderIcon guibg=blue
-
 autocmd BufRead,BufNewFile *.qml setfiletype qml
 
-let g:vimtex_view_general_viewer = 'okular'
-let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex'
-let g:vimtex_compiler_method = 'latexmk'
+" vim-workspace
+nnoremap <leader>s :ToggleWorkspace<CR>
+let g:workspace_session_directory = $HOME . '/.vim/sessions/'
+let g:workspace_session_disable_on_args = 1
+let g:workspace_autosave = 0
 
-let g:deoplete#enable_at_startup = 1
-nnoremap <leader>d :call deoplete#toggle()<CR>
+" vim-cmus
+nnoremap <leader>c :Cmus<CR>