From d43f76cdd752b8536ebfeb90b8a50b4af1e19819 Mon Sep 17 00:00:00 2001
From: Isshi0417 <isshi0417@gmail.com>
Date: Thu, 11 Jul 2024 21:16:48 +0900
Subject: [PATCH] Configure stylix

---
 flake.nix                                     |  2 +-
 hosts/default/home.nix                        |  1 -
 modules/home-manager/default.nix              |  3 +-
 .../home-manager/ricing/stylix/default.nix    | 12 +------
 modules/home-manager/vscode/default.nix       |  4 +--
 modules/ricing/stylix/themes/nostalgia.nix    | 34 +++++++++----------
 6 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/flake.nix b/flake.nix
index 63ff921..6f11ee6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
           inputs.home-manager.nixosModules.default
 
           # Catppuccin
-          inputs.catppuccin.nixosModules.catppuccin
+          # inputs.catppuccin.nixosModules.catppuccin
           
           # Stylix
           inputs.stylix.nixosModules.stylix
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index db38612..1d32df7 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -4,7 +4,6 @@
   imports =
   [
     ../../modules/home-manager
-    ../../modules/home-manager/ricing/stylix
   ];
 
   home.username = "shoi";
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 35f6118..e307b2e 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -3,10 +3,11 @@
 {
     imports = [
         ./git
-        ./vscode
         ./terminal
         ./gnome-extensions
+        ./vscode
         ./ricing/hyprland
+        ./ricing/stylix
     ];
 
     # Allow Unfree
diff --git a/modules/home-manager/ricing/stylix/default.nix b/modules/home-manager/ricing/stylix/default.nix
index 26de7ee..01135e0 100644
--- a/modules/home-manager/ricing/stylix/default.nix
+++ b/modules/home-manager/ricing/stylix/default.nix
@@ -3,18 +3,8 @@
 {
     stylix = {
         enable = true;
-        autoEnable = false;
+        autoEnable = true;
 
         image = ../../../wallpapers/maze.png;
-
-        targets = {
-            firefox.enable = true;
-            gnome.enable = true;
-            gtk.enable = true;
-            hyprland.enable = true;
-            hyprpaper.enable = true;
-            kitty.enable = true;
-            vesktop.enable = true;
-        };
     };
 }
\ No newline at end of file
diff --git a/modules/home-manager/vscode/default.nix b/modules/home-manager/vscode/default.nix
index da128ce..66354ef 100644
--- a/modules/home-manager/vscode/default.nix
+++ b/modules/home-manager/vscode/default.nix
@@ -6,9 +6,7 @@
         extensions = with pkgs.vscode-extensions; [
             bbenoist.nix
             ms-python.python
-            ms-python.debugpy
-            catppuccin.catppuccin-vsc-icons
-            catppuccin.catppuccin-vsc
+            tal7aouy.icons
         ];
     };
 }
\ No newline at end of file
diff --git a/modules/ricing/stylix/themes/nostalgia.nix b/modules/ricing/stylix/themes/nostalgia.nix
index 7acf613..e96f51e 100644
--- a/modules/ricing/stylix/themes/nostalgia.nix
+++ b/modules/ricing/stylix/themes/nostalgia.nix
@@ -2,25 +2,25 @@
 
 {
     stylix.enable = true;
-    stylix.autoEnable = false;
+    stylix.autoEnable = true;
 
     stylix.base16Scheme = {
-        base00 = "282828"; 
-        base01 = "3c3836"; 
-        base02 = "504945"; 
-        base03 = "665c54"; 
-        base04 = "bdae93"; 
-        base05 = "d5c4a1";
-        base06 = "ebdbb2";
-        base07 = "fbf1c7"; 
-        base08 = "fb4934"; 
-        base09 = "fe8019"; 
-        base0A = "fabd2f"; 
-        base0B = "b8bb26"; 
-        base0C = "8ec07c";
-        base0D = "d3869b"; 
-        base0E = "d65d0e";
-        base0F = "83a598"; 
+        base00 = "181818"; # Deep Space Black
+        base01 = "303030"; # Lunar Gray
+        base02 = "484848"; # Meteorite Gray
+        base03 = "606060"; # Satellite Silver
+        base04 = "808080"; # Moon Dust
+        base05 = "9E9E9E"; # Jet Stream
+        base06 = "BDBDBD"; # Space Cloud
+        base07 = "FFFFFF"; # Pure Energy
+        base08 = "F44336"; # Atomic Red
+        base09 = "2196F3"; # Cosmic Blue
+        base0A = "4CAF50"; # Radioactive Green
+        base0B = "FFEB3B"; # Solar Yellow
+        base0C = "9C27B0"; # Nebula Purple
+        base0D = "FF9800"; # Martian Orange
+        base0E = "795548"; # Rocket Brown
+        base0F = "607D8B"; # Satellite Blue
     };
 
     stylix.image = ../../../wallpapers/maze.png;