From 43590a7557824c102f038415fda33855a6ffaf50 Mon Sep 17 00:00:00 2001
From: Smirnov Alexandr <ss2316544@gmail.com>
Date: Fri, 12 Mar 2021 17:58:04 +0200
Subject: [PATCH] Update bspwm(rule for librewolf), sxhkd(add tofoist),
 nvim(update hothey)

---
 config/bspwm/bspwmrc |  1 +
 config/bspwm/sxhkd   |  3 ++-
 config/nvim/init.vim | 20 ++++++++------------
 vscode/settings.json | 14 +++++++++-----
 zshrc                |  5 ++---
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc
index 608bbd6..c75fa00 100755
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@@ -38,6 +38,7 @@ bspc rule -a Alacritty            desktop='^1' focus=on  follow=on
 bspc rule -a kitty                desktop='^1' focus=on  follow=on
 bspc rule -a firefox              desktop='^2' focus=on  follow=on
 bspc rule -a Google-chrome        desktop='^2' focus=on  follow=on
+bspc rule -a LibreWolf            desktop='^2' focus=on  follow=on
 bspc rule -a Code                 desktop='^3' focus=on  follow=on
 bspc rule -a Emacs                desktop='^3' focus=on  follow=on state='tiled'
 bspc rule -a '*:nvim'             desktop='^3' focus=on  follow=on
diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd
index ab91bdd..b7a8b1f 100644
--- a/config/bspwm/sxhkd
+++ b/config/bspwm/sxhkd
@@ -6,12 +6,13 @@ super + {_,shift} Return
     {kitty,  \
      rofi -show drun -theme ntenV2}
 
-super + shift + {w, f, e, c, s, q}
+super + shift + {w, f, e, c, s, t, q}
         {google-chrome-stable,              \
          kitty --class ranger -e ranger,    \
          kitty --class nvim   -e nvim,      \
          code,                              \
          .applications/simplenote.appimage, \
+         .applications/todoist.appimage,    \
          xkill                              }
 
 super + {_,shift} Print
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index e0d0f5e..43d1d7a 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -27,9 +27,6 @@ set autoindent
 set laststatus=0
 set ruler
 
-" Folding
-set foldmethod=manual
-
 " Maximux item in popup
 set pumheight=9
 
@@ -64,7 +61,7 @@ set autoread
 set hidden
 
 " Space/tab indicator
-set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space:·,eol:\
+set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space:·
 
 " Disable sound
 set visualbell t_vb=
@@ -83,18 +80,17 @@ command! ESlint   :!eslint %
 command! Flake8   :!flake8 %
 command! Black    :silent !black %
 command! AutoPep8 :silent !autopep8 % --in-place
+command! GoFmt    :silent !gofmt -w %
 
 
 "== Mapping
 let mapleader=";"
-
 inoremap ii <esc>
 
 " Alternative keys
-nnoremap <C-s>      :w<CR>
-nnoremap <C-n>      :tabnew<CR>
-nnoremap <space>    :nohl<CR>
-nnoremap <leader>rr :so ~/.config/nvim/init.vim<CR>
+nnoremap <C-s>   :w<CR>
+nnoremap <C-n>   :tabnew<CR>
+nnoremap <space> :nohl<CR>
 
 " Window
 nnoremap <C-h> :wincmd h<CR>
@@ -105,8 +101,8 @@ nnoremap <C-l> :wincmd l<CR>
 " Split
 nnoremap spv :vsp<CR>
 nnoremap sph :sp<CR>
-nnoremap spk :wincmd K<CR>
-nnoremap spl :wincmd L<CR>
+nnoremap spj :wincmd K<CR>
+nnoremap spk :wincmd L<CR>
 
 " Tab
 nnoremap tn :tabnew<CR>
@@ -124,11 +120,11 @@ nnoremap <A-9> :tabn 9<CR>
 " Buffer
 nnoremap <leader>j :bnext<CR>
 nnoremap <leader>k :bprev<CR>
+nnoremap <leader>h :bdele<CR>
 
 " Work with system clipboard
 noremap <leader>c "*yy<CR>
 noremap <leader>v "+p<CR>
 
 " Terminal
-nnoremap <leader>t :vsp<CR>:term<CR>:startinsert<CR>
 tnoremap <Esc> <C-\><C-n>
diff --git a/vscode/settings.json b/vscode/settings.json
index a4fb5dc..1805bcf 100644
--- a/vscode/settings.json
+++ b/vscode/settings.json
@@ -1,14 +1,13 @@
 {
-  "workbench.colorTheme": "Ayu Dark Bordered",
+  "workbench.colorTheme": "Ayu Dark",
   "workbench.iconTheme": "ayu",
   "editor.wordWrap": "off",
   "editor.fontSize": 14,
-  "workbench.panel.defaultLocation": "right",
-  "editor.minimap.side": "left",
-  "editor.minimap.size": "fit",
+  "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'",
+  "workbench.panel.defaultLocation": "left",
   "workbench.sideBar.location": "right",
   "workbench.activityBar.visible": true,
-  "workbench.startupEditor": "newUntitledFile"
+  "workbench.startupEditor": "newUntitledFile",
   "window.menuBarVisibility": "hidden",
   "editor.formatOnPaste": true,
   "editor.minimap.enabled": false,
@@ -21,6 +20,7 @@
 
   "git.autofetch": true,
   "git.confirmSync": false,
+  "git.enableSmartCommit": true,
   "gitlens.codeLens.enabled": false,
 
   "vim.easymotion": true,
@@ -35,6 +35,10 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.tabSize": 2
   },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.tabSize": 2
+  },
   "[markdown]": {
     "editor.wordWrap": "on"
   }
diff --git a/zshrc b/zshrc
index 83990c4..6ebc5cf 100644
--- a/zshrc
+++ b/zshrc
@@ -1,11 +1,11 @@
-export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.applications:$HOME/.local/bin:$HOME/go/bin:$PATH"
+export PATH="$HOME/.yarn/bin:$HOME/bin:$HOME/.local/bin:$PATH"
 export EDITOR="nvim"
 
 ### Oh my zsh
 export OMH="$HOME/.oh-my-zsh"
 ZSH_THEME="simple"
 DISABLE_AUTO_TITLE="true"
-plugins=(yarn nvm)
+plugins=(yarn)
 source $OMH/oh-my-zsh.sh
 
 ### Aliases
@@ -15,7 +15,6 @@ alias cp="cp -r"
 alias du="du -h"
 alias vim="nvim"
 alias vi="vim"
-alias rgf="rg --files|rg"
 alias tmux="tmux -2"
 alias :q="exit"
 alias ...="cd ../.."