From aa726e1ccb4c9f44a514be01964489283d0007a9 Mon Sep 17 00:00:00 2001
From: MoritzBoehme <mail@moritzboeh.me>
Date: Tue, 19 Oct 2021 11:12:40 +0200
Subject: [PATCH] use homemanager bspwm and sxhkd for config

---
 modules/desktop/bspwm/bspwmrc     | 14 ------------
 modules/desktop/bspwm/default.nix | 38 +++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/modules/desktop/bspwm/bspwmrc b/modules/desktop/bspwm/bspwmrc
index 7680db0..989ea6a 100755
--- a/modules/desktop/bspwm/bspwmrc
+++ b/modules/desktop/bspwm/bspwmrc
@@ -13,24 +13,10 @@ done
 
 # CONFIGURATION #
 
-bspc config border_width 2
-bspc config window_gap 5
-bspc config borderless_monocle true
-bspc config gapless_monocle true
-bspc config focus_follows_pointer true
 
 # Dracula theme #
 
 bspc config focused_border_color "#bd93f9"
 
-# WINDOW RULES #
-bspc rule -a Steam state=tiled
-bspc rule -a Zathura state=tiled
-bspc rule -a Emacs state=tiled
-bspc rule -a 'Emacs:emacs-everywhere' state=floating sticky=on
-bspc rule -a feh state=floating
-
 # AUTOSTART #
-[[ ! $(pidof -x sxhkd) ]] && sxhkd &
 feh --bg-fill ~/.config/wallpaper/dracula.png
-systemctl --user start polybar
diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix
index 0983104..1e7129b 100644
--- a/modules/desktop/bspwm/default.nix
+++ b/modules/desktop/bspwm/default.nix
@@ -22,21 +22,35 @@
   console.keyMap = "de";
 
   home-manager.users.moritz = {
-    xsession.windowManager.bspwm.enable = true;
+    xsession.windowManager.bspwm = {
+      enable = true;
+      rules = {
+        "Zathura" = { state = "tiled"; };
+        "Emacs" = { state = "tiled"; };
+        "feh" = { state = "floating"; };
+      };
+      settings = {
+        border_width = 2;
+        window_gap = 5;
+        borderless_monocle = true;
+        gapless_monocle = true;
+        focus_follows_pointer = true;
+      };
+      startupPrograms = [
+        "${pkgs.systemd}/bin/systemctl --user start polybar.service"
+        "feh --bg-fill ~/.config/wallpaper/dracula.png"
+      ];
+      extraConfig = builtins.readFile ./bspwmrc;
+
+    };
+    services.sxhkd = {
+      enable = true;
+      extraConfig = builtins.readFile ./sxhkdrc;
+    };
 
     xdg = {
       enable = true;
-      configFile = {
-        "bspwm/bspwmrc" = {
-          source = ./bspwmrc;
-          onChange = "bspc wm -r";
-        };
-        "sxhkd/sxhkdrc" = {
-          source = ./sxhkdrc;
-          onChange = "pkill -USR1 -x sxhkd";
-        };
-        "wallpaper/dracula.png" = { source = ./dracula.png; };
-      };
+      configFile = { "wallpaper/dracula.png" = { source = ./dracula.png; }; };
     };
     home.packages = with pkgs; [ feh playerctl pamixer brightnessctl ];
   };