From c046eadcea910d966ede3984602c4b5732dd7265 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Thu, 17 Apr 2025 13:07:36 +0200
Subject: [PATCH] styling changes

---
 flake.lock                                    |  6 ++--
 flake.nix                                     |  2 +-
 .../programs/desktop/common/fuzzel.nix        | 26 ++---------------
 .../profiles/programs/desktop/sway/waybar.nix | 22 ---------------
 home/profiles/themes/dark.nix                 | 10 -------
 home/profiles/themes/dark/default.nix         | 22 +++++++++++++++
 home/profiles/themes/dark/fuzzel.nix          | 16 +++++++++++
 home/profiles/themes/dark/waybar.nix          | 28 +++++++++++++++++++
 home/suites/nixdesk/default.nix               |  2 +-
 sys/profiles/themes/dark.nix                  |  6 +---
 10 files changed, 74 insertions(+), 66 deletions(-)
 delete mode 100644 home/profiles/themes/dark.nix
 create mode 100644 home/profiles/themes/dark/default.nix
 create mode 100644 home/profiles/themes/dark/fuzzel.nix
 create mode 100644 home/profiles/themes/dark/waybar.nix

diff --git a/flake.lock b/flake.lock
index ef2938a..d42fdf2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1200,13 +1200,13 @@
     "wallpaper": {
       "flake": false,
       "locked": {
-        "narHash": "sha256-Ka69DKAY7BAFSpKGkfuaPpeU2ghfeh5RXOP+RJ9NxSA=",
+        "narHash": "sha256-/TKznBlLva2h7omNRZMoIIPyVXDFhVkpzWcz2p0N51M=",
         "type": "file",
-        "url": "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg"
+        "url": "https://cdn.donmai.us/original/43/20/__kasane_teto_and_kasane_teto_utau_and_1_more_drawn_by_maguru_white__43204cf49ef8c071c34009553d1c0455.jpg"
       },
       "original": {
         "type": "file",
-        "url": "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg"
+        "url": "https://cdn.donmai.us/original/43/20/__kasane_teto_and_kasane_teto_utau_and_1_more_drawn_by_maguru_white__43204cf49ef8c071c34009553d1c0455.jpg"
       }
     },
     "wayland-appusage": {
diff --git a/flake.nix b/flake.nix
index d14db28..023d160 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
     wayland-appusage.inputs.nixpkgs.follows = "nixpkgs";
 
     wallpaper = {
-      url = "https://cdn.donmai.us/original/9e/ee/__kasane_teto_and_kasane_teto_utau_drawn_by_xi_wu__9eee30303152b9320922a63e685cc073.jpg";
+      url = "https://cdn.donmai.us/original/43/20/__kasane_teto_and_kasane_teto_utau_and_1_more_drawn_by_maguru_white__43204cf49ef8c071c34009553d1c0455.jpg";
       flake = false;
     };
   };
diff --git a/home/profiles/programs/desktop/common/fuzzel.nix b/home/profiles/programs/desktop/common/fuzzel.nix
index 9777018..eb3b0c2 100644
--- a/home/profiles/programs/desktop/common/fuzzel.nix
+++ b/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}";
     };
   };
 }
diff --git a/home/profiles/programs/desktop/sway/waybar.nix b/home/profiles/programs/desktop/sway/waybar.nix
index 4d2ffdb..3a2958d 100644
--- a/home/profiles/programs/desktop/sway/waybar.nix
+++ b/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";
diff --git a/home/profiles/themes/dark.nix b/home/profiles/themes/dark.nix
deleted file mode 100644
index 2e7437c..0000000
--- a/home/profiles/themes/dark.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  stylix = {
-    iconTheme = {
-      enable = true;
-      package = pkgs.adwaita-icon-theme;
-      dark = "Adwaita-dark";
-    };
-    targets.firefox.profileNames = ["xun"];
-  };
-}
diff --git a/home/profiles/themes/dark/default.nix b/home/profiles/themes/dark/default.nix
new file mode 100644
index 0000000..7268169
--- /dev/null
+++ b/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;
+    };
+  };
+}
diff --git a/home/profiles/themes/dark/fuzzel.nix b/home/profiles/themes/dark/fuzzel.nix
new file mode 100644
index 0000000..b03d84e
--- /dev/null
+++ b/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";
+    };
+  };
+}
diff --git a/home/profiles/themes/dark/waybar.nix b/home/profiles/themes/dark/waybar.nix
new file mode 100644
index 0000000..ff6f9f8
--- /dev/null
+++ b/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;
+    }
+  '';
+}
diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix
index 37733f3..6175829 100644
--- a/home/suites/nixdesk/default.nix
+++ b/home/suites/nixdesk/default.nix
@@ -42,7 +42,7 @@
     # terminal.emulator.wezterm
     terminal.emulator.foot
 
-    themes.dark
+    themes.dark.default
 
     # desktop
     programs.desktop.default
diff --git a/sys/profiles/themes/dark.nix b/sys/profiles/themes/dark.nix
index d824cef..fa97f80 100644
--- a/sys/profiles/themes/dark.nix
+++ b/sys/profiles/themes/dark.nix
@@ -5,12 +5,8 @@
 }: {
   stylix = {
     enable = true;
-    autoEnable = true;
+    autoEnable = false;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/mountain.yaml";
-    # image = pkgs.fetchurl {
-    #   url = "https://imgur.com/2HATcuP.png";
-    #   hash = "sha256-YsSg1nreefSD/Ij44ZrWMkdk6+rJ2YozcFXvCM/EZNM=";
-    # };
     polarity = "dark";
     cursor = {
       package = pkgs.apple-cursor;