From 440fbe6c866d7c71c6135a0867e1fe8940f6ccaf Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Thu, 29 Dec 2022 14:46:34 +0100
Subject: [PATCH] Move .xprofile into autostart-manage

---
 .bin/autostart-manage | 32 ++++++++++++++++++++++++++++++++
 .config/bspwm/bspwmrc |  7 +------
 .xprofile             | 29 -----------------------------
 3 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 .xprofile

diff --git a/.bin/autostart-manage b/.bin/autostart-manage
index c4cf1ff..5de4243 100755
--- a/.bin/autostart-manage
+++ b/.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
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index ed4b706..a92e79e 100755
--- a/.config/bspwm/bspwmrc
+++ b/.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
diff --git a/.xprofile b/.xprofile
deleted file mode 100644
index b4630a4..0000000
--- a/.xprofile
+++ /dev/null
@@ -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 &