gui: Split wm module out of the gui module

Allowing to use DEs on select machines

flake.nix

@@ -180,6 +180,7 @@
               };
               personal-cli = import ./personal-cli/hm.nix;
               gui = import ./gui/hm.nix;
+              wm = import ./wm/hm.nix;
               personal-gui = import ./personal-gui/hm.nix;
               gaming = import ./gaming/hm.nix;
               work = import ./hostconfig/thinkpad-nixos/work.nix;
@@ -189,6 +190,7 @@
               minimal = import ./minimal/nixos.nix { inherit extraInfo; };
               personal-cli = import ./personal-cli/nixos.nix;
               gui = import ./gui/nixos.nix;
+              wm = import ./wm/nixos.nix;
               personal-gui = import ./personal-gui/nixos.nix;
               roaming = import ./roaming/nixos.nix;
               gaming = import ./gaming/nixos.nix;

gui/hm.nix

@@ -5,23 +5,7 @@
   ...
 }:
 {
-  imports = [ ./wm ];
-
-  xdg.portal = {
-    enable = true;
-    config = {
-      sway = {
-        default = "gtk";
-        "org.freedesktop.impl.portal.Screenshot" = "wlr";
-        "org.freedesktop.impl.portal.ScreenCast" = "wlr";
-      };
-    };
-
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
-  };
+  imports = [ ./terminal ];
 
   home.packages = with pkgs; [
     # IM
@@ -69,10 +53,4 @@
   };
 
   programs.zathura.enable = true;
-
-  programs.rofi = {
-    enable = true;
-    theme = "solarized_alternate";
-    terminal = "${config.terminal.command}";
-  };
 }

gui/nixos.nix

@@ -9,21 +9,6 @@
 
   services.gnome.gnome-keyring.enable = true;
   services.flatpak.enable = true;
-  xdg.portal = {
-    enable = true;
-    config = {
-      sway = {
-        default = "gtk";
-        "org.freedesktop.impl.portal.Screenshot" = "wlr";
-        "org.freedesktop.impl.portal.ScreenCast" = "wlr";
-      };
-    };
-
-    extraPortals = with pkgs; [
-      xdg-desktop-portal-wlr
-      xdg-desktop-portal-gtk
-    ];
-  };
 
   security.rtkit.enable = true;
   services.pipewire = {

hostconfig/ZeNixComputa/default.nix

@@ -12,6 +12,7 @@
       gui
       personal-gui
       gaming
+      wm
     ];
     hmModules = with self.hmModules; [
       ./extra_info.nix
@@ -21,6 +22,7 @@
       gui
       personal-gui
       gaming
+      wm
     ];
     unfreePackages = [
       "cnijfilter2"

hostconfig/ZeNixLaptop/default.nix

@@ -9,6 +9,7 @@
       minimal
       personal-cli
       gui
+      wm
       gaming
     ];
     hmModules = with self.hmModules; [
@@ -17,6 +18,7 @@
       minimal
       personal-cli
       gui
+      wm
       gaming
     ];
   };

hostconfig/gandalf/default.nix

@@ -10,6 +10,7 @@
       minimal
       personal-cli
       gui
+      wm
       personal-gui
     ];
     hmModules = with self.hmModules; [
@@ -18,6 +19,7 @@
       minimal
       personal-cli
       gui
+      wm
       personal-gui
     ];
     unfreePackages = [

hostconfig/thinkpad-nixos/default.nix

@@ -18,6 +18,7 @@
         minimal
         personal-cli
         gui
+        wm
       ];
       hmModules = with self.hmModules; [
         ./extra_info.nix
@@ -25,6 +26,7 @@
         minimal
         personal-cli
         gui
+        wm
       ];
     };
 
@@ -35,6 +37,7 @@
           work
           personal-cli
           gui
+          wm
         ])
         ++ [
           ./extra_info.nix

wm/hm.nix

@@ -5,10 +5,23 @@
   ...
 }:
 {
-  imports = [
-    ./terminal
-    ./i3like.nix
-  ];
+  xdg.portal = {
+    enable = true;
+    config = {
+      sway = {
+        default = "gtk";
+        "org.freedesktop.impl.portal.Screenshot" = "wlr";
+        "org.freedesktop.impl.portal.ScreenCast" = "wlr";
+      };
+    };
+
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-wlr
+      xdg-desktop-portal-gtk
+    ];
+  };
+
+  imports = [ ./i3like.nix ];
 
   gtk = {
     enable = true;
@@ -100,6 +113,12 @@
     EXA_COLORS = "xx=38;5;8";
   };
 
+  programs.rofi = {
+    enable = true;
+    theme = "solarized_alternate";
+    terminal = "${config.terminal.command}";
+  };
+
   wm =
     let
       mod = config.wm.modifier;

wm/nixos.nix

@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+{
+  xdg.portal = {
+    enable = true;
+    config = {
+      sway = {
+        default = "gtk";
+        "org.freedesktop.impl.portal.Screenshot" = "wlr";
+        "org.freedesktop.impl.portal.ScreenCast" = "wlr";
+      };
+    };
+
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-wlr
+      xdg-desktop-portal-gtk
+    ];
+  };
+}