Refactor xserver programs into roles

rake5k · Sep 27, 2024 · 6b76e07 · 6b76e07
1 parent 1801eff
commit 6b76e07
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 220 deletions.
diff --git a/home/programs/trayer/default.nix b/home/programs/trayer/default.nix
diff --git a/home/programs/xmonad/default.nix b/home/programs/xmonad/default.nix
diff --git a/home/roles/desktop/xserver/default.nix b/home/roles/desktop/xserver/default.nix
@@ -4,7 +4,8 @@ with lib;
 
 let
 
-  cfg = config.custom.roles.desktop.xserver;
+  desktopCfg = config.custom.roles.desktop;
+  cfg = desktopCfg.xserver;
 
 in
 
@@ -51,7 +52,29 @@ in
             cursors.enable = true;
             grobi.enable = true;
             redshift.enable = true;
-            xmonad.enable = true;
+
+            xmonad = {
+              inherit (cfg) colorScheme;
+
+              enable = true;
+              autoruns = {
+                "${desktopCfg.terminal.spawnCmd}" = 1;
+                "blueberry-tray" = 1;
+                "nm-applet" = 1;
+                "parcellite" = 1;
+                "steam -silent" = 8;
+              };
+              launcherCmd = "dmenu_run -c -i -fn \"${desktopCfg.font.family}:style=Bold:size=20:antialias=true\" -l 8 -nf \"#C5C8C6\" -sb \"#373B41\" -sf \"#C5C8C6\" -p \"run:\"";
+              terminalCmd = mkDefault desktopCfg.terminal.spawnCmd;
+              passwordManager = {
+                command = mkDefault "1password";
+                wmClassName = mkDefault "1Password";
+              };
+              wiki = {
+                command = mkDefault "logseq";
+                wmClassName = mkDefault "Logseq";
+              };
+            };
           };
         };
       };

diff --git a/home/programs/dmenu/default.nix → home/roles/desktop/xserver/dmenu/default.nix b/home/programs/dmenu/default.nix → home/roles/desktop/xserver/dmenu/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.custom.programs.dmenu;
+  cfg = config.custom.roles.desktop.xserver.dmenu;
 
   dmenuPatched = pkgs.dmenu.override {
     patches = builtins.map builtins.fetchurl [
@@ -23,7 +23,7 @@ in
 
 {
   options = {
-    custom.programs.dmenu = {
+    custom.roles.desktop.xserver.dmenu = {
       enable = mkEnableOption "Dmenu launcher";
 
       font = {

diff --git a/home/programs/dunst/default.nix → home/roles/desktop/xserver/dunst/default.nix b/home/programs/dunst/default.nix → home/roles/desktop/xserver/dunst/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 let
 
-  cfg = config.custom.programs.dunst;
+  cfg = config.custom.roles.desktop.xserver.dunst;
 
 in
 
 {
   options = {
-    custom.programs.dunst = {
+    custom.roles.desktop.xserver.dunst = {
       enable = mkEnableOption "Dunst desktop notification daemon";
 
       font = {

diff --git a/home/programs/picom/default.nix → home/roles/desktop/xserver/picom/default.nix b/home/programs/picom/default.nix → home/roles/desktop/xserver/picom/default.nix
@@ -4,13 +4,13 @@ with lib;
 
 let
 
-  cfg = config.custom.programs.picom;
+  cfg = config.custom.roles.desktop.xserver.picom;
 
 in
 
 {
   options = {
-    custom.programs.picom = {
+    custom.roles.desktop.xserver.picom = {
       enable = mkEnableOption "Picom compositor";
     };
   };

diff --git a/...rograms/polybar/config/weather-plugin.nix → ...xserver/polybar/config/weather-plugin.nix b/...rograms/polybar/config/weather-plugin.nix → ...xserver/polybar/config/weather-plugin.nix
diff --git a/home/programs/polybar/default.nix → ...roles/desktop/xserver/polybar/default.nix b/home/programs/polybar/default.nix → ...roles/desktop/xserver/polybar/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.custom.programs.polybar;
+  cfg = config.custom.roles.desktop.xserver.polybar;
 
   package = pkgs.polybar.override {
     pulseSupport = true;
@@ -14,7 +14,7 @@ in
 
 {
   options = {
-    custom.programs.polybar = {
+    custom.roles.desktop.xserver.polybar = {
       enable = mkEnableOption "Polybar status bar";
 
       colorScheme = {