Some updates

etc/hosts

@@ -19,8 +19,6 @@
 127.0.0.1 www.imgur.com
 127.0.0.1 twitter.com
 127.0.0.1 www.twitter.com
-127.0.0.1 youtube.com
-127.0.0.1 www.youtube.com
 
 # Tech stuff
 127.0.0.1 golem.de

install/3_vimux.sh

@@ -18,6 +18,6 @@ sh -c 'curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.gith
 
 vim +PlugInstall
 vim +CocInstall\ coc-calc\ coc-css\ coc-eslint\ coc-html\ coc-json\ coc-markdownlint\ coc-pairs\ coc-phpls\ coc-snippets\ coc-stylelintplus\ coc-tsserver\ coc-yaml\ coc-yank
-vim +TSInstall\ javascript\ typescript\ tsx\ vue\ yaml\ html\ json\ jsonc\ jsdoc\ php\ css\ regex\ comment
+vim +TSInstall\ bash\ comment\ css\ dockerfile\ graphql\ html\ javascript\ jsdoc\ json\ jsonc\ lua\ php\ python\ regex\ scss\ tsx\ typescript\ vue\ yaml
 vim +CocUpdate +PlugUpgrade +PlugUpdate +TSUpdate
 vim +checkhealth

nvim/autocommands.vim

@@ -21,6 +21,7 @@ augroup init
 
   " special settings for json5, css and scss: better BEM
   autocmd BufNewFile,BufRead *.{json5,css,scss} set iskeyword+=-
+  autocmd BufNewFile,BufRead *.scss set ft=scss.css
 augroup END
 
 if &diff

nvim/autoload/plug.vim

@@ -116,6 +116,10 @@ let s:TYPE = {
 let s:loaded = get(s:, 'loaded', {})
 let s:triggers = get(s:, 'triggers', {})
 
+function! s:is_powershell(shell)
+  return a:shell =~# 'powershell\(\.exe\)\?$' || a:shell =~# 'pwsh\(\.exe\)\?$'
+endfunction
+
 function! s:isabsolute(dir) abort
   return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\\|[A-Z]:\)')
 endfunction
@@ -263,7 +267,7 @@ function! s:define_commands()
   endif
   if has('win32')
   \ && &shellslash
-  \ && (&shell =~# 'cmd\(\.exe\)\?$' || &shell =~# 'powershell\(\.exe\)\?$')
+  \ && (&shell =~# 'cmd\(\.exe\)\?$' || s:is_powershell(&shell))
     return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.')
   endif
   if !has('nvim')
@@ -503,7 +507,7 @@ if s:is_win
     let batchfile = s:plug_tempname().'.bat'
     call writefile(s:wrap_cmds(a:cmd), batchfile)
     let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0})
-    if &shell =~# 'powershell\(\.exe\)\?$'
+    if s:is_powershell(&shell)
       let cmd = '& ' . cmd
     endif
     return [batchfile, cmd]
@@ -984,7 +988,7 @@ function! s:chsh(swap)
     set shell=sh
   endif
   if a:swap
-    if &shell =~# 'powershell\(\.exe\)\?$' || &shell =~# 'pwsh$'
+    if s:is_powershell(&shell)
       let &shellredir = '2>&1 | Out-File -Encoding UTF8 %s'
     elseif &shell =~# 'sh' || &shell =~# 'cmd\(\.exe\)\?$'
       set shellredir=>%s\ 2>&1
@@ -2225,7 +2229,7 @@ function! plug#shellescape(arg, ...)
   let script = get(opts, 'script', 1)
   if shell =~# 'cmd\(\.exe\)\?$'
     return s:shellesc_cmd(a:arg, script)
-  elseif shell =~# 'powershell\(\.exe\)\?$' || shell =~# 'pwsh$'
+  elseif s:is_powershell(shell)
     return s:shellesc_ps1(a:arg)
   endif
   return s:shellesc_sh(a:arg)
@@ -2277,7 +2281,7 @@ function! s:system(cmd, ...)
         return system(a:cmd)
       endif
       let cmd = join(map(copy(a:cmd), 'plug#shellescape(v:val, {"shell": &shell, "script": 0})'))
-      if &shell =~# 'powershell\(\.exe\)\?$'
+      if s:is_powershell(&shell)
         let cmd = '& ' . cmd
       endif
     else

nvim/init.vim

@@ -7,9 +7,7 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'mcchrish/nnn.vim'
 Plug 'neoclide/coc.nvim', { 'branch': 'release' }
-Plug 'npxbr/gruvbox.nvim'
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
-Plug 'rktjmp/lush.nvim' " for gruvbox.nvim
 Plug 'tpope/vim-apathy'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-eunuch'
@@ -23,6 +21,10 @@ Plug 'wellle/targets.vim'
 Plug 'wellle/tmux-complete.vim'
 Plug 'wincent/terminus'
 
+" colorscheme
+Plug 'rktjmp/lush.nvim' " for gruvbox.nvim
+Plug 'npxbr/gruvbox.nvim'
+
 call plug#end()
 
 " load the default config and mappings

nvim/plugins.vim

@@ -23,6 +23,8 @@ nnoremap <silent> <space>. :Buffers<cr>
 nnoremap <silent> <space>l :Lines<cr>
 nnoremap <silent> <space>a :Rg<cr>
 nnoremap <silent> <space>h :History:<cr>
+nnoremap <silent> <space>/ :History/<cr>
+nnoremap <silent> <space>c :Commits<cr>
 
 " nnn integration
 let g:nnn#set_default_mappings = 0