Add vscodium and integrate with neovim

dotfiles.yml

@@ -53,10 +53,12 @@ dotfiles:
     template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
+  - from: vscodium/product.json
-    to: .config/Code/User/settings.json
+    to: .config/VSCodium/product.json
-  - from: vscode/keybindings.json
+  - from: vscodium/settings.json
-    to: .config/Code/User/keybindings.json
+    to: .config/VSCodium/User/settings.json
+  - from: vscodium/keybindings.json
+    to: .config/VSCodium/User/keybindings.json
   - from: alacritty/alacritty.yml
     to: .config/alacritty.yml
     template: true

vim/vimrc

@@ -4,73 +4,38 @@ call plug#begin('~/.local/share/nvim/plugged')
 
 " === plugins ===
 
-"Plug 'vim-airline/vim-airline'
+function! Cond(Cond, ...)
-"Plug 'vim-airline/vim-airline-themes'
+  let opts = get(a:000, 0, {})
-Plug 'itchyny/lightline.vim'
+  return a:Cond ? opts : extend(opts, { 'on': [], 'for': [] })
-Plug 'godlygeek/tabular'
+endfunction
-Plug 'lepture/vim-jinja'
-Plug 'majutsushi/tagbar'
-" Plug 'nblock/vim-dokuwiki'
-Plug 'reedes/vim-pencil'
-Plug 'saltstack/salt-vim'
-Plug 'sickill/vim-monokai'
-" Plug 'patstockwell/vim-monokai-tasty'
-" Plug 'sjl/gundo.vim'
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-fugitive'
-" Plug 'tpope/vim-speeddating'
-" Plug 'tpope/vim-surround'
-Plug 'airblade/vim-gitgutter'
-Plug 'junegunn/goyo.vim'
-Plug 'junegunn/limelight.vim'
-" Plug 'sheerun/vim-polyglot'
-" Plug 'freitass/todo.txt-vim'
-Plug 'nathanaelkane/vim-indent-guides'
 
-"Plugin 'Lokaltog/vim-easymotion'
+" editing plugins
-"Plugin 'PeterRincker/vim-argumentative'
+Plug 'godlygeek/tabular', Cond(!exists('g:vscode'))
-"Plugin 'flazz/vim-colorschemes'
+Plug 'nathanaelkane/vim-indent-guides', Cond(!exists('g:vscode'))
-"Plugin 'jmcantrell/vim-virtualenv'
+Plug 'tpope/vim-commentary', Cond(!exists('g:vscode'))
-"Plugin 'kien/ctrlp.vim'
+Plug 'airblade/vim-gitgutter', Cond(!exists('g:vscode'))
-"Plugin 'klen/python-mode'
-"Plugin 'mbbill/undotree'
-Plug 'scrooloose/nerdtree'
-"Plugin 'sjl/gundo.vim'
-"Plugin 'terryma/vim-expand-region'
-"Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'wellle/targets.vim'
-"Plugin 'wincent/Command-T'
-Plug 'vimwiki/vimwiki'
-"Plug 'blindFS/vim-taskwarrior'
-" Plug 'tbabej/taskwiki'
-Plug 'rodjek/vim-puppet'
-Plug 'suan/vim-instant-markdown'
-"Plug 'marshallward/vim-restructuredtext'
-Plug 'vim-syntastic/syntastic'
-"Plug 'ElmCast/elm-vim'
-"Plug 'avh4/elm-format'
 
-Plug 'fatih/vim-go'
+" ui
-Plug 'hashivim/vim-terraform'
+Plug 'sickill/vim-monokai', Cond(!exists('g:vscode'))
+Plug 'itchyny/lightline.vim', Cond(!exists('g:vscode'))
 
-Plug 'editorconfig/editorconfig-vim'
+" lang integrations
+Plug 'lepture/vim-jinja', Cond(!exists('g:vscode'))
+Plug 'fatih/vim-go', Cond(!exists('g:vscode'))
+Plug 'hashivim/vim-terraform', Cond(!exists('g:vscode'))
+Plug 'editorconfig/editorconfig-vim', Cond(!exists('g:vscode'))
+Plug 'rust-lang/rust.vim', Cond(!exists('g:vscode'))
+Plug 'rodjek/vim-puppet', Cond(!exists('g:vscode'))
 
-Plug 'leafgarland/typescript-vim'
+" helpers
+"" distraction free writing
+Plug 'junegunn/limelight.vim', Cond(!exists('g:vscode'))
+Plug 'junegunn/goyo.vim', Cond(!exists('g:vscode'))
+Plug 'reedes/vim-pencil', Cond(!exists('g:vscode'))
 
-Plug 'prettier/vim-prettier', { 'do': 'npm install' }
+"" markdown
+Plug 'suan/vim-instant-markdown', Cond(!exists('g:vscode'))
 
-Plug 'yuezk/vim-js'
-Plug 'maxmellon/vim-jsx-pretty'
-
-Plug 'evanleck/vim-svelte', {'branch': 'main'}
-
-"Plug 'neoclide/coc.nvim', {'branch': 'release'}
-
-" Plug 'Chiel92/vim-autoformat'
-
-Plug 'evanleck/vim-svelte', {'branch': 'main'}
-
-Plug 'cespare/vim-toml', { 'branch': 'main' }
 
 call plug#end()
 filetype plugin indent on
@@ -199,6 +164,25 @@ map Y y$
 map j gj
 map k gk
 
+
+map N Nzz
+map n nzz
+
+inoremap jj <ESC>
+
+" no more ex mode
+nnoremap Q <nop>
+
+" Use // in visual mode to search for selection
+" https://vim.fandom.com/wiki/Search_for_visually_selected_text
+vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
+
+if exists('g:vscode')
+    xmap gc  <Plug>VSCodeCommentary
+    nmap gc  <Plug>VSCodeCommentary
+    omap gc  <Plug>VSCodeCommentary
+    nmap gcc <Plug>VSCodeCommentaryLine
+else
     nnoremap <C-h> <C-w>h
     nnoremap <C-j> <C-w>j
     nnoremap <C-k> <C-w>k
@@ -207,13 +191,6 @@ nnoremap <C-l> <C-w>l
     nmap <C-n> :bnext<CR>
     nmap <C-p> :bprev<CR>
 
-map N Nzz
-map n nzz
-
-inoremap jj <ESC>
-
-nnoremap <leader>v <C-w>v<C-w>l
-
     nnoremap <leader>m :InstantMarkdownPreview<CR>
 
     nnoremap <leader>u :GundoToggle<CR>
@@ -227,53 +204,11 @@ nmap <leader>x :r !xclip -out -selection -clipboard<CR><CR>
 
     nmap <leader>f :Autoformat<CR>
 
-" no more ex mode
+    nnoremap <leader>v <C-w>v<C-w>l
-nnoremap Q <nop>
 
-" === autocommands ===
-
-"" autosave views when closing and restoring when opening again.
-"autocmd BufWinLeave *.* mkview
-"autocmd BufWinEnter *.* silent loadview
-
-" === plugin setup ===
-
-" == colorscheme ==
-" set background=light
-" let g:solarized_termcolors=16
-" let g:solarized_termtrans=1
-" let g:solarized_contrast="normal"
-" let g:solarized_visibility="normal"
     syntax enable
     silent! colorscheme monokai
 
-" == tagbar ==
-nnoremap <F10> :TagbarToggle<CR>
-let g:tagbar_map_jump = "i"
-let g:tagbar_left = 0
-let g:tagbar_vertical = 0
-let g:tagbar_width = 50
-let g:tagbar_autoclose = 1
-let g:tagbar_autofocus = 1
-let g:tagbar_sort = 0 " 1: sort by name, 0: sort by position
-let g:tagbar_compact = 1
-let g:tagbar_indent = 2
-let g:tagbar_show_linenumbers = 0
-let g:tagbar_foldlevel = 99 " unfold all
-
-" == airline ==
-"let g:airline_right_sep = ''
-"let g:airline_left_sep = ''
-"let g:airline#extensions#disable_rtp_load = 1
-"let g:airline_extensions = ['whitespace']
-"let g:airline_theme='powerlineish'
-"let g:airline_powerline_fonts = 1
-"let g:airline_section_x = airline#section#create(['%{tagbar#currenttag("%s", "", "f")}','' , ' %{PencilMode()}', ' [', 'filetype', ']'])
-"let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',}
-"let g:airline#extensions#whitespace#enabled = 1
-"let g:airline#extensions#whitespace#symbol = ''
-"let g:airline#extensions#whitespace#checks = ['trailing']
-
     let g:lightline = {
       \ 'colorscheme': 'wombat',
       \ 'active': {
@@ -322,39 +257,15 @@ autocmd BufWritePre * :call DeleteTrailingWS()
 
     autocmd FileType yaml set shiftwidth=2
     autocmd FileType toml set shiftwidth=2
-set completeopt-=preview
+    autocmd FileType html setl shiftwidth=2
-let g:ycm_add_preview_to_completeopt = 0
-
-set completeopt-=preview
-let g:ycm_add_preview_to_completeopt = 0
 
     let g:instant_markdown_autostart = 0
 
     let g:terraform_align = 1
     let g:terraform_fmt_on_save=1
 
-if has("autocmd")
+    let g:rustfmt_autosave = 1
-  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
-endif
-
-let g:ycm_server_python_interpreter = "python3"
-
-au FileType html setl shiftwidth=2
-
-" Use // in visual mode to search for selection
-" https://vim.fandom.com/wiki/Search_for_visually_selected_text
-vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
-
-if v:version >= 700
-  au BufLeave * let b:winview = winsaveview()
-  au BufEnter * if(exists('b:winview')) | call winrestview(b:winview) | endif
-endif
-
-" https://github.com/golang/tools/blob/master/gopls/doc/vim.md
-let g:go_def_mode='gopls'
-let g:go_info_mode='gopls'
 
     " https://stackoverflow.com/a/8585343
     map <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>
-
+endif
-let g:rustfmt_autosave = 1

vscode/keybindings.json

@@ -1,7 +0,0 @@
-// Place your key bindings in this file to override the defaultsauto[]
-[
-    {
-        "key": "ctrl+3",
-        "command": "workbench.action.terminal.focus"
-    }
-]

vscodium/install.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o pipefail
+set -o errexit
+
+codium --install-extension ms-vscode.cpptools
+codium --install-extension ms-python.python
+codium --install-extension rust-lang.rust-analyzer
+codium --install-extension asvetliakov.vscode-neovim
+codium --install-extension monokai.theme-monokai-pro-vscode
+codium --install-extension yzhang.markdown-all-in-one
+codium --install-extension puppet.puppet-vscode
+
+

vscodium/keybindings.json

@@ -0,0 +1,26 @@
+[
+//    {
+//        "key": "ctrl+3",
+//        "command": "workbench.action.terminal.focus"
+//    },
+    {
+        "key": "ctrl+alt+b",
+        "command": "workbench.action.toggleActivityBarVisibility"
+    },
+    {
+        "key": "ctrl+b",
+        "command": "workbench.action.toggleSidebarVisibility"
+    },
+    {
+        "command": "vscode-neovim.compositeEscape1",
+        "key": "j",
+        "when": "neovim.mode == insert && editorTextFocus",
+        "args": "j"
+    },
+    {
+        "command": "vscode-neovim.compositeEscape2",
+        "key": "k",
+        "when": "neovim.mode == insert && editorTextFocus",
+        "args": "k"
+    }
+]

vscodium/product.json

@@ -0,0 +1,9 @@
+{
+  "extensionsGallery": {
+    "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
+    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "itemUrl": "https://marketplace.visualstudio.com/items",
+    "controlUrl": "",
+    "recommendationsUrl": ""
+  }
+}

vscodium/settings.json

@@ -1,60 +1,72 @@
 {
-    "workbench.colorTheme": "Visual Studio Light",
+    "ansible.dockerImage": "",
-    "vim.neovimPath": "/usr/bin/nvim",
-    "explorer.confirmDelete": false,
-    "window.zoomLevel": 0,
-    "terraform.telemetry.enabled": false,
-    "editor.formatOnSave": true,
-    "vim.gdefault": true,
-    "vim.visualstar": true,
-    "vim.enableNeovim": true,
-    "git.detectSubmodulesLimit": 50,
-    "files.autoSave": "onFocusChange",
-    "editor.fontFamily": "'Inconsolata','Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'",
     "editor.accessibilitySupport": "off",
-    "editor.lineNumbers": "relative",
-    "editor.mouseWheelZoom": true,
-    "editor.renderWhitespace": "none",
     "editor.cursorSurroundingLines": 7,
-    "editor.minimap.renderCharacters": false,
+    "editor.fontFamily": "'Droid Sans Mono'",
+    "editor.formatOnSave": true,
+    "editor.lineNumbers": "off",
     "editor.minimap.showSlider": "always",
-    "editor.minimap.size": "fill",
+    "editor.renderWhitespace": "none",
+    "explorer.confirmDelete": false,
+    "explorer.confirmDragAndDrop": false,
+    "explorer.incrementalNaming": "smart",
+    "extensions.ignoreRecommendations": true,
     "files.eol": "\n",
     "files.hotExit": "off",
     "files.trimFinalNewlines": true,
     "files.trimTrailingWhitespace": true,
-    "workbench.enableExperiments": false,
+    "git.detectSubmodulesLimit": 50,
-    "workbench.startupEditor": "newUntitledFile",
-    "workbench.activityBar.visible": false,
-    "workbench.iconTheme": "material-icon-theme",
-    "workbench.tree.indent": 12,
-    "window.menuBarVisibility": "toggle",
-    "window.title": "${rootName}${separator}${dirty}${activeEditorShort}${separator}VSCode",
-    "explorer.confirmDragAndDrop": false,
-    "explorer.incrementalNaming": "smart",
-    "search.smartCase": true,
-    "extensions.ignoreRecommendations": true,
-    "terminal.external.linuxExec": "alacritty",
-    "problems.showCurrentInStatus": true,
     "problems.decorations.enabled": false,
-    "update.mode": "none",
+    "problems.showCurrentInStatus": true,
+    "rust-client.autoStartRls": false,
+    "rust-client.disableRustup": true,
+    "search.smartCase": true,
     "telemetry.enableCrashReporter": false,
     "telemetry.enableTelemetry": false,
-    "ansible.dockerImage": "",
+    "terminal.external.linuxExec": "",
-    "vim.cursorStylePerMode.normal": "block",
+    "terminal.integrated.mouseWheelScrollSensitivity": 3,
+    "terraform.telemetry.enabled": false,
+    "update.mode": "none",
     "vim.cursorStylePerMode.insert": "line",
+    "vim.cursorStylePerMode.normal": "block",
     "vim.cursorStylePerMode.replace": "underline",
     "vim.easymotion": true,
+    "vim.enableNeovim": true,
+    "vim.gdefault": true,
     "vim.hlsearch": true,
     "vim.leader": "<space>",
+    "vim.neovimPath": "/usr/bin/nvim",
+    "vim.vimrc.enable": true,
+    "vim.visualstar": true,
+    "editor.wordWrap": "off",
+    "vscode-neovim.neovimExecutablePaths.linux": "/usr/bin/nvim",
+    "window.menuBarVisibility": "toggle",
+    "window.title": "[code] ${rootName}${separator}${dirty}${activeEditorShort}${separator}VSCode",
     "workbench.colorCustomizations": {
         "statusBar.background": "#005f5f",
         "statusBar.noFolderBackground": "#005f5f",
         "statusBar.debuggingBackground": "#005f5f"
     },
-    "vim.vimrc.enable": true,
+    "workbench.enableExperiments": false,
-    "editor.fontSize": 15,
+    "workbench.iconTheme": "Monokai Classic Icons",
-    "rust-client.disableRustup": true,
+    "workbench.startupEditor": "newUntitledFile",
-    "rust-client.autoStartRls": false,
+    "workbench.tree.indent": 14,
-    "terminal.integrated.mouseWheelScrollSensitivity": 3
+    "security.workspace.trust.enabled": false,
+    "scm.inputFontSize": 12,
+    "debug.console.fontSize": 12,
+    "terminal.integrated.fontSize": 12,
+    "files.autoSave": "onFocusChange",
+    "editor.fontWeight": "normal",
+    "editor.cursorStyle": "block",
+    "editor.minimap.renderCharacters": false,
+    "editor.minimap.size": "fit",
+    "workbench.colorTheme": "Monokai Classic",
+    "workbench.tree.renderIndentGuides": "always",
+    "breadcrumbs.icons": false,
+    "window.titleSeparator": " — ",
+    "explorer.excludeGitIgnore": true,
+    "puppet.editorService.formatOnType.enable": true,
+    "puppet.installType": "agent",
+    "puppet.installDirectory": "/usr/bin/puppet",
+    "window.zoomLevel": 0.1
 }