diff options
| -rw-r--r-- | init.vim | 8 | ||||
| -rw-r--r-- | nvcode.Dockerfile (renamed from nvim-mach2.Dockerfile) | 0 | ||||
| -rw-r--r-- | plug-config/start-screen.vim | 11 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 1 | ||||
| -rw-r--r-- | vscode/windows.vim | 16 |
5 files changed, 21 insertions, 15 deletions
@@ -10,7 +10,6 @@ source $HOME/.config/nvim/vim-plug/plugins.vim source $HOME/.config/nvim/general/settings.vim source $HOME/.config/nvim/general/functions.vim source $HOME/.config/nvim/keys/mappings.vim - source $HOME/.config/nvim/plug-config/vim-commentary.vim if exists('g:vscode') @@ -21,7 +20,8 @@ else " Themes source $HOME/.config/nvim/themes/syntax.vim - source $HOME/.config/nvim/themes/onedark.vim + " source $HOME/.config/nvim/themes/onedark.vim + source $HOME/.config/nvim/themes/material.vim source $HOME/.config/nvim/themes/airline.vim " Plugin Configuration @@ -61,3 +61,7 @@ endif if !empty(glob("~/.config/nvim/paths.vim")) source $HOME/.config/nvim/paths.vim endif + +" Better nav for omnicomplete TODO figure out why this is being overridden +inoremap <expr> <c-j> ("\<C-n>") +inoremap <expr> <c-k> ("\<C-p>") diff --git a/nvim-mach2.Dockerfile b/nvcode.Dockerfile index fa3b89ab..fa3b89ab 100644 --- a/nvim-mach2.Dockerfile +++ b/nvcode.Dockerfile diff --git a/plug-config/start-screen.vim b/plug-config/start-screen.vim index 28d7f649..95c81a29 100644 --- a/plug-config/start-screen.vim +++ b/plug-config/start-screen.vim @@ -1,11 +1,12 @@ let g:startify_custom_header = [ - \ ' _ __ _ __ ___ __ ___', - \ ' / |/ / __(_)_ _ / |/ /__ _____/ / |_ |', - \ ' / / |/ / / ` \ / /|_/ / _ `/ __/ _ \ / __/', - \ ' /_/|_/|___/_/_/_/_/ /_/ /_/\_,_/\__/_//_/ /____/', + \ ' _ ___ ________ __ ', + \ ' / | / / | / / ____/___ ____/ /__ ', + \ ' / |/ /| | / / / / __ \/ __ / _ \', + \ ' / /| / | |/ / /___/ /_/ / /_/ / __/', + \ ' /_/ |_/ |___/\____/\____/\__,_/\___/ ', \] - + let g:startify_session_dir = '~/.config/nvim/session' diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index a21db943..1e07a4da 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -46,6 +46,7 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'alvan/vim-closetag' " Themes Plug 'christianchiarulli/onedark.vim' + Plug 'kaicataldo/material.vim', { 'branch': 'main' } " Intellisense Plug 'neoclide/coc.nvim', {'branch': 'release'} " Status Line diff --git a/vscode/windows.vim b/vscode/windows.vim index def66822..e6ce55da 100644 --- a/vscode/windows.vim +++ b/vscode/windows.vim @@ -42,14 +42,14 @@ xnoremap <silent> <C-w>v :call <SID>split('v')<CR> nnoremap <silent> <C-w>n :call <SID>splitNew('h', '__vscode_new__')<CR> xnoremap <silent> <C-w>n :call <SID>splitNew('h', '__vscode_new__')<CR> -nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.focusBelowGroup')<CR> -xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.focusBelowGroup')<CR> -nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.focusAboveGroup')<CR> -xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.focusAboveGroup')<CR> -nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.focusLeftGroup')<CR> -xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.focusLeftGroup')<CR> -nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.focusRightGroup')<CR> -xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.focusRightGroup')<CR> +nnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> +xnoremap <silent> <C-j> :call VSCodeNotify('workbench.action.navigateDown')<CR> +nnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> +xnoremap <silent> <C-k> :call VSCodeNotify('workbench.action.navigateUp')<CR> +nnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> +xnoremap <silent> <C-h> :call VSCodeNotify('workbench.action.navigateLeft')<CR> +nnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> +xnoremap <silent> <C-l> :call VSCodeNotify('workbench.action.navigateRight')<CR> nnoremap <silent> <C-w>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> xnoremap <silent> <C-w>= :<C-u>call VSCodeNotify('workbench.action.evenEditorWidths')<CR> |