Move and refactor dwm configuration

hosts/t480/configuration.nix

@@ -18,12 +18,6 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    desktop = {
-      dwm.enable = true;
-    };
-  };
-
   services = {
     auto-cpufreq.enable = true;
     geoclue2.enable = true;

modules/nixos/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./dwm
     ./gitea-actions-runner.nix
     ./nixpad
     ./podman.nix

modules/nixos/dwm/default.nix

@@ -1,57 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.dwm;
-in
-{
-  options.features.desktop.dwm.enable = mkEnableOption "Enable dwm";
-
-  config = mkIf cfg.enable {
-    services = {
-      dwm-status = {
-        enable = true;
-
-        settings.order = [
-          "audio"
-          "battery"
-          "network"
-          "time"
-        ];
-      };
-
-      xserver.windowManager.dwm.enable = true;
-    };
-
-    systemd.user.services.dwm-status.serviceConfig.Restart = "on-failure";
-
-    environment.systemPackages = with pkgs; [
-      dmenu
-      dmenu-bluetooth
-      dunst
-      networkmanager_dmenu
-      poweralertd
-      slock
-      xdotool
-      xwallpaper
-    ];
-
-    home-manager.users.opdavies =
-      { config, ... }:
-      {
-        home = {
-          file."${config.home.sessionVariables.XINITRC}".source = ./xinitrc;
-
-          sessionVariables = {
-            XINITRC = "${config.xdg.configHome}/X11/xinitrc";
-          };
-        };
-      };
-  };
-}

modules2/dwm/config.nix

@@ -0,0 +1,11 @@
+{
+  flake.modules.homeManager.gui =
+    { config, ... }:
+    {
+      home = {
+        file."${config.home.sessionVariables.XINITRC}".source = ./xinitrc;
+
+        sessionVariables.XINITRC = "${config.xdg.configHome}/X11/xinitrc";
+      };
+    };
+}

modules2/dwm/dwm-status/order.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.nixos.pc.services.dwm-status.settings.order = [
+    "audio"
+    "battery"
+    "network"
+    "time"
+  ];
+}

modules2/dwm/dwm-status/restart.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.systemd.user.services.dwm-status.serviceConfig.Restart = "on-failure";
+}

modules2/dwm/packages.nix

@@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.pc =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [
+        dmenu
+        dmenu-bluetooth
+        dunst
+        networkmanager_dmenu
+        poweralertd
+        slock
+        xdotool
+        xwallpaper
+      ];
+    };
+}

modules2/hosts/t480/dwm/dwm-status.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.dwm-status.enable = true;
+}

modules2/hosts/t480/dwm/dwm.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.xserver.windowManager.dwm.enable = true;
+}