Add multiple hosts & restructure things

modules/bspwm/home.nix

@@ -1,77 +1,90 @@
 { pkgs, lib, config, ... }: {
+  options.custom.bspwm.enable = lib.mkEnable "bspwm";
+
   imports = [
     ../qutesearch/home.nix
     ../tint2/home.nix
     ../rofi/home.nix
   ];
 
-  home.packages = [
-    pkgs.feh
-    pkgs.flameshot
-  ];
+  config = {
+    # programs.qutebrowser.enable = true;
+    # custom.qutesearch.enable = true;
+    # programs.tint2.enable = true;
+    # programs.rofi.enable = true;
 
-  services.network-manager-applet.enable = true;
-
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-    pkgs.xdg-desktop-portal-kde
+    home.packages = [
+      pkgs.feh
+      pkgs.flameshot
     ];
-    configPackages = [
-    pkgs.xdg-desktop-portal-kde
-    ];
-  };
 
-  # handled by home manager
-  #   home.sessionVariables = {
-  #      # Tell java it's in no-reparenting land
-  #    	"_JAVA_AWT_WM_NONREPARENTING" = 1;
-  #    };
+    services.network-manager-applet.enable = true;
 
-  services.sxhkd.enable = true;
-  xdg.configFile."sxhkd/sxhkdrc" = {
-    source = ./sxhkdrc;
-    executable = true;
-  };
-
-  home.file.".local/bin" = {
-    source = ./scripts;
-    recursive = true;
-    executable = true;
-  };
-
-  xsession.windowManager.bspwm = {
-    enable = true;
-
-    monitors = {
-    "eDP-1" = [ "I" "II" "III" "IV" "V" ];
+    xdg.portal = {
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-kde
+      ];
+      configPackages = [
+        pkgs.xdg-desktop-portal-kde
+      ];
     };
 
-    settings = {
-      border_width = 1;
-      window_gap = 4;
-      split_ratio = 0.52;
+    # handled by home manager
+    #   home.sessionVariables = {
+    #      # Tell java it's in no-reparenting land
+    #    	"_JAVA_AWT_WM_NONREPARENTING" = 1;
+    #    };
 
-      pointer_modifier = "super";
-      pointer_action1 = "move";
-      pointer_action2 = "resize_corner";
-
-      focus_follows_pointer = true;
-      pointer_follows_focus = true;
+    services.sxhkd.enable = true;
+    xdg.configFile."sxhkd/sxhkdrc" = {
+      source = ./sxhkdrc;
+      executable = true;
     };
 
-    rules = {
-      Gimp = {
-      state = "floating";
+    home.file.".local/bin" = {
+      source = ./scripts;
+      recursive = true;
+      executable = true;
+    };
+
+    xsession.windowManager.bspwm = {
+      enable = true;
+
+      # monitors = {
+      #   "eDP-1" = [ "I" "II" "III" "IV" "V" ];
+      # };
+
+      extraConfigEarly = ''
+      bspc monitor -d I II III IV V
+      '';
+
+      settings = {
+        border_width = 1;
+        window_gap = 4;
+        split_ratio = 0.52;
+
+        pointer_modifier = "super";
+        pointer_action1 = "move";
+        pointer_action2 = "resize_corner";
+
+        focus_follows_pointer = true;
+        pointer_follows_focus = true;
       };
-    };
 
-    startupPrograms = [
-      # "pgrep -x sxhkd > /dev/null || sxhkd &"
-      "wmname LG3D"
-      # "xsetroot -cursor_name left_ptr &"
-      "tint2"
-      "feh --bg-scale ${config.custom.wallpaper}"
-    ];
+      rules = {
+        Gimp = {
+          state = "floating";
+        };
+      };
+
+      startupPrograms = [
+        # "pgrep -x sxhkd > /dev/null || sxhkd &"
+        "wmname LG3D"
+        # "xsetroot -cursor_name left_ptr &"
+        "tint2"
+        "feh --bg-scale ${config.custom.wallpaper}"
+      ];
+    };
   };
 }