Fix minor issues

.bin/autostart-manage

@@ -70,6 +70,37 @@ _autostart_manage_rm () {
 	rm "$base_dir$(_filename "$1")"
 }
 
+_autostart_run_xorg () {
+
+	feh --bg-fill "$XDG_PICTURES_DIR/wallpaper/active_wallpaper"
+
+	"$HOME/.config/polybar/launch.sh" &
+	"$HOME/.config/bspwm/focus-voip.py" &
+
+	numlockx on
+
+	#setxkbmap de
+	#setxkbmap -option caps:none
+	#setxkbmap -option compose:menu
+
+	xrdb "$HOME/.Xresources"
+
+
+	start-audio pipewire
+	wait-for-service "network-online.target"
+
+	if ! pgrep -x keepassxc
+	then
+		pass x
+		(pass keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) &
+	fi
+	#keepass-unlock
+	#pass x && sleep 5
+
+	autoinstall graphical
+	autostart-manage run
+}
+
 case $1 in
 	list)		_autostart_manage_list ;;
 	info)		_autostart_manage_info ;;
@@ -85,5 +116,6 @@ case $1 in
 	status)		_systemctl "${2:-*}" status ;;
 	stop)		_systemctl "${2:-*}" stop ;;
 	run)		systemctl --user start autostart.target ;;
+	run-xorg)	_autostart_run_xorg ;;
 	*)			echo "'$1' is not valid" ;;
 esac

.bin/start-audio

@@ -40,7 +40,7 @@ start_audio_pipewire () {
     wait-for-service --user "pipewire.service"
     wait-for-service --user "wireplumber.service"
 
-    sleep 5
+    sleep 1
 
     pw-link 'default-sink:monitor_FL' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.HiFi__hw_U192k__sink:playback_FL'
     pw-link 'default-sink:monitor_FR' 'alsa_output.usb-BEHRINGER_UMC202HD_192k-00.HiFi__hw_U192k__sink:playback_FR'

.config/bspwm/bspwmrc

@@ -114,9 +114,4 @@ bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
 bspc rule -a 'thunderbird-default:Mail' desktop='messenger' locked='true'
 bspc rule -a 'thunderbird' desktop='messenger' locked='true'
 
-
-"$HOME/.config/polybar/launch.sh" &
-
-"$HOME/.config/bspwm/focus-voip.py" &
-
-feh --bg-fill "$XDG_PICTURES_DIR/wallpaper/active_wallpaper"
+autostart-manage run-xorg

.config/nixpkgs/common.nix

@@ -22,7 +22,8 @@
     ripgrep # grep-alternative
     trash-cli # rm wrapper to use trash-bin
     shellcheck # tool for shell-syntax
-    spotifyd # spotify-daemon
+    #spotifyd # spotify-daemon
+    (spotifyd.override { withMpris = true; }) # spotify-daemon
     tokei # project-language statistics
     unzip # unzip
     vimHugeX # vim with clipboard support

.xprofile

@@ -1,29 +0,0 @@
-#!/usr/bin/env sh
-
-. "$HOME/.config/environment"
-
-numlockx on
-
-setxkbmap de
-setxkbmap -option caps:none
-setxkbmap -option compose:menu
-
-xrdb "$HOME/.Xresources"
-
-_autostart()
-{
-	### wait for audio
-	start-audio pipewire
-
-	### wait for internet
-	wait-for-service "network-online.target"
-
-	pass x
-	(pass keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) &
-	pass x && sleep 5
-
-	autoinstall graphical
-	autostart-manage run
-}
-
-_autostart &