diff --git a/bin/catfetch b/bin/catfetch index b067b21..0d0f123 100755 --- a/bin/catfetch +++ b/bin/catfetch @@ -5,7 +5,10 @@ kernel=$(cat /proc/sys/kernel/osrelease|cut -d '-' -f1) # Window manager name [ ! "$wm" ] && [ "$DISPLAY" ] && command -v xprop >/dev/null && { - 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 \")" + 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 \")" } # Shell @@ -22,7 +25,7 @@ esac # Colors #### -bold="\e[1m" +bold=$(tput bold) reset="\e[0m" blue="\e[36m" diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index c75fa00..db10e43 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -34,20 +34,15 @@ bspc config presel_feedback_color "#51AFEF" bspc config urgent_border_color "#FF6C6B" ###== BSPWM Rules -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 +bspc rule -a '*:nvim' desktop='^4' focus=on follow=off bspc rule -a '*:ranger' desktop='^4' focus=on follow=off -bspc rule -a Thunar desktop='^4' focus=on follow=off bspc rule -a Todoist desktop='^5' focus=on follow=off bspc rule -a Joplin desktop='^5' focus=on follow=on bspc rule -a Simplenote desktop='^5' focus=on follow=on bspc rule -a discord desktop='^6' focus=off follow=off bspc rule -a telegram-desktop desktop='^6' focus=off follow=on bspc rule -a KeePassXC desktop='^7' focus=on follow=off -bspc rule -a Spotify desktop='^9' focus=on follow=on diff --git a/config/bspwm/polybar/bar.sh b/config/bspwm/polybar/bar.sh index d2ea137..0aebcb0 100755 --- a/config/bspwm/polybar/bar.sh +++ b/config/bspwm/polybar/bar.sh @@ -1,5 +1,5 @@ #!/bin/bash killall -q polybar while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -polybar -c ~/.config/bspwm/polybar/polybar min& -#polybar -c ~/.config/bspwm/polybar/polybar bar& +#polybar -c ~/.config/bspwm/polybar/polybar min& +polybar -c ~/.config/bspwm/polybar/polybar bar& diff --git a/config/bspwm/polybar/polybar b/config/bspwm/polybar/polybar index 89ee09d..be95781 100644 --- a/config/bspwm/polybar/polybar +++ b/config/bspwm/polybar/polybar @@ -3,8 +3,8 @@ [settings] enable-ipc = true format-padding = 1 -screenchange-reload = true -pseudo-transparency = true +;screenchange-reload = true +;pseudo-transparency = true [colors] background = #262A2B @@ -34,6 +34,7 @@ fixed-center = true background = ${colors.background} foreground = ${colors.foreground} wm-restack = bspwm +override-redirect = true font-0 = Iosevka Nerd Font:style=Medium:size=8;3 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5 modules-left = bspwm diff --git a/config/bspwm/sxhkd b/config/bspwm/sxhkd index b7a8b1f..ede8fda 100644 --- a/config/bspwm/sxhkd +++ b/config/bspwm/sxhkd @@ -3,21 +3,19 @@ ## == USER keys super + {_,shift} Return - {kitty, \ + {kitty, \ rofi -show drun -theme ntenV2} -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 + {w, e, f, c, a, q} + {google-chrome-stable, \ + kitty --class nvim -e nvim, \ + kitty --class ranger -e ranger, \ + code, \ + .applications/todoist.appimage, \ + xkill } -super + {_,shift} Print - {scrot -s, \ - scrot } +{_,shift,ctrl} Print + {scrot -s, scrot, scrot -u} super + {equal, minus, shift+minus} amixer sset Master {2%+,2%-,toggle} @@ -31,8 +29,8 @@ super + q bspc node -c super + control + r - bspc wm -r \ - pkill -USR1 -x sxhkd + bspc wm -r && \ + sxhkd -c ~/.config/bspwm/sxhkd ### == BSPWM windows ## Resize window @@ -40,7 +38,7 @@ super + ctrl + {h,j,k,l} bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0} # Change focus & move focus window -super + {_,shift + }{h,j,k,l} +super + {_,shift + } {h,j,k,l} bspc node -{f,s} {west,south,north,east} # Preselect the direction diff --git a/config/nvim/init.vim b/config/nvim/init.vim index 61ac581..8b056e7 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -10,8 +10,7 @@ set termguicolors colorscheme nten16 " Line numbers -set number -set relativenumber +set nu rnu " Line wrap set linebreak wrap @@ -28,7 +27,7 @@ set autoindent set ruler laststatus=0 " Maximux item in popup -set pumheight=9 +set pumheight=8 " Scroll set scrolloff=3 @@ -72,6 +71,7 @@ autocmd FileType css,javascript,javascriptreact,yaml setlocal noet sw=2 ts=2 "== Aliases command! W :w +command! Q :q command! WQ :wq command! Wq :wq command! Wiki :e ~/doc/index.md @@ -88,7 +88,6 @@ let g:NERDTreeMinimalUI = 1 "== Mapping let mapleader=";" -inoremap ii " NerdTree nnoremap e :NERDTreeToggle @@ -126,10 +125,10 @@ noremap :tabn 9 " Buffer nnoremap j :bnext nnoremap k :bprev -nnoremap c :bdele +nnoremap h :bdele -" Work with system clipboard -noremap c "*yy +" Working with system clipboard +noremap c "+y noremap v "+p " Terminal diff --git a/zshrc b/zshrc index 6ebc5cf..ff9f681 100644 --- a/zshrc +++ b/zshrc @@ -5,7 +5,7 @@ export EDITOR="nvim" export OMH="$HOME/.oh-my-zsh" ZSH_THEME="simple" DISABLE_AUTO_TITLE="true" -plugins=(yarn) +plugins=(yarn nvm) source $OMH/oh-my-zsh.sh ### Aliases @@ -18,4 +18,3 @@ alias vi="vim" alias tmux="tmux -2" alias :q="exit" alias ...="cd ../.." -alias icat="kitty +kitten icat"