updates

smjure · Aug 29, 2020 · 3a93113 · 3a93113
1 parent d7d88e0
commit 3a93113
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/init.vim b/init.vim
@@ -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 → nvcode.Dockerfile b/nvim-mach2.Dockerfile → nvcode.Dockerfile
diff --git 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
@@ -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
@@ -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>