From ee9c85f920e5d455e0dbd6564dd6fafc98863376 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 5 Apr 2025 09:00:00 +0100 Subject: [PATCH] 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 | 3 -- home/opdavies/hosts/t480.nix | 1 - home/opdavies/hosts/t490.nix | 1 - hosts/t480/configuration.nix | 4 +- modules/home-manager/desktop/default.nix | 1 - modules/home-manager/desktop/dwm/default.nix | 28 ----------- modules/nixos/desktop/default.nix | 1 - modules/nixos/desktop/dwm.nix | 43 ---------------- modules/profiles/dwm/default.nix | 50 +++++++++++++++++++ .../desktop => profiles}/dwm/xinitrc | 0 10 files changed, 52 insertions(+), 80 deletions(-) delete mode 100644 modules/home-manager/desktop/dwm/default.nix delete mode 100644 modules/nixos/desktop/dwm.nix create mode 100644 modules/profiles/dwm/default.nix rename modules/{home-manager/desktop => profiles}/dwm/xinitrc (100%) diff --git a/home/opdavies/hosts/nixedo.nix b/home/opdavies/hosts/nixedo.nix index 1b4871f7..24b80a4a 100644 --- a/home/opdavies/hosts/nixedo.nix +++ b/home/opdavies/hosts/nixedo.nix @@ -1,8 +1,5 @@ -{ ... }: - { homeManagerModules = { direnv.enable = true; - dwm.enable = true; }; } diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix index 251ccdd9..8fb8334a 100644 --- a/home/opdavies/hosts/t480.nix +++ b/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; diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix index aca09275..2a1ff60c 100644 --- a/home/opdavies/hosts/t490.nix +++ b/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; diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index b6497033..d460a7fd 100644 --- a/hosts/t480/configuration.nix +++ b/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; }; diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix index 883e04ec..6beaf3d3 100644 --- a/modules/home-manager/desktop/default.nix +++ b/modules/home-manager/desktop/default.nix @@ -1,7 +1,6 @@ { imports = [ ./discord.nix - ./dwm ./flameshot.nix ./gtk.nix ./media diff --git a/modules/home-manager/desktop/dwm/default.nix b/modules/home-manager/desktop/dwm/default.nix deleted file mode 100644 index a6f33a4a..00000000 --- a/modules/home-manager/desktop/dwm/default.nix +++ /dev/null @@ -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 - ]; - }; - }; -} diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 1d8cb64e..e8a21886 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -1,6 +1,5 @@ { imports = [ - ./dwm.nix ./screenkey.nix ]; } diff --git a/modules/nixos/desktop/dwm.nix b/modules/nixos/desktop/dwm.nix deleted file mode 100644 index f0e2f944..00000000 --- a/modules/nixos/desktop/dwm.nix +++ /dev/null @@ -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 - ]; - }; -} diff --git a/modules/profiles/dwm/default.nix b/modules/profiles/dwm/default.nix new file mode 100644 index 00000000..bc901a76 --- /dev/null +++ b/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"; + }; + }; + }; +} diff --git a/modules/home-manager/desktop/dwm/xinitrc b/modules/profiles/dwm/xinitrc similarity index 100% rename from modules/home-manager/desktop/dwm/xinitrc rename to modules/profiles/dwm/xinitrc