vscodium updates

smjure · Sep 2, 2020 · 9379982 · 9379982
1 parent f5aef47
commit 9379982
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 35 deletions.
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
@@ -0,0 +1 @@
+set wrap
diff --git a/init.vim b/init.vim
@@ -11,29 +11,29 @@ 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
+source $HOME/.config/nvim/plug-config/quickscope.vim
 
 if exists('g:vscode')
   " VS Code extension
-  source $HOME/.config/nvim/vscode/windows.vim
+  source $HOME/.config/nvim/vscode/settings.vim
   source $HOME/.config/nvim/plug-config/easymotion.vim
 else
 
   " Themes
   source $HOME/.config/nvim/themes/syntax.vim
   source $HOME/.config/nvim/themes/onedark.vim
-  " source $HOME/.config/nvim/themes/material.vim
   source $HOME/.config/nvim/themes/airline.vim
+  " source $HOME/.config/nvim/themes/material.vim
 
   " Plugin Configuration
   source $HOME/.config/nvim/keys/which-key.vim
+  source $HOME/.config/nvim/plug-config/rainbow.vim
   source $HOME/.config/nvim/plug-config/rnvimr.vim
   source $HOME/.config/nvim/plug-config/better-whitespace.vim
   source $HOME/.config/nvim/plug-config/fzf.vim
-  source $HOME/.config/nvim/plug-config/rainbow.vim
+  source $HOME/.config/nvim/plug-config/sneak.vim
   source $HOME/.config/nvim/plug-config/codi.vim
-  source $HOME/.config/nvim/plug-config/quickscope.vim
   source $HOME/.config/nvim/plug-config/vim-wiki.vim
-  source $HOME/.config/nvim/plug-config/sneak.vim
   source $HOME/.config/nvim/plug-config/coc.vim
   source $HOME/.config/nvim/plug-config/goyo.vim
   source $HOME/.config/nvim/plug-config/vim-rooter.vim
@@ -52,9 +52,9 @@ else
   source $HOME/.config/nvim/plug-config/asynctask.vim
   source $HOME/.config/nvim/plug-config/window-swap.vim
   source $HOME/.config/nvim/plug-config/markdown-preview.vim
+  luafile $HOME/.config/nvim/lua/plug-colorizer.lua
   " source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector
   " source $HOME/.config/nvim/plug-config/ale.vim
-  luafile $HOME/.config/nvim/lua/plug-colorizer.lua
 endif
 
 " Add paths to node and python here

diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
@@ -10,32 +10,34 @@ call plug#begin('~/.config/nvim/autoload/plugged')
 
     " Better Comments
     Plug 'tpope/vim-commentary'
-
-  if exists('g:vscode')
-    " Easy motion for VSCode
-    Plug 'asvetliakov/vim-easymotion'
-  else
-
     " Change dates fast
     Plug 'tpope/vim-speeddating'
     " Convert binary, hex, etc..
     Plug 'glts/vim-radical'
-    " Files
-    Plug 'tpope/vim-eunuch'
     " Repeat stuff
     Plug 'tpope/vim-repeat'
+    " Text Navigation
+    Plug 'unblevable/quick-scope'
+    " Useful for React Commenting 
+    Plug 'suy/vim-context-commentstring'
+    " highlight all matches under cursor
+    Plug 'RRethy/vim-illuminate'
+
+  if exists('g:vscode')
+    " Easy motion for VSCode
+    Plug 'asvetliakov/vim-easymotion'
+  else
+
+    " Sneak
+    Plug 'justinmk/vim-sneak'
     " Surround
     Plug 'tpope/vim-surround'
+    " Files
+    Plug 'tpope/vim-eunuch'
     " Have the file system follow you around
     Plug 'airblade/vim-rooter'
     " auto set indent settings
     Plug 'tpope/vim-sleuth'
-    " Text Navigation
-    Plug 'justinmk/vim-sneak'
-    Plug 'unblevable/quick-scope'
-    " Add some color
-    Plug 'norcalli/nvim-colorizer.lua'
-    Plug 'luochen1990/rainbow'
     " Better Syntax Support
     Plug 'sheerun/vim-polyglot'
     " Cool Icons
@@ -82,8 +84,6 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'mg979/vim-xtabline'
     " undo time travel
     Plug 'mbbill/undotree'
-    " highlight all matches under cursor
-    Plug 'RRethy/vim-illuminate'
     " Find and replace
     Plug 'ChristianChiarulli/far.vim'
     " Plug 'brooth/far.vim'
@@ -103,6 +103,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " Easily Create Gists
     Plug 'mattn/vim-gist'
     Plug 'mattn/webapi-vim'
+    " Colorizer
+    Plug 'norcalli/nvim-colorizer.lua'
+    " Rainbow brackets
+    Plug 'luochen1990/rainbow'
     " Async Linting Engine
     " TODO make sure to add ale config before plugin
     " Plug 'dense-analysis/ale'
@@ -112,8 +116,6 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     " TODO add this back in change from C-n
     " Plug 'mg979/vim-visual-multi', {'branch': 'master'}
     Plug 'moll/vim-bbye'
-    " Useful for React Commenting 
-    Plug 'suy/vim-context-commentstring'
     " Plugin Graveyard
 
     " jsx syntax support

diff --git a/vscode/windows.vim → vscode/settings.vim b/vscode/windows.vim → vscode/settings.vim
@@ -42,14 +42,6 @@ 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.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>
@@ -63,14 +55,21 @@ xnoremap <silent> <C-w>< :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<C
 nnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR>
 xnoremap <silent> <C-w>- :<C-u>call <SID>manageEditorSize(v:count, 'decrease')<CR>
 
+" Better Navigation
+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>
+
 " Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors
 xnoremap <silent> <C-/> :call Comment()<CR>
 nnoremap <silent> <C-/> :call Comment()<CR>
 
 nnoremap <silent> <C-w>_ :<C-u>call VSCodeNotify('workbench.action.toggleEditorWidths')<CR>
 
-" nnoremap <silent> <Space> :call VSCodeCall('whichkey.show')
-" xnoremap <silent> <Space> :call VSCodeCall('whichkey.show')
-
 nnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR>
 xnoremap <silent> <Space> :call VSCodeNotify('whichkey.show')<CR>