[THEME] missed the saturation of Kanagawa

Icy-Thought · Oct 17, 2024 · 6626424 · 6626424
1 parent cf2da5d
commit 6626424
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 43 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -49,15 +49,15 @@
 
 ## XMonad
 
-![XMonad](./assets/themes/catppuccin/xmonad.png)
+![XMonad](./assets/themes/kanagawa/xmonad.png)
 
 ## Emacs
 
-![Emacs](./assets/themes/catppuccin/emacs.png)
+![Emacs](./assets/themes/kanagawa/emacs.png)
 
 ## Neovim
 
-![Neovim](./assets/themes/catppuccin/neovim.png)
+![Neovim](./assets/themes/kanagawa/neovim.png)
 
 # Introduction
 
@@ -147,9 +147,9 @@ Modify `snowflake.dir` to point to the location where you are keeping the
 snowflake repository:
 https://github.com/Icy-Thought/snowflake/blob/f576ca018a7dd97e0f9d887835e2559e1e5cc02c/modules/options.nix#L26-L29
 
-## 2. Remove Redundant CPU Setting 
+## 2. Remove Redundant CPU Setting
 
-For the sake of making things quicker (not the wisest choice), I have added both Intel and AMD CPU settings in the `hardware.nix` template. Therefore you ought to remove the one not being used. 
+For the sake of making things quicker (not the wisest choice), I have added both Intel and AMD CPU settings in the `hardware.nix` template. Therefore you ought to remove the one not being used.
 
 There might be other configurations that you need to add to your `hardware.nix` file, therefore it is the wisest choice to always look (grep `hardware.`) in the [NixOS Manual](https://nixos.org/manual/nixos/unstable/).
 

diff --git a/flake.lock b/flake.lock
diff --git a/hosts/thinkpad-e595/default.nix b/hosts/thinkpad-e595/default.nix
@@ -21,7 +21,7 @@
       scientific.typst.enable = true;
     };
 
-    themes.active = "catppuccin";
+    themes.active = "kanagawa";
     desktop = {
       xmonad.enable = true;
       terminal = {

diff --git a/modules/themes/kanagawa/default.nix b/modules/themes/kanagawa/default.nix
@@ -11,14 +11,14 @@ in {
   config = mkIf (cfg.active == "kanagawa") (mkMerge [
     {
       modules.themes = {
-        wallpaper = mkDefault ./assets/morganprost-spacestation01.jpg;
+        wallpaper = mkDefault ./assets/ismail-inceoglu-chaos-invoked.jpg;
         gtk = {
           name = "Kanagawa-BL";
-          package = pkgs.my.kanagawa-gtk.override { themeVariants = [ "BL" ]; };
+          package = pkgs.my.kanagawa-gtk;
         };
         iconTheme = {
           name = "Kanagawa";
-          package = pkgs.my.kanagawa-gtk.override { themeVariants = [ "BL" ]; };
+          package = pkgs.my.kanagawa-gtk;
         };
         pointer = {
           name = "Bibata-Modern-Classic";

diff --git a/packages/catppuccin-gtk/default.nix b/packages/catppuccin-gtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, jdupes, sassc
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, sassc
 , accent ? [ "default" ], shade ? "dark", size ? "standard", tweaks ? [ ], }:
 
 let
@@ -24,6 +24,7 @@ in lib.checkListOfEnum "${pname} Valid theme accent(s)" validAccents accent
 lib.checkListOfEnum "${pname} Valid shades" validShades (single shade)
 lib.checkListOfEnum "${pname} Valid sizes" validSizes (single size)
 lib.checkListOfEnum "${pname} Valid tweaks" validTweaks tweaks
+
 stdenv.mkDerivation {
   pname = "${pname}";
   version = "0-unstable-2024-06-27";
@@ -35,7 +36,7 @@ stdenv.mkDerivation {
     hash = "sha256-oFVsYrJ27hYGY+x9+Z4SxVCp3w6PiLYTZaxmGhnpVHQ=";
   };
 
-  nativeBuildInputs = [ jdupes sassc ];
+  nativeBuildInputs = [ sassc ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -60,8 +61,6 @@ stdenv.mkDerivation {
       ${toString (map (x: "--tweaks " + x) tweaks)} \
       --dest $out/share/themes
 
-    jdupes --quiet --link-soft --recurse $out/share
-
     runHook postInstall
   '';
 

diff --git a/packages/kanagawa-gtk/default.nix b/packages/kanagawa-gtk/default.nix
@@ -1,11 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, jdupes, themeVariants ? [ ],
-}:
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, themeVariants ? [ "BL" ], }:
 
 let
   inherit (builtins) toString;
   inherit (lib.trivial) checkListOfEnum;
 in checkListOfEnum "$Kanagawa: GTK Theme Variants" [ "B" "B-LB" "BL" "BL-LB" ]
-themeVariants stdenv.mkDerivation {
+themeVariants
+
+stdenv.mkDerivation {
   pname = "kanagawa-gtk";
   version = "unstable-2023-07-04";
 
@@ -16,8 +17,6 @@ themeVariants stdenv.mkDerivation {
     hash = "sha256-BZRmjVas8q6zsYbXFk4bCk5Ec/3liy9PQ8fqFGHAXe0";
   };
 
-  nativeBuildInputs = [ jdupes ];
-
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   installPhase = let gtkTheme = "Kanagawa-${toString themeVariants}";
@@ -29,9 +28,6 @@ themeVariants stdenv.mkDerivation {
     cp -r $src/themes/${gtkTheme} $out/share/themes
     cp -r $src/icons/Kanagawa $out/share/icons
 
-    # Duplicate files -> hard-links = reduced install-size!
-    jdupes -L -r $out/share
-
     runHook postInstall
   '';
 

diff --git a/packages/rose-pine-gtk/default.nix b/packages/rose-pine-gtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, jdupes, themeVariant ? [ ]
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, themeVariant ? [ ]
 , iconVariant ? [ ], }:
 
 let
@@ -10,7 +10,9 @@ in checkListOfEnum "$Rose-Pine: GTK Theme Variants" [
   "Main-BL-LB"
   "Main-BL"
 ] themeVariant checkListOfEnum "$RosePine: GTK Theme Variants" [ "" "Moon" ]
-iconVariant stdenv.mkDerivation {
+iconVariant
+
+stdenv.mkDerivation {
   pname = "rose-pine-gtk";
   version = "unstable-2023-02-20";
 
@@ -21,8 +23,6 @@ iconVariant stdenv.mkDerivation {
     hash = "";
   };
 
-  nativeBuildInputs = [ jdupes ];
-
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   installPhase = let
@@ -36,9 +36,6 @@ iconVariant stdenv.mkDerivation {
     cp -r $src/themes/${gtkTheme} $out/share/themes
     cp -r $src/icons/${iconTheme} $out/share/icons
 
-    # Duplicate files -> hard-links = reduced install-size!
-    jdupes -L -r $out/share
-
     runHook postInstall
   '';
 

diff --git a/packages/tokyonight-gtk/default.nix b/packages/tokyonight-gtk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, jdupes, sassc
+{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, sassc
 , accent ? [ "default" ], shade ? "dark", size ? "standard", }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     hash = "sha256-oKqLb66N4swHfhjUZJIGryE0D9MkuLdKFQa6j3TFmOg=";
   };
 
-  nativeBuildInputs = [ jdupes sassc ];
+  nativeBuildInputs = [ sassc ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -48,8 +48,6 @@ stdenv.mkDerivation {
       ${lib.optionalString (size != null) ("--size " + size)} \
       --dest $out/share/themes
 
-    jdupes --quiet --link-soft --recurse $out/share
-
     runHook postInstall
   '';