From 21f90a84badbc7ceeee0f46aa088c69638f08145 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Mon, 24 Mar 2025 19:56:20 +0100
Subject: [PATCH] cleanup color theme

---
 TODO.md                                |  5 ++++-
 kogami/home.nix                        |  2 +-
 nixos/home/desktop/hyprland/waybar.nix |  5 +----
 nixos/system/settings/printing.nix     |  2 +-
 nixos/system/settings/style.nix        | 28 ++++++++++++++++++++++++--
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/TODO.md b/TODO.md
index 808488f..3f4519b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -41,10 +41,13 @@
 - [ ] script dir set environment variable
 - [ ] eww configuration
 - [x] fix notifications
-- [ ] add multiple themes
+- [x] add multiple themes
 - [ ] customization of bg better
 - [x] fastfetch customization
 - [ ] sddm theme
+- [ ] add new themes, and polish old ones (lain, rei, and psychopass)
+- [ ] ghostty configuration add
+- [ ] change type of loading configuration using all .nix files in directory instead of manually specifing them
 
 - [ ] update my home page and create new web
 - [ ] fix kde theme in stylix
diff --git a/kogami/home.nix b/kogami/home.nix
index 26ae2d9..1d9870a 100644
--- a/kogami/home.nix
+++ b/kogami/home.nix
@@ -63,7 +63,7 @@
 
     firefox.enable = false;
     qutebrowser.enable = true;
-    spotify.enable = true;
+    spotify.enable = false;
     vencord.enable = true;
   };
 
diff --git a/nixos/home/desktop/hyprland/waybar.nix b/nixos/home/desktop/hyprland/waybar.nix
index 5dc96bc..fd0d788 100644
--- a/nixos/home/desktop/hyprland/waybar.nix
+++ b/nixos/home/desktop/hyprland/waybar.nix
@@ -310,10 +310,7 @@
 
       style = ''
         ${
-          if
-            (
-              userSettings.theme == "catppuccin-mocha" || userSettings.theme == "tokyo-night-dark"
-            )
+          if (userSettings.theme == "catppuccin-mocha")
           then "@define-color bar-bg rgba(0, 0, 0, 0);
           @define-color main-bg #11111b;
           @define-color main-fg #cdd6f4;
diff --git a/nixos/system/settings/printing.nix b/nixos/system/settings/printing.nix
index fdc7e29..deed650 100644
--- a/nixos/system/settings/printing.nix
+++ b/nixos/system/settings/printing.nix
@@ -30,7 +30,7 @@
     # Scanning
     hardware.sane.enable = true;
     services.ipp-usb.enable = true;
-    hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
+    #hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
 
     users.users.${userSettings.username}.extraGroups = ["lp" "scanner"];
   };
diff --git a/nixos/system/settings/style.nix b/nixos/system/settings/style.nix
index a45fe91..94aba3c 100644
--- a/nixos/system/settings/style.nix
+++ b/nixos/system/settings/style.nix
@@ -37,6 +37,25 @@
             base0E = "f0d0d0";
             base0F = "f0e0e0";
           }
+        else if userSettings.theme == "tokyo-night-dark"
+        then {
+          base00 = "011d33";
+          base01 = "1a4a6e";
+          base02 = "1570a7";
+          base03 = "42a1d7";
+          base04 = "40a3dc";
+          base05 = "509ede";
+          base06 = "46a8d9";
+          base07 = "509ede";
+          base08 = "3f95e2";
+          base09 = "4296dc";
+          base0A = "3a97dd";
+          base0B = "3a97da";
+          base0C = "4797d2";
+          base0D = "3698d5";
+          base0E = "329bc8";
+          base0F = "3699d0";
+        }
         else "${pkgs-stable.base16-schemes}/share/themes/${userSettings.theme}.yaml";
 
       polarity = "dark";
@@ -80,9 +99,14 @@
 
       targets = {
         plymouth = {
-          logo = lib.mkIf (userSettings.theme == "evangelion-blood") ../../../config/nerv.png;
+          logo =
+            if (userSettings.theme == "evangelion-blood")
+            then ../../../config/nerv.png
+            else if (userSettings.theme == "tokyo-night-dark")
+            then ../../../config/copeland.png
+            else "";
           logoAnimated =
-            if "evangelion-blood" == userSettings.theme
+            if "evangelion-blood" == userSettings.theme || "tokyo-night-dark" == userSettings.theme
             then false
             else true;
         };