styling changes

home/profiles/programs/desktop/common/fuzzel.nix

@@ -1,38 +1,16 @@
 {
   lib,
   pkgs,
-  config,
   ...
-}: let
-  colors = {
-    dark = {
-      background = "#181818ff";
-      text = "#a4c6d9ff";
-      match = "#ae61b5ff";
-      border = "#feafffff";
-      selection = "#242424ff";
-      selection-text = "#ffffffff";
-      selection-match = "#fac1ffff";
-    };
-    light = {
-      background = "#ffffffff";
-      text = "#000000ff";
-      match = "#a60000ff";
-      border = "#000000ff";
-      selection = "#bfbfbfff";
-      selection-text = "#000000ff";
-      selection-match = "#2544bbff";
-    };
-  };
-in {
+}: {
   programs.fuzzel = {
     enable = true;
     settings = {
       main = {
         terminal = "${lib.getExe pkgs.foot}";
         layer = "overlay";
+        dpi-aware = false;
       };
-      # colors = colors."${config.xun.desktop.colorscheme}";
     };
   };
 }

home/profiles/programs/desktop/sway/waybar.nix

@@ -31,28 +31,6 @@
         };
       }
     ];
-    style = ''
-      * {
-          font-size: 13px;
-      }
-
-      button {
-          border: none;
-          border-radius: 0;
-      }
-
-      #workspaces button {
-        padding: 0 5px;
-      }
-
-      #workspaces button.urgent {
-        box-shadow: inset 0 -3px blue;
-      }
-
-      #clock {
-        padding: 0 10px;
-      }
-    '';
     systemd = {
       enable = true;
       target = "sway-session.target";

home/profiles/themes/dark.nix

@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  stylix = {
-    iconTheme = {
-      enable = true;
-      package = pkgs.adwaita-icon-theme;
-      dark = "Adwaita-dark";
-    };
-    targets.firefox.profileNames = ["xun"];
-  };
-}

home/profiles/themes/dark/default.nix

@@ -0,0 +1,22 @@
+{pkgs, ...}: {
+  imports = [
+    ./fuzzel.nix
+    ./waybar.nix
+  ];
+
+  stylix = {
+    iconTheme = {
+      enable = true;
+      package = pkgs.adwaita-icon-theme;
+      dark = "Adwaita-dark";
+    };
+    targets = {
+      firefox.profileNames = ["xun"];
+      gtk.enable = true;
+      qt.enable = true;
+      foot.enable = true;
+      firefox.enable = true;
+      swaync.enable = true;
+    };
+  };
+}

home/profiles/themes/dark/fuzzel.nix

@@ -0,0 +1,16 @@
+{
+  programs.fuzzel.settings = {
+    main = {
+      font = "monospace:size=10";
+    };
+    colors = {
+      background = "#181818ff";
+      text = "#a4c6d9ff";
+      match = "#ae61b5ff";
+      border = "#feafffff";
+      selection = "#242424ff";
+      selection-text = "#ffffffff";
+      selection-match = "#fac1ffff";
+    };
+  };
+}

home/profiles/themes/dark/waybar.nix

@@ -0,0 +1,28 @@
+{
+  programs.waybar.style = ''
+    * {
+        font-size: 13px;
+    }
+
+    button {
+        border: none;
+        border-radius: 0;
+    }
+
+    #workspaces button {
+      padding: 0 5px;
+    }
+
+    #workspaces button.urgent {
+      box-shadow: inset 0 -3px white;
+    }
+
+    #clock {
+      padding: 0 10px;
+    }
+
+    #workspaces button.visible {
+      box-shadow: inset 0 -3px red;
+    }
+  '';
+}

home/suites/nixdesk/default.nix

@@ -42,7 +42,7 @@
     # terminal.emulator.wezterm
     terminal.emulator.foot
 
-    themes.dark
+    themes.dark.default
 
     # desktop
     programs.desktop.default