From b964a7a1ab2751b3ab2eb6d9cbf8f5ed0c2a9f70 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br.barrettruth@gmail.com>
Date: Sat, 14 Feb 2026 12:14:05 -0500
Subject: [PATCH] fix(waybar): coloring

---
 config/hypr/hyprland.conf           |  2 +-
 config/sherlock/themes/daylight.css | 43 -----------------------------
 config/sherlock/themes/midnight.css | 35 -----------------------
 home/modules/theme.nix              |  1 -
 home/modules/ui.nix                 | 28 ++-----------------
 scripts/theme                       |  5 ----
 6 files changed, 3 insertions(+), 111 deletions(-)
 delete mode 100644 config/sherlock/themes/daylight.css
 delete mode 100644 config/sherlock/themes/midnight.css

diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index b8f47ad..c7acf01 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -72,7 +72,7 @@ bindul = , XF86AudioMute, exec, hypr volume toggle
 bindul = , XF86MonBrightnessUp, exec, hypr brightness up
 bindul = , XF86MonBrightnessDown, exec, hypr brightness down
 
-bind = ALT, SPACE, exec, sherlock
+bind = ALT, SPACE, exec, rofi -show run
 bind = ALT, TAB, workspace, previous
 bind = ALT, A, cyclenext
 bind = ALT, B, exec, pkill -USR1 waybar || waybar
diff --git a/config/sherlock/themes/daylight.css b/config/sherlock/themes/daylight.css
deleted file mode 100644
index 5df0c1f..0000000
--- a/config/sherlock/themes/daylight.css
+++ /dev/null
@@ -1,43 +0,0 @@
-:root {
-    --background: #f5f5f5;
-    --foreground: #ebebeb;
-    --text: #1a1a1a;
-    --border: #e8e8e8;
-    --tag-background: rgba(153, 153, 153, 0.2);
-    --tag-color: #3b5bdb;
-    --error: #c7254e;
-    --warning: #996800;
-    --success: #2d7f3e;
-}
-
-* {
-    font-family: "SF Pro Display", sans-serif;
-}
-
-window:not(#backdrop) {
-    border-radius: 0;
-}
-
-.tile {
-    border-radius: 0;
-}
-
-.tag {
-    border-radius: 0;
-}
-
-#shortcut-holder {
-    border-radius: 0;
-}
-
-#context-menu {
-    border-radius: 0;
-}
-
-image.reactive {
-    -gtk-icon-filter: brightness(0);
-}
-
-#search-icon-holder image {
-    -gtk-icon-filter: brightness(0);
-}
diff --git a/config/sherlock/themes/midnight.css b/config/sherlock/themes/midnight.css
deleted file mode 100644
index bef67d5..0000000
--- a/config/sherlock/themes/midnight.css
+++ /dev/null
@@ -1,35 +0,0 @@
-:root {
-    --background: #121212;
-    --foreground: #2d2d2d;
-    --text: #e0e0e0;
-    --border: #3d3d3d;
-    --tag-background: rgba(102, 102, 102, 0.3);
-    --tag-color: #7aa2f7;
-    --error: #ff6b6b;
-    --warning: #e5c07b;
-    --success: #98c379;
-}
-
-* {
-    font-family: "SF Pro Display", sans-serif;
-}
-
-window:not(#backdrop) {
-    border-radius: 0;
-}
-
-.tile {
-    border-radius: 0;
-}
-
-.tag {
-    border-radius: 0;
-}
-
-#shortcut-holder {
-    border-radius: 0;
-}
-
-#context-menu {
-    border-radius: 0;
-}
diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index 9127cd1..4785dbb 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -109,7 +109,6 @@ in
         $DRY_RUN_CMD ln -sf "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf"
         $DRY_RUN_CMD ln -sf "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css"
         $DRY_RUN_CMD ln -sf "$cfg/rofi/themes/$theme.rasi" "$cfg/rofi/themes/theme.rasi"
-        $DRY_RUN_CMD ln -sf "$cfg/sherlock/themes/$theme.css" "$cfg/sherlock/main.css"
       ''}
       $DRY_RUN_CMD ln -sf "$cfg/sioyek/themes/$theme.config" "$cfg/sioyek/themes/theme.config"
       $DRY_RUN_CMD ln -sf "$cfg/fzf/themes/$theme" "$cfg/fzf/themes/theme"
diff --git a/home/modules/ui.nix b/home/modules/ui.nix
index 92bae76..cbbc70c 100644
--- a/home/modules/ui.nix
+++ b/home/modules/ui.nix
@@ -18,7 +18,7 @@ let
     #pulseaudio.muted { color: ${palette.fgAlt}; }
     #network.disconnected { color: ${palette.fgAlt}; }
     #battery.lo, #battery.ultralo { color: ${palette.red}; }
-    #language { color: ${palette.fgAlt}; }
+    #language { color: ${palette.fg}; }
     tooltip { background: ${palette.bgAlt}; color: ${palette.fg}; border: 1px solid ${palette.border}; }
     tooltip * { color: ${palette.fg}; }
   '';
@@ -66,12 +66,12 @@ in
       modules-left = [ "hyprland/workspaces" ];
       modules-center = [ "hyprland/window" ];
       modules-right = [
+        "hyprland/language"
         "privacy"
         "tray"
         "pulseaudio"
         "network"
         "battery"
-        "hyprland/language"
         "clock"
       ];
 
@@ -198,30 +198,6 @@ in
     '';
   };
 
-  programs.sherlock = {
-    enable = true;
-    systemd.enable = true;
-    settings = {
-      appearance = {
-        width = 600;
-        height = 400;
-        opacity = 1.0;
-        search_icon = false;
-      };
-      behavior.animate = false;
-      status_bar.enable = false;
-    };
-    launchers = [
-      { name = "App Launcher"; type = "app_launcher"; priority = 1; args = {}; }
-      { name = "Calculator"; type = "calculation"; priority = 2; args = {}; }
-    ];
-  };
-
-  xdg.configFile."sherlock/themes/midnight.css".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/sherlock/themes/midnight.css";
-  xdg.configFile."sherlock/themes/daylight.css".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/sherlock/themes/daylight.css";
-
   xdg.configFile."rofi/config.rasi".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/rofi/config.rasi";
   xdg.configFile."rofi/themes/midnight.rasi".source =
diff --git a/scripts/theme b/scripts/theme
index 215a371..b6d418c 100755
--- a/scripts/theme
+++ b/scripts/theme
@@ -85,11 +85,6 @@ Linux)
       ln -sf "$hypr_themes/$theme.conf" "$hypr_themes/theme.conf"
     }
 
-    sherlock_themes="$cfg/sherlock/themes"
-    [ -f "$sherlock_themes/$theme.css" ] && {
-      ln -sf "$sherlock_themes/$theme.css" "$cfg/sherlock/main.css"
-    }
-
     sioyek_themes="$cfg/sioyek/themes"
     [ -f "$sioyek_themes/$theme.config" ] && {
       ln -sf "$sioyek_themes/$theme.config" "$sioyek_themes/theme.config"