Simple update

This commit is contained in:
Smirnov Alexandr 2021-03-20 11:30:02 +02:00
parent c4d54758ef
commit ae9fa7059a
7 changed files with 12 additions and 28 deletions

View file

@ -1,35 +1,23 @@
#!/bin/sh #!/bin/sh
# Kernel version
kernel=$(cat /proc/sys/kernel/osrelease|cut -d '-' -f1) kernel=$(cat /proc/sys/kernel/osrelease|cut -d '-' -f1)
# Window manager name
[ ! "$wm" ] && [ "$DISPLAY" ] && command -v xprop >/dev/null && { [ ! "$wm" ] && [ "$DISPLAY" ] && command -v xprop >/dev/null && {
wmname="$(xprop -id $(xprop -root -notype\ wmname="$(xprop -id $(xprop -root -notype\
| awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t\ | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}') -notype -f _NET_WM_NAME 8t\
| grep "WM_NAME"\ | grep "WM_NAME"\
| cut -f2 -d \")" | cut -f2 -d \")"
} }
# Shell
shell=$(basename $SHELL) shell=$(basename $SHELL)
manager=$(which apt pacman yay 2>/dev/null)
# Packages
manager=$(which apt pacman yay apk xbps-query 2>/dev/null)
manager=${manager##*/} manager=${manager##*/}
case "$manager" in case "$manager" in
apt) packages="$(dpkg-query -f '${binary:Package}\n' -W | wc -l)";; apt) packages="$(dpkg-query -f '${binary:Package}\n' -W | wc -l)";;
yay) packages="$(yay -Q | wc -l)";; yay) packages="$(yay -Q | wc -l)";;
pacman) packages="$(pacman -Q | wc -l)";; pacman) packages="$(pacman -Q | wc -l)";;
esac esac
# Colors ####
bold=$(tput bold) bold=$(tput bold)
reset="\e[0m" reset="\e[0m"
blue="\e[36m" blue="\e[36m"
# Fetch ####
echo -e " ${blue}${bold} WM ${reset}${wmname}" echo -e " ${blue}${bold} WM ${reset}${wmname}"
echo -e " /\_/\ ${blue}${bold} SHELL ${reset}${shell}" echo -e " /\_/\ ${blue}${bold} SHELL ${reset}${shell}"
echo -e " (=^.^=) ${blue}${bold}KERNEL ${reset}${kernel}" echo -e " (=^.^=) ${blue}${bold}KERNEL ${reset}${kernel}"

View file

@ -3,4 +3,3 @@ case "$1" in
"on"|"-on"|"--on"|1) xset led on ;; "on"|"-on"|"--on"|1) xset led on ;;
"of"|"off"|"-off"|"--off"|0) xset led off ;; "of"|"off"|"-off"|"--off"|0) xset led off ;;
esac esac

View file

@ -39,10 +39,10 @@ bspc rule -a Google-chrome desktop='^2' focus=on follow=on
bspc rule -a LibreWolf 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 '*:nvim' desktop='^4' focus=on follow=off bspc rule -a '*:nvim' desktop='^4' focus=on follow=off
bspc rule -a '*:ranger' desktop='^4' focus=on follow=off bspc rule -a Todoist desktop='^4' focus=on follow=off
bspc rule -a Todoist desktop='^5' focus=on follow=off bspc rule -a Joplin desktop='^4' focus=on follow=on
bspc rule -a Joplin desktop='^5' focus=on follow=on bspc rule -a Simplenote desktop='^4' focus=on follow=on
bspc rule -a Simplenote desktop='^5' focus=on follow=on bspc rule -a '*:ranger' desktop='^5' focus=on follow=off
bspc rule -a discord desktop='^6' focus=off follow=off bspc rule -a discord desktop='^6' focus=off follow=off
bspc rule -a telegram-desktop desktop='^6' focus=off follow=on bspc rule -a telegram-desktop desktop='^6' focus=off follow=on
bspc rule -a KeePassXC desktop='^7' focus=on follow=off bspc rule -a KeePassXC desktop='^7' focus=on follow=off

View file

@ -6,7 +6,7 @@ super + {_,shift} Return
{kitty, \ {kitty, \
rofi -show drun -theme ntenV2} rofi -show drun -theme ntenV2}
super + shift + {w, e, f, c, a, q} super + shift + {w, e, f, c, t, q}
{google-chrome-stable, \ {google-chrome-stable, \
kitty --class nvim -e nvim, \ kitty --class nvim -e nvim, \
kitty --class ranger -e ranger, \ kitty --class ranger -e ranger, \

View file

@ -70,8 +70,6 @@ autocmd FileType python,go,json setlocal et sw=4 ts=4
autocmd FileType css,javascript,javascriptreact,yaml setlocal noet sw=2 ts=2 autocmd FileType css,javascript,javascriptreact,yaml setlocal noet sw=2 ts=2
"== Aliases "== Aliases
command! W :w
command! Q :q
command! WQ :wq command! WQ :wq
command! Wq :wq command! Wq :wq
command! Wiki :e ~/doc/index.md command! Wiki :e ~/doc/index.md

View file

@ -28,8 +28,7 @@
"vim.useSystemClipboard": true, "vim.useSystemClipboard": true,
"vim.normalModeKeyBindings": [{"before": ["f"], "after" : ["leader","leader","s"]}], "vim.normalModeKeyBindings": [{"before": ["f"], "after" : ["leader","leader","s"]}],
"cSpell.userWords": ["getenv"], "cSpell.userWords": ["getenv", "popen"],
"emmet.includeLanguages": { "emmet.includeLanguages": {
"javascript": "javascriptreact" "javascript": "javascriptreact"
}, },

2
zshrc
View file

@ -5,7 +5,7 @@ export EDITOR="nvim"
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 nvm golang)
source $OMH/oh-my-zsh.sh source $OMH/oh-my-zsh.sh
### Aliases ### Aliases