all repos

dotfiles @ c4d54758ef4439234c3c21b50b17aa97603cac99

i use rach linux btw
7 files changed, 31 insertions(+), 36 deletions(-)
Update zsh, bspwm
Author: Smirnov Alexandr ss2316544@gmail.com
Committed at: 2021-03-18 21:24:43 +0200
Parent: 1be1c9c
M bin/catfetch
···
                5
                5
                 

              
                6
                6
                 # Window manager name

              
                7
                7
                 [ ! "$wm" ] && [ "$DISPLAY" ] && command -v xprop >/dev/null && {

              
                8
                
                -    wmname="$(xprop -id $(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t | grep "WM_NAME" | cut -f2 -d \")"

              
                
                8
                +    wmname="$(xprop -id $(xprop -root -notype\

              
                
                9
                +        | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t\

              
                
                10
                +        | grep "WM_NAME"\

              
                
                11
                +        | cut -f2 -d \")"

              
                9
                12
                 }

              
                10
                13
                 

              
                11
                14
                 # Shell

              ···
                22
                25
                 

              
                23
                26
                 

              
                24
                27
                 # Colors ####

              
                25
                
                -bold="\e[1m"

              
                
                28
                +bold=$(tput bold)

              
                26
                29
                 reset="\e[0m"

              
                27
                30
                 blue="\e[36m"

              
                28
                31
                 

              
M config/bspwm/bspwmrc
···
                34
                34
                 bspc config urgent_border_color   "#FF6C6B"

              
                35
                35
                 

              
                36
                36
                 ###== BSPWM Rules

              
                37
                
                -bspc rule -a Alacritty            desktop='^1' focus=on  follow=on

              
                38
                37
                 bspc rule -a kitty                desktop='^1' focus=on  follow=on

              
                39
                
                -bspc rule -a firefox              desktop='^2' focus=on  follow=on

              
                40
                38
                 bspc rule -a Google-chrome        desktop='^2' focus=on  follow=on

              
                41
                39
                 bspc rule -a LibreWolf            desktop='^2' focus=on  follow=on

              
                42
                40
                 bspc rule -a Code                 desktop='^3' focus=on  follow=on

              
                43
                
                -bspc rule -a Emacs                desktop='^3' focus=on  follow=on state='tiled'

              
                44
                
                -bspc rule -a '*:nvim'             desktop='^3' focus=on  follow=on

              
                
                41
                +bspc rule -a '*:nvim'             desktop='^4' focus=on  follow=off

              
                45
                42
                 bspc rule -a '*:ranger'           desktop='^4' focus=on  follow=off

              
                46
                
                -bspc rule -a Thunar               desktop='^4' focus=on  follow=off

              
                47
                43
                 bspc rule -a Todoist              desktop='^5' focus=on  follow=off

              
                48
                44
                 bspc rule -a Joplin               desktop='^5' focus=on  follow=on

              
                49
                45
                 bspc rule -a Simplenote           desktop='^5' focus=on  follow=on

              
                50
                46
                 bspc rule -a discord              desktop='^6' focus=off follow=off

              
                51
                47
                 bspc rule -a telegram-desktop     desktop='^6' focus=off follow=on

              
                52
                48
                 bspc rule -a KeePassXC            desktop='^7' focus=on  follow=off

              
                53
                
                -bspc rule -a Spotify              desktop='^9' focus=on  follow=on

              
M config/bspwm/polybar/bar.sh
···
                1
                1
                 #!/bin/bash

              
                2
                2
                 killall -q polybar

              
                3
                3
                 while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done

              
                4
                
                -polybar -c ~/.config/bspwm/polybar/polybar min&

              
                5
                
                -#polybar -c ~/.config/bspwm/polybar/polybar bar&

              
                
                4
                +#polybar -c ~/.config/bspwm/polybar/polybar min&

              
                
                5
                +polybar -c ~/.config/bspwm/polybar/polybar bar&

              
M config/bspwm/polybar/polybar
···
                3
                3
                 [settings]

              
                4
                4
                 enable-ipc = true

              
                5
                5
                 format-padding = 1

              
                6
                
                -screenchange-reload = true

              
                7
                
                -pseudo-transparency = true

              
                
                6
                +;screenchange-reload = true

              
                
                7
                +;pseudo-transparency = true

              
                8
                8
                 

              
                9
                9
                 [colors]

              
                10
                10
                 background = #262A2B

              ···
                34
                34
                 background = ${colors.background}

              
                35
                35
                 foreground = ${colors.foreground}

              
                36
                36
                 wm-restack = bspwm

              
                
                37
                +override-redirect = true

              
                37
                38
                 font-0 = Iosevka Nerd Font:style=Medium:size=8;3

              
                38
                39
                 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5

              
                39
                40
                 modules-left = bspwm

              
M config/bspwm/sxhkd
···
                3
                3
                 

              
                4
                4
                 ## == USER keys

              
                5
                5
                 super + {_,shift} Return

              
                6
                
                -    {kitty,  \

              
                
                6
                +    {kitty,                       \

              
                7
                7
                      rofi -show drun -theme ntenV2}

              
                8
                8
                 

              
                9
                
                -super + shift + {w, f, e, c, s, t, q}

              
                10
                
                -        {google-chrome-stable,              \

              
                11
                
                -         kitty --class ranger -e ranger,    \

              
                12
                
                -         kitty --class nvim   -e nvim,      \

              
                13
                
                -         code,                              \

              
                14
                
                -         .applications/simplenote.appimage, \

              
                15
                
                -         .applications/todoist.appimage,    \

              
                16
                
                -         xkill                              }

              
                
                9
                +super + shift + {w, e, f, c, a, q}

              
                
                10
                +    {google-chrome-stable,           \

              
                
                11
                +     kitty --class nvim   -e nvim,   \

              
                
                12
                +     kitty --class ranger -e ranger, \

              
                
                13
                +     code,                           \

              
                
                14
                +     .applications/todoist.appimage, \

              
                
                15
                +     xkill                           }

              
                17
                16
                 

              
                18
                
                -super + {_,shift} Print

              
                19
                
                -    {scrot -s, \

              
                20
                
                -     scrot     }

              
                
                17
                +{_,shift,ctrl} Print

              
                
                18
                +    {scrot -s, scrot, scrot -u}

              
                21
                19
                 

              
                22
                20
                 super + {equal, minus, shift+minus}

              
                23
                21
                     amixer sset Master {2%+,2%-,toggle}

              ···
                31
                29
                     bspc node -c

              
                32
                30
                 

              
                33
                31
                 super + control + r

              
                34
                
                -    bspc wm -r \

              
                35
                
                -    pkill -USR1 -x sxhkd

              
                
                32
                +    bspc wm -r && \

              
                
                33
                +    sxhkd -c ~/.config/bspwm/sxhkd

              
                36
                34
                 

              
                37
                35
                 ### == BSPWM windows

              
                38
                36
                 ## Resize window

              ···
                40
                38
                     bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}

              
                41
                39
                 

              
                42
                40
                 # Change focus & move focus window

              
                43
                
                -super + {_,shift + }{h,j,k,l}

              
                
                41
                +super + {_,shift + } {h,j,k,l}

              
                44
                42
                     bspc node -{f,s} {west,south,north,east}

              
                45
                43
                 

              
                46
                44
                 # Preselect the direction

              
M config/nvim/init.vim
···
                10
                10
                 colorscheme nten16

              
                11
                11
                 

              
                12
                12
                 " Line numbers

              
                13
                
                -set number

              
                14
                
                -set relativenumber

              
                
                13
                +set nu rnu

              
                15
                14
                 

              
                16
                15
                 " Line wrap

              
                17
                16
                 set linebreak wrap

              ···
                28
                27
                 set ruler laststatus=0

              
                29
                28
                 

              
                30
                29
                 " Maximux item in popup

              
                31
                
                -set pumheight=9

              
                
                30
                +set pumheight=8

              
                32
                31
                 

              
                33
                32
                 " Scroll

              
                34
                33
                 set scrolloff=3

              ···
                72
                71
                 

              
                73
                72
                 "== Aliases

              
                74
                73
                 command! W  :w

              
                
                74
                +command! Q  :q

              
                75
                75
                 command! WQ :wq

              
                76
                76
                 command! Wq :wq

              
                77
                77
                 command! Wiki :e ~/doc/index.md

              ···
                88
                88
                 

              
                89
                89
                 "== Mapping

              
                90
                90
                 let mapleader=";"

              
                91
                
                -inoremap ii <esc>

              
                92
                91
                 

              
                93
                92
                 " NerdTree

              
                94
                93
                 nnoremap <leader>e :NERDTreeToggle<CR>

              ···
                126
                125
                 " Buffer

              
                127
                126
                 nnoremap <leader>j :bnext<CR>

              
                128
                127
                 nnoremap <leader>k :bprev<CR>

              
                129
                
                -nnoremap <leader>c :bdele<CR>

              
                
                128
                +nnoremap <leader>h :bdele<CR>

              
                130
                129
                 

              
                131
                
                -" Work with system clipboard

              
                132
                
                -noremap <leader>c "*yy<CR>

              
                
                130
                +" Working with system clipboard

              
                
                131
                +noremap <leader>c "+y<CR>

              
                133
                132
                 noremap <leader>v "+p<CR>

              
                134
                133
                 

              
                135
                134
                 " Terminal

              
M zshrc
···
                5
                5
                 export OMH="$HOME/.oh-my-zsh"

              
                6
                6
                 ZSH_THEME="simple"

              
                7
                7
                 DISABLE_AUTO_TITLE="true"

              
                8
                
                -plugins=(yarn)

              
                
                8
                +plugins=(yarn nvm)

              
                9
                9
                 source $OMH/oh-my-zsh.sh

              
                10
                10
                 

              
                11
                11
                 ### Aliases

              ···
                18
                18
                 alias tmux="tmux -2"

              
                19
                19
                 alias :q="exit"

              
                20
                20
                 alias ...="cd ../.."

              
                21
                
                -alias icat="kitty +kitten icat"