5 files changed, 7 insertions, 4 deletions
diff --git a/modules/graphical/bspwm/default.nix b/modules/graphical/bspwm/default.nix
index 24b15fd..657b129 100644
--- a/modules/graphical/bspwm/default.nix
+++ b/modules/graphical/bspwm/default.nix
@@ -36,6 +36,7 @@
 for monitor in $(xrandr -q | grep -w 'connected' | cut -d' ' -f1); do
 	bspc monitor "$monitor" -d '1' '2' '3' '4' '5' '6'
 done
+polybar-msg cmd restart
 		'';
 	};
 }
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 7154f55..37fc04b 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -20,7 +20,7 @@
 ${if config.tools.feh.enable then
 	"${pkgs.feh}/bin/feh --bg-scale ${../../assets/skeleton-mage.png}"
 else "xsetroot -solid \"${config.scheme.withHashtag.base00}\""}
-exec ${pkgs.bspwm}/bin/bspwm
+${pkgs.bspwm}/bin/bspwm
 ";
 	};
 }
diff --git a/modules/graphical/polybar/bar/main.nix b/modules/graphical/polybar/bar/main.nix
index 06fa63f..c52c3f7 100644
--- a/modules/graphical/polybar/bar/main.nix
+++ b/modules/graphical/polybar/bar/main.nix
@@ -7,7 +7,9 @@ in {
 	width = "100%:-20";
 	fixed-center = false;
 	height = 35;
-	override-redirect = true;
+	override-redirect = false;
+	wm-restack = "bspwm";
+	enable-ipc = true;
 
 	border-top-size = 1;
 	border-bottom-size = 1;
diff --git a/modules/graphical/polybar/default.nix b/modules/graphical/polybar/default.nix
index 7b02088..a181779 100644
--- a/modules/graphical/polybar/default.nix
+++ b/modules/graphical/polybar/default.nix
@@ -8,7 +8,7 @@
 		];
 		services.polybar.script = "
 export PATH=${pkgs.coreutils}/bin/:$PATH
-${config.services.polybar.package}/bin/polybar main
+${config.services.polybar.package}/bin/polybar main &
 ";
 		services.polybar.config = lib.mkMerge [
 			(import ./bar { inherit config lib; })
diff --git a/modules/graphical/sxhkd/default.nix b/modules/graphical/sxhkd/default.nix
index 1b362cf..a65d3fa 100644
--- a/modules/graphical/sxhkd/default.nix
+++ b/modules/graphical/sxhkd/default.nix
@@ -21,7 +21,7 @@
 			(createKeybinding
 				"r"
 				"Application launcher."
-				"rofi")
+				"rofi -show drun")
 
 			(createKeybinding
 				"t"