Extract a dwm profile module

I've made this a module as it imports configuration from `st` and
potentially others as I continue to refactor.

home/opdavies/hosts/nixedo.nix

@@ -1,8 +1,5 @@
-{ ... }:
-
 {
   homeManagerModules = {
     direnv.enable = true;
-    dwm.enable = true;
   };
 }

home/opdavies/hosts/t480.nix

@@ -4,7 +4,6 @@
   homeManagerModules = {
     direnv.enable = true;
     discord.enable = true;
-    dwm.enable = true;
     flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;

home/opdavies/hosts/t490.nix

@@ -4,7 +4,6 @@
   homeManagerModules = {
     direnv.enable = true;
     discord.enable = true;
-    dwm.enable = true;
     flameshot.enable = true;
     gimp.enable = true;
     gtk.enable = true;

hosts/t480/configuration.nix

@@ -7,10 +7,11 @@
     ./secrets.nix
     ./services
 
+    ../../modules/profiles/dwm
+
     ../../modules/mixins/bluetooth.nix
     ../../modules/mixins/docker.nix
     ../../modules/mixins/phpactor
-    ../../modules/mixins/st.nix
     ../../modules/mixins/thunar.nix
 
     ../common
@@ -18,7 +19,6 @@
   ];
 
   nixosModules = {
-    dwm.enable = true;
     redshift.enable = true;
   };
 

modules/home-manager/desktop/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./discord.nix
-    ./dwm
     ./flameshot.nix
     ./gtk.nix
     ./media

modules/home-manager/desktop/dwm/default.nix

@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-{
-  options.homeManagerModules.dwm.enable = mkEnableOption "Enable dwm";
-
-  config = mkIf config.homeManagerModules.dwm.enable {
-    home = {
-      file."${config.home.sessionVariables.XINITRC}".source = ./xinitrc;
-
-      sessionVariables = {
-        XINITRC = "${config.xdg.configHome}/X11/xinitrc";
-      };
-
-      packages = with pkgs; [
-        dunst
-        poweralertd
-        xwallpaper
-      ];
-    };
-  };
-}

modules/nixos/desktop/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./dwm.nix
     ./screenkey.nix
   ];
 }

modules/nixos/desktop/dwm.nix

@@ -1,43 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  self,
-  ...
-}:
-
-with lib;
-
-{
-  options.nixosModules.dwm.enable = mkEnableOption "Enable dwm";
-
-  config = mkIf config.nixosModules.dwm.enable {
-    services = {
-      dwm-status = {
-        enable = true;
-
-        order = [
-          "audio"
-          "battery"
-          "network"
-          "time"
-        ];
-      };
-
-      xserver = {
-        displayManager.startx.enable = true;
-        windowManager.dwm.enable = true;
-      };
-    };
-
-    systemd.user.services.dwm-status.serviceConfig.Restart = "on-failure";
-
-    environment.systemPackages = with pkgs; [
-      dmenu
-      dmenu-bluetooth
-      networkmanager_dmenu
-      slock
-      xdotool
-    ];
-  };
-}

modules/profiles/dwm/default.nix

@@ -0,0 +1,50 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ../../mixins/st.nix
+  ];
+
+  services = {
+    dwm-status = {
+      enable = true;
+
+      order = [
+        "audio"
+        "battery"
+        "network"
+        "time"
+      ];
+    };
+
+    xserver = {
+      displayManager.startx.enable = true;
+      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";
+        };
+      };
+    };
+}