From 4ca5c379bfeffbffeb44beec4afb9fea40ed78fb Mon Sep 17 00:00:00 2001
From: Isshi0417 <isshi0417@gmail.com>
Date: Fri, 12 Jul 2024 12:51:21 +0900
Subject: [PATCH] Configure kitty

---
 modules/home-manager/default.nix              |  2 +-
 modules/home-manager/ricing/default.nix       |  1 -
 .../home-manager/ricing/stylix/default.nix    |  2 +
 .../kitty/themes/retrofuturism/default.nix    | 38 +++++++++----------
 modules/home-manager/vscode/default.nix       | 13 -------
 modules/ricing/stylix/default.nix             | 26 ++++---------
 6 files changed, 29 insertions(+), 53 deletions(-)
 delete mode 100644 modules/home-manager/vscode/default.nix

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index ba7c61d..870303e 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -5,7 +5,6 @@
         ./git
         ./terminal
         ./gnome-extensions
-        ./vscode
         ./ricing
     ];
 
@@ -17,6 +16,7 @@
         ferdium
         git
         gh
+        vscode-fhs
 
         # School
         libreoffice-fresh
diff --git a/modules/home-manager/ricing/default.nix b/modules/home-manager/ricing/default.nix
index ee796e9..0571e57 100644
--- a/modules/home-manager/ricing/default.nix
+++ b/modules/home-manager/ricing/default.nix
@@ -2,7 +2,6 @@
 
 {
     imports = [
-        ./stylix
     ];
 
     # GTK theming
diff --git a/modules/home-manager/ricing/stylix/default.nix b/modules/home-manager/ricing/stylix/default.nix
index dcc3a1c..e487a4f 100644
--- a/modules/home-manager/ricing/stylix/default.nix
+++ b/modules/home-manager/ricing/stylix/default.nix
@@ -5,6 +5,8 @@
         enable = true;
         autoEnable = false;
 
+        image = ../../../wallpapers/maze.png;
+
         targets = {
             gnome.enable = true;
             gtk.enable = true;
diff --git a/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix b/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix
index e029591..21f93b0 100644
--- a/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix
+++ b/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix
@@ -3,43 +3,43 @@
 {
     programs.kitty = {
         settings = {
-            foreground = "#f8f8f2";
-            background = "#4c4c4c";
+            foreground = "#e5e5cd";
+            background = "#413e3e";
 
-            selection_foreground = "#4c4c4c";
-            selection_background = "#e7e7e7";
+            selection_foreground = "#413e3e";
+            selection_background = "#e5e5cd";
 
             # black
-            color0 = "#4c4c4c";
-            color8 = "#acacac";
+            color0 = "#343232";
+            color8 = "#5c5656";
 
             # red
-            color1 = "#fe7394";
-            color9 = "#ffedf1";
+            color1 = "#fb5c82";
+            color9 = "#fea6bb";
             
             # green
-            color2 = "#cacc73";
-            color10 = "#dadc9c";
+            color2 = "#c2c561";
+            color10 = "#d9da98";
 
             # yellow
-            color3 = "#fedb5b";
-            color11 = "#fefbea";
+            color3 = "#fbd444";
+            color11 = "#fee68e";
 
             # blue
-            color4 = "#7688ea";
-            color12 = "#edeffc";
+            color4 = "#6075e6";
+            color12 = "#a2aef1";
 
             # magenta
-            color5 = "#fac3ed";
-            color13 = "#fff6fe";
+            color5 = "#f273d4";
+            color13 = "#f9b8ea";
 
             # cyan
-            color6 = "#96ceb4";
+            color6 = "#85c5a8";
             color14 = "#b8dfcd";
 
             # white
-            color7 = "#e5e5cd";
-            color15 = "#f6f6ee";
+            color7 = "#e5e5cc";
+            color15 = "#f7f7ee";
         };
     };
 }
\ No newline at end of file
diff --git a/modules/home-manager/vscode/default.nix b/modules/home-manager/vscode/default.nix
deleted file mode 100644
index 7a13522..0000000
--- a/modules/home-manager/vscode/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-
-{
-    programs.vscode = {
-        enable = true;
-        extensions = with pkgs.vscode-extensions; [
-            bbenoist.nix
-            ms-python.python
-            catppuccin.catppuccin-vsc-icons
-            catppuccin.catppuccin-vsc
-        ];
-    };
-}
\ No newline at end of file
diff --git a/modules/ricing/stylix/default.nix b/modules/ricing/stylix/default.nix
index 6872d60..8e8959f 100644
--- a/modules/ricing/stylix/default.nix
+++ b/modules/ricing/stylix/default.nix
@@ -1,33 +1,21 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
     stylix = {
         enable = true;
         autoEnable = true;
 
-        base16Scheme = {
-            base00 = "343232";
-            base01 = "413e3e";
-            base02 = "4f4a4a";
-            base03 = "5c5656";
-            base04 = "6a6262";
-            base05 = "f6f6ee";
-            base06 = "eeeedd";
-            base07 = "e5e5cd";
-            base08 = "fb5c82";
-            base09 = "c2c561";
-            base0A = "fbd444";
-            base0B = "6075e6";
-            base0C = "f273d4";
-            base0D = "85c5a8";
-            base0E = "caca9b";
-            base0F = "953f48";
-        };
+        homeManagerIntegration.autoImport = false;
 
         image = ../../wallpapers/maze.png;
 
         polarity = "dark";
 
         targets.grub.useImage = true;
+
+        cursor = {
+            package = pkgs.bibata-cursors;
+            name = "Bibata-Modern-Ice";
+        };
     };
 }
\ No newline at end of file