diff options
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/ginit.vim | 4 | ||||
| -rw-r--r-- | nvim/init.vim | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/nvim/ginit.vim b/nvim/ginit.vim index 3bf891f..f50fdd6 100644 --- a/nvim/ginit.vim +++ b/nvim/ginit.vim @@ -9,6 +9,10 @@ if exists("g:fvim_loaded") || exists("g:nvy") FVimCustomTitleBar v:true endif +if exists("g:nvy") + set guifont=LiterationMono\ Nerd\ Font\ Mono:h18 +endif + if exists("g:neovide") set guifont=LiterationMono\ Nerd\ Font\ Mono:h18 set linespace=-4 diff --git a/nvim/init.vim b/nvim/init.vim index f537d18..d5b1fd7 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -65,6 +65,9 @@ Plug 'deoplete-plugins/deoplete-lsp' Plug 'hrsh7th/cmp-vsnip' Plug 'hrsh7th/vim-vsnip' +" keymap help +Plug 'folke/which-key.nvim' + " Python Plug 'raimon49/requirements.txt.vim' @@ -118,6 +121,7 @@ Plug 'https://github.com/gbprod/nord.nvim' Plug 'ghifarit53/tokyonight-vim' Plug 'scottmckendry/cyberdream.nvim' Plug 'nyoom-engineering/oxocarbon.nvim' +Plug 'rebelot/kanagawa.nvim' "Icons, requires a nerd font Plug 'ryanoasis/vim-devicons' @@ -133,7 +137,7 @@ Plug 'hashivim/vim-terraform' call plug#end() set background=dark -let colorschemes = ['OceanicNext', 'afterglow', 'alduin', 'nord', 'edge', 'desert', 'despacio', 'onedark', 'evening', 'everforest', 'habamax', 'iceberg', 'oxocarbon', 'lunaperche', 'molokai', 'moon', 'mythos', 'cyberdream', 'orange-moon', 'pink-moon', 'quantum', 'retrobox', 'sceaduhelm', 'slate', 'sorbet', 'toast', 'tokyonight', 'vadelma', 'yellow-moon', 'zaibatsu'] +let colorschemes = ['OceanicNext', 'afterglow', 'alduin', 'nord', 'edge', 'desert', 'despacio', 'onedark', 'evening', 'everforest', 'habamax', 'iceberg', 'oxocarbon', 'lunaperche', 'molokai', 'moon', 'mythos', 'cyberdream', 'orange-moon', 'pink-moon', 'quantum', 'retrobox', 'sceaduhelm', 'kanagawa', 'sorbet', 'toast', 'tokyonight', 'vadelma', 'yellow-moon', 'zaibatsu'] "Randomly select a colorscheme based on current directory. Each project gets "it's own color- usually. @@ -173,7 +177,8 @@ let g:lua_complete_keywords=0 "au BufReadPost *.spec set syntax=lua "au BufReadPost *.etlua set syntax=html "Overwrite xolox:ftplugin's "Help" with shift-k -"au BufReadPost *.lua nunmap <buffer> K +au BufReadPost *.lua unmap <buffer> K +"au BufReadPost *.lua eval b:undo_ftplugin "au BufReadPost *.lua let g:lua_complete_omni=1 " GLSL au BufReadPost *.vs,*.fs set ft=glsl @@ -211,6 +216,8 @@ let mapleader=";" noremap <leader>c :call fzf#run(fzf#wrap({'sink': 'Git checkout', 'left':'20%', 'source': 'git branch \| tr -d " "' }))<Cr> noremap <leader>a :call fzf#run(fzf#wrap({'sink': 'git checkout', 'left':'50%', 'source': 'ag --nogroup --column --color --', 'preview-window':'up','preview':expand('<sfile>:p:h:h:h').'/bin/preview.sh'}))<Cr> +" which-key, helps finding keybinds +noremap <leader>w lua require("which-key").show({}) "Fuzzy sbt function! s:VTerm(command) |