Update bspwm(rule for librewolf), sxhkd(add tofoist), nvim(update hothey)

This commit is contained in:
Smirnov Alexandr 2021-03-12 17:58:04 +02:00
parent 5cc8e020c1
commit 43590a7557
5 changed files with 22 additions and 21 deletions

View file

@ -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 kitty desktop='^1' focus=on follow=on
bspc rule -a firefox desktop='^2' 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 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 Code desktop='^3' focus=on follow=on
bspc rule -a Emacs desktop='^3' focus=on follow=on state='tiled' bspc rule -a Emacs desktop='^3' focus=on follow=on state='tiled'
bspc rule -a '*:nvim' desktop='^3' focus=on follow=on bspc rule -a '*:nvim' desktop='^3' focus=on follow=on

View file

@ -6,12 +6,13 @@ super + {_,shift} Return
{kitty, \ {kitty, \
rofi -show drun -theme ntenV2} 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, \ {google-chrome-stable, \
kitty --class ranger -e ranger, \ kitty --class ranger -e ranger, \
kitty --class nvim -e nvim, \ kitty --class nvim -e nvim, \
code, \ code, \
.applications/simplenote.appimage, \ .applications/simplenote.appimage, \
.applications/todoist.appimage, \
xkill } xkill }
super + {_,shift} Print super + {_,shift} Print

View file

@ -27,9 +27,6 @@ set autoindent
set laststatus=0 set laststatus=0
set ruler set ruler
" Folding
set foldmethod=manual
" Maximux item in popup " Maximux item in popup
set pumheight=9 set pumheight=9
@ -64,7 +61,7 @@ set autoread
set hidden set hidden
" Space/tab indicator " Space/tab indicator
set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space,eol:\ set list listchars=tab:\|·,trail:~,extends:>,precedes:<,space
" Disable sound " Disable sound
set visualbell t_vb= set visualbell t_vb=
@ -83,18 +80,17 @@ command! ESlint :!eslint %
command! Flake8 :!flake8 % command! Flake8 :!flake8 %
command! Black :silent !black % command! Black :silent !black %
command! AutoPep8 :silent !autopep8 % --in-place command! AutoPep8 :silent !autopep8 % --in-place
command! GoFmt :silent !gofmt -w %
"== Mapping "== Mapping
let mapleader=";" let mapleader=";"
inoremap ii <esc> inoremap ii <esc>
" Alternative keys " Alternative keys
nnoremap <C-s> :w<CR> nnoremap <C-s> :w<CR>
nnoremap <C-n> :tabnew<CR> nnoremap <C-n> :tabnew<CR>
nnoremap <space> :nohl<CR> nnoremap <space> :nohl<CR>
nnoremap <leader>rr :so ~/.config/nvim/init.vim<CR>
" Window " Window
nnoremap <C-h> :wincmd h<CR> nnoremap <C-h> :wincmd h<CR>
@ -105,8 +101,8 @@ nnoremap <C-l> :wincmd l<CR>
" Split " Split
nnoremap spv :vsp<CR> nnoremap spv :vsp<CR>
nnoremap sph :sp<CR> nnoremap sph :sp<CR>
nnoremap spk :wincmd K<CR> nnoremap spj :wincmd K<CR>
nnoremap spl :wincmd L<CR> nnoremap spk :wincmd L<CR>
" Tab " Tab
nnoremap tn :tabnew<CR> nnoremap tn :tabnew<CR>
@ -124,11 +120,11 @@ nnoremap <A-9> :tabn 9<CR>
" Buffer " Buffer
nnoremap <leader>j :bnext<CR> nnoremap <leader>j :bnext<CR>
nnoremap <leader>k :bprev<CR> nnoremap <leader>k :bprev<CR>
nnoremap <leader>h :bdele<CR>
" Work with system clipboard " Work with system clipboard
noremap <leader>c "*yy<CR> noremap <leader>c "*yy<CR>
noremap <leader>v "+p<CR> noremap <leader>v "+p<CR>
" Terminal " Terminal
nnoremap <leader>t :vsp<CR>:term<CR>:startinsert<CR>
tnoremap <Esc> <C-\><C-n> tnoremap <Esc> <C-\><C-n>

View file

@ -1,14 +1,13 @@
{ {
"workbench.colorTheme": "Ayu Dark Bordered", "workbench.colorTheme": "Ayu Dark",
"workbench.iconTheme": "ayu", "workbench.iconTheme": "ayu",
"editor.wordWrap": "off", "editor.wordWrap": "off",
"editor.fontSize": 14, "editor.fontSize": 14,
"workbench.panel.defaultLocation": "right", "editor.fontFamily": "'Jetbrains Mono', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'",
"editor.minimap.side": "left", "workbench.panel.defaultLocation": "left",
"editor.minimap.size": "fit",
"workbench.sideBar.location": "right", "workbench.sideBar.location": "right",
"workbench.activityBar.visible": true, "workbench.activityBar.visible": true,
"workbench.startupEditor": "newUntitledFile" "workbench.startupEditor": "newUntitledFile",
"window.menuBarVisibility": "hidden", "window.menuBarVisibility": "hidden",
"editor.formatOnPaste": true, "editor.formatOnPaste": true,
"editor.minimap.enabled": false, "editor.minimap.enabled": false,
@ -21,6 +20,7 @@
"git.autofetch": true, "git.autofetch": true,
"git.confirmSync": false, "git.confirmSync": false,
"git.enableSmartCommit": true,
"gitlens.codeLens.enabled": false, "gitlens.codeLens.enabled": false,
"vim.easymotion": true, "vim.easymotion": true,
@ -35,6 +35,10 @@
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2 "editor.tabSize": 2
}, },
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.tabSize": 2
},
"[markdown]": { "[markdown]": {
"editor.wordWrap": "on" "editor.wordWrap": "on"
} }

5
zshrc
View file

@ -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" export EDITOR="nvim"
### Oh my zsh ### Oh my zsh
export OMH="$HOME/.oh-my-zsh" export OMH="$HOME/.oh-my-zsh"
ZSH_THEME="simple" ZSH_THEME="simple"
DISABLE_AUTO_TITLE="true" DISABLE_AUTO_TITLE="true"
plugins=(yarn nvm) plugins=(yarn)
source $OMH/oh-my-zsh.sh source $OMH/oh-my-zsh.sh
### Aliases ### Aliases
@ -15,7 +15,6 @@ alias cp="cp -r"
alias du="du -h" alias du="du -h"
alias vim="nvim" alias vim="nvim"
alias vi="vim" alias vi="vim"
alias rgf="rg --files|rg"
alias tmux="tmux -2" alias tmux="tmux -2"
alias :q="exit" alias :q="exit"
alias ...="cd ../.." alias ...="cd ../.."