|
|
|
|
@ -5,11 +5,14 @@ if empty(glob(data_dir . '/autoload/plug.vim'))
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
call plug#begin()
|
|
|
|
|
Plug 'vim-airline/vim-airline'
|
|
|
|
|
|
|
|
|
|
" CSS-Color
|
|
|
|
|
Plug 'ap/vim-css-color'
|
|
|
|
|
|
|
|
|
|
"Surround
|
|
|
|
|
Plug 'tpope/vim-surround'
|
|
|
|
|
Plug 'tpope/vim-repeat'
|
|
|
|
|
|
|
|
|
|
" For snippets
|
|
|
|
|
Plug 'SirVer/ultisnips'
|
|
|
|
|
@ -74,6 +77,20 @@ nnoremap <Space> <nop>
|
|
|
|
|
let mapleader=" "
|
|
|
|
|
let maplocalleader=" "
|
|
|
|
|
|
|
|
|
|
" Colors
|
|
|
|
|
if has('termguicolors')
|
|
|
|
|
if &term =~ 'alacritty'
|
|
|
|
|
set t_8f=[38;2;%lu;%lu;%lum
|
|
|
|
|
set t_8b=[48;2;%lu;%lu;%lum
|
|
|
|
|
endif
|
|
|
|
|
set termguicolors
|
|
|
|
|
endif
|
|
|
|
|
let g:dark_transp_bg = 1
|
|
|
|
|
if has('nvim')
|
|
|
|
|
au ColorScheme * hi Normal ctermbg=none guibg=none|hi LineNr guibg=none ctermbg=none|hi Folded guibg=none ctermbg=none|hi NonText guibg=none ctermbg=none|hi SpecialKey guibg=none ctermbg=none|hi VertSplit guibg=none ctermbg=none|hi SignColumn guibg=none ctermbg=none|hi EndOfBuffer guibg=none ctermbg=none
|
|
|
|
|
endif
|
|
|
|
|
colorscheme fire
|
|
|
|
|
|
|
|
|
|
" Conceal options
|
|
|
|
|
hi clear Conceal
|
|
|
|
|
set conceallevel=2
|
|
|
|
|
@ -87,11 +104,11 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
|
|
|
|
|
" Fugitive Config
|
|
|
|
|
nnoremap <leader>gs :G<CR>
|
|
|
|
|
|
|
|
|
|
nnoremap <Enter> :nohl<Enter><Enter>
|
|
|
|
|
nnoremap <Enter> :nohl<CR><C-l><Enter>
|
|
|
|
|
|
|
|
|
|
set encoding=utf-8
|
|
|
|
|
|
|
|
|
|
set completeopt=menu,menuone,noselect
|
|
|
|
|
set completeopt=menu,menuone,noselect,noinsert
|
|
|
|
|
|
|
|
|
|
" VIFM
|
|
|
|
|
let g:loaded_netrw = 1
|
|
|
|
|
@ -117,7 +134,7 @@ if has("nvim")
|
|
|
|
|
autocmd BufWritePost ~/desktop/dwmblocks/blocks.h :term cd ~/desktop/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid -f dwmblocks > /dev/null 2> /dev/null ; }
|
|
|
|
|
else
|
|
|
|
|
autocmd BufWritePost ~/desktop/dwmblocks/blocks.h !cd ~/desktop/dwmblocks/; sudo make install && { killall -q dwmblocks;setsid dwmblocks > /dev/null 2> /dev/null & }
|
|
|
|
|
end
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
" Uncomment the following to have Vim load indentation rules and plugins
|
|
|
|
|
" according to the detected filetype.
|
|
|
|
|
@ -139,6 +156,7 @@ set incsearch " Incremental search
|
|
|
|
|
set autowrite " Automatically save before commands like :next and :make
|
|
|
|
|
set hidden " Hide buffers when they are abandoned
|
|
|
|
|
set mouse=a " Enable mouse usage (all modes)
|
|
|
|
|
set mousemodel=popup
|
|
|
|
|
set number " Enable line numbers
|
|
|
|
|
set relativenumber " Enable relative line numbers
|
|
|
|
|
set title " Changes terminal title when started
|
|
|
|
|
@ -148,7 +166,12 @@ noremap ; l
|
|
|
|
|
noremap l k
|
|
|
|
|
noremap k j
|
|
|
|
|
noremap j h
|
|
|
|
|
noremap h ;
|
|
|
|
|
|
|
|
|
|
noremap <C-W>j <C-\><C-N><C-W>h
|
|
|
|
|
noremap <C-W>k <C-\><C-N><C-W>j
|
|
|
|
|
noremap <C-W>l <C-\><C-N><C-W>k
|
|
|
|
|
noremap <C-W>; <C-\><C-N><C-W>l
|
|
|
|
|
|
|
|
|
|
" Terminal Settings
|
|
|
|
|
if has("nvim")
|
|
|
|
|
@ -164,10 +187,10 @@ if has("nvim")
|
|
|
|
|
" Allows for window navigation
|
|
|
|
|
tnoremap <C-W><C-W> <C-\><C-N><C-W><C-W>
|
|
|
|
|
tnoremap <C-W><C-N> <C-\><C-N>
|
|
|
|
|
tnoremap <C-W>h <C-\><C-N><C-W>h
|
|
|
|
|
tnoremap <C-W>j <C-\><C-N><C-W>j
|
|
|
|
|
tnoremap <C-W>k <C-\><C-N><C-W>k
|
|
|
|
|
tnoremap <C-W>l <C-\><C-N><C-W>l
|
|
|
|
|
tnoremap <C-W>j <C-\><C-N><C-W>h
|
|
|
|
|
tnoremap <C-W>k <C-\><C-N><C-W>j
|
|
|
|
|
tnoremap <C-W>l <C-\><C-N><C-W>k
|
|
|
|
|
tnoremap <C-W>; <C-\><C-N><C-W>l
|
|
|
|
|
tnoremap <C-W><left> <C-\><C-N><C-W><left>
|
|
|
|
|
tnoremap <C-W><down> <C-\><C-N><C-W><down>
|
|
|
|
|
tnoremap <C-W><up> <C-\><C-N><C-W><up>
|
|
|
|
|
|