dotfiles @ 946566a

M config/bspwm/README.md

@@ -5,6 +5,6 @@ --------------
 
 ### Install
 ```bash
-sudo pacman -S bspwm sxhkd
+sudo pacman -S bspwm sxhkd kitty
 yay -S polybar
 ```

M config/bspwm/bspwmrc

@@ -1,13 +1,13 @@
 #!/bin/sh
 ###== Functions
-A() {
+A() { # AutoStart
   if ! pgrep $1
      then $@& fi
 }
-C() {
+C() { # BSPWM config
     bspc config $@
 }
-R() {
+R() { # BSPWM rule
     bspc rule -a $@
 }
 
@@ -41,7 +41,6 @@
 ###== BSPWM Rules
 R kitty            desktop='^1' focus=on  follow=on
 R Google-chrome    desktop='^2' focus=on  follow=on
-R LibreWolf        desktop='^2' focus=on  follow=on
 R Code             desktop='^3' focus=on  follow=on
 R '*:nvim'         desktop='^3' focus=on  follow=off
 R Todoist          desktop='^4' focus=on  follow=off

M config/bspwm/polybar/polybar

@@ -23,7 +23,7 @@ font-0 = Iosevka Nerd Font:style=Medium:size=8;3
 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5
 modules-left = bspwm windowname
 modules-center = time date weather
-modules-right = keyboard pulseaudio  archupd wifi-signal
+modules-right = keyboard pulseaudio archupd wifi-signal
 tray-position = right
 tray-padding = 0
 
@@ -37,7 +37,7 @@ wm-restack = bspwm
 font-0 = Iosevka Nerd Font:style=Medium:size=8;3
 font-1 = FontAwesome5Free:style=Solid:size=7.5;2.5
 modules-left = bspwm
-modules-right = keyboard pulseaudio time wifi-signal
+modules-right = keyboard pulseaudio archupd time wifi-signal
 tray-position = right
 
 [module/bspwm]

M config/bspwm/polybar/scripts/updates-pacman-aur.sh

@@ -1,13 +1,9 @@
-#!/bin/sh
+#!/usr/bin/env bash
 if ! updates_arch=$(checkupdates 2> /dev/null | wc -l ); then
     updates_arch=0
 fi
 
 if ! updates_aur=$(yay -Qum 2> /dev/null | wc -l); then
-# if ! updates_aur=$(cower -u 2> /dev/null | wc -l); then
-# if ! updates_aur=$(trizen -Su --aur --quiet | wc -l); then
-# if ! updates_aur=$(pikaur -Qua 2> /dev/null | wc -l); then
-# if ! updates_aur=$(rua upgrade --printonly 2> /dev/null | wc -l); then
     updates_aur=0
 fi
 

M config/bspwm/polybar/scripts/weather.py

@@ -1,8 +1,11 @@
 import requests, os
+
 API_KEY = os.getenv("OWM_POLYBAR")
 CITY = os.getenv("OWM_CITY")
 try:
-    JSON = requests.get(f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}").json()
+    JSON = requests.get(
+        f"http://api.openweathermap.org/data/2.5/weather?q={CITY}&lang=EN&&units=metric&appid={API_KEY}"
+    ).json()
     print("", int(JSON["main"]["temp"]), "°С")
 except Exception as e:
     print(" err")

M config/bspwm/polybar/scripts/wifi-signal.sh

@@ -1,2 +1,5 @@
 #!/bin/sh
-cat /proc/net/wireless | grep "wlp3s0" | awk '{print $4}' | grep -o '[0-9]*'
+cat /proc/net/wireless \
+  | grep "wlp3s0"      \
+  | awk '{print $4}'   \
+  | grep -o '[0-9]*'

M config/bspwm/sxhkd

@@ -5,13 +5,14 @@ ## == USER keys
 super + {_,shift} Return
     {kitty, rofi -show drun -theme ntenV2}
 
-super + shift + {w, e, f, c, t, q}
-    {google-chrome-stable,           \
-     kitty --class nvim   -e nvim,   \
-     kitty --class ranger -e ranger, \
-     code,                           \
-     .applications/todoist.appimage, \
-     xkill                           }
+super + shift + {w, e, f, c, s, t, q}
+    {google-chrome-stable,              \
+     kitty --class nvim   -e nvim,      \
+     kitty --class ranger -e ranger,    \
+     code,                              \
+     .applications/simplenote.appimage, \
+     .applications/todoist.appimage,    \
+     xkill                              }
 
 {_,shift,ctrl} Print
     {scrot -s, scrot, scrot -u}
@@ -25,6 +26,9 @@ .config/rofi/script/passmenu.sh   }
 
 ### == BSPWM keys
 super + q
+    bspc node -c
+
+alt + F4
     bspc node -c
 
 super + control + r

M config/nvim/init.vim

@@ -68,7 +68,7 @@
 "== Settings for specific files
 autocmd FileType python,json setlocal ex sw=4 ts=4
 autocmd FileType go setlocal noex sw=4 ts=4
-autocmd FileType javascript,javascriptreact setlocal noet sw=2 ts=2
+autocmd FileType javascript,javascriptreact setlocal et sw=2 ts=2
 autocmd FileType css,yaml setlocal ex sw=4 ts=4
 
 "== Aliases