home/common/optional/desktop/dwm/xresources.nix

@@ -3,29 +3,19 @@
   home.file.".Xresources" = {
     recursive = true;
     text = ''
-      ! st
+      !st terminal
       st.alpha: 0.8
-      St.font: monospace:pixelsize=21:antialias=true:autohint=true;
-      St.font2: NotoColorEmoji:pixelsize=19:antialias=true:autohint=true;
+      *.font: monospace:pixelsize=21:antialias=true:autohint=true;
+      *.font2: NotoColorEmoji:pixelsize=19:antialias=true:autohint=true;
 
       ! dwm
       dwm.borderpx: 3
-      dwm.font: monospace:size=14
       dwm.col_base00: #${config.colorScheme.colors.base00}
       dwm.col_base03: #${config.colorScheme.colors.base03}
       dwm.col_base04: #${config.colorScheme.colors.base04}
       dwm.col_base05: #${config.colorScheme.colors.base05}
       dwm.col_base08: #${config.colorScheme.colors.base08}
       dwm.col_base0B: #${config.colorScheme.colors.base0B}
-
-      ! dmenu
-      dmenu.font: monospace:size=14
-      dmenu.normfgcolor: #${config.colorScheme.colors.base05}
-      dmenu.normbgcolor: #${config.colorScheme.colors.base03}
-      dmenu.selfgcolor: #${config.colorScheme.colors.base00}
-      dmenu.selbgcolor: #${config.colorScheme.colors.base0B}
-
-
     '';
   };
 }

hosts/common/optional/dwm.nix

@@ -16,8 +16,8 @@
             domain = "git.bitlab21.com";
             owner = "sam";
             repo = "dwm";
-            rev = "b5ad77872823f4b45381babcb8b5afac2c52a025";
-            sha256 = "sha256-HF7Mm+MCFYivSGjkac3rol9K1Fu1n33LROoB+eADC1o=";
+            rev = "16b3c79086ebf5393e528881ee28b9b4f066e1ba";
+            sha256 = "sha256-b9dNd3tDM667h5spbuUEysRSQBbm3DbyHrrYUMs96rA=";
           };
         };
       };

pkgs/dmenu/default.nix

@@ -13,8 +13,8 @@ pkgs.stdenv.mkDerivation {
     domain = "git.bitlab21.com";
     owner = "sam";
     repo = "dmenu";
-    rev = "aaa18d5eb6c7a935766af489a3e3f3136278d3cc";
-    sha256 = "sha256-khcBW6oVbvagLa2dfbteCJfzepbv4Y6GoUauYXHNhQo=";
+    rev = "deb38655db2ddb340258381f3a0a59e2d19207f1";
+    sha256 = "sha256-Wm5mIw4r3lPZDXlyO26Jr993Rq7dxMwBxeWnJ4UzQ1s=";
   };
 
   nativeBuildInputs = [