diff --git a/.config/aliasrc b/.config/aliasrc
index b2ef79a..2014482 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -44,7 +44,9 @@ alias make='make -j5'
 alias mkdir='mkdir -pv'
 alias mv='mv -iv'
 
-alias pacman-autoremove='pacman -Rns $(pacman -Qtdq)'
+alias nixos-rebuild-tinker='sudo nixos-rebuild switch -p tinkering --no-build-nix'
+
+alias pacman-autoremove='sudo pacman -Rns $(pacman -Qtdq)'
 alias ps-grep='ps aux | grep -v grep | grep'
 
 alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_HOME/qutebrowser-kiosk -C $XDG_CONFIG_HOME/qutebrowser/config-kiosk.py'
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 5e7a218..ed4b706 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -120,9 +120,3 @@ bspc rule -a 'thunderbird' desktop='messenger' locked='true'
 "$HOME/.config/bspwm/focus-voip.py" &
 
 feh --bg-fill "$XDG_PICTURES_DIR/wallpaper/active_wallpaper"
-
-killall conky
-sleep 0.1;
-conky --daemonize --config="$HOME/.config/conky/clock.conf"
-conky --daemonize --config="$HOME/.config/conky/system.conf"
-conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf"
diff --git a/.config/environment b/.config/environment
index c47de20..5e85da5 100644
--- a/.config/environment
+++ b/.config/environment
@@ -20,14 +20,15 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --sf '#50fa7b'\
  --scb '#282a36'\
  --scf '#ff79c6'\
- --list 25 --ignorecase"
+ --list 25 --ignorecase -p ''"
 
 export CM_LAUNCHER='rofi'
 
 export DOCKER_BUILDKIT=1
 export DRONE_SERVER='https://ci.serguzim.me'
 
-export EDITOR='/usr/bin/vim'
+_editor="$(which vim)"
+export EDITOR="$_editor"
 
 export GOPATH="$XDG_DATA_HOME/go"
 
@@ -73,7 +74,9 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
 
 ### conditionals
 
+# shellcheck disable=2089
 [ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+# shellcheck disable=2090
 [ -x "$(command -v moar)" ] && export MANPAGER="moar"
 [ -x "$(command -v moar)" ] && export PAGER="moar"
 
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index a4fb302..e1c644d 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -8,11 +8,8 @@ super + Return
 
 # program launcher
 super + d
-    LANG=C rofi -show
-
-# password manger
-super + p
-    LANG=C rofi-pass
+	j4-dmenu-desktop --dmenu="$MENU"
+    #LANG=C rofi -show
 
 # make sxhkd reload its configuration files:
 super + Escape
diff --git a/.xprofile b/.xprofile
index fceb50c..7f7585e 100644
--- a/.xprofile
+++ b/.xprofile
@@ -14,7 +14,7 @@ _autostart()
 	start-audio pipewire
 
 	### wait for internet
-	wait_for_service "network-online.target"
+	wait-for-service "network-online.target"
 
 	pass x
 	(pass keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) &