Update

flake.nix

@@ -67,43 +67,13 @@
       flake = false;
     };
 
-    catppuccin-fish = {
-      url = "github:catppuccin/fish";
+    rose-pine-fish = {
+      url = "github:rose-pine/fish";
       flake = false;
     };
 
-    catppuccin-gitui = {
-      url = "github:catppuccin/gitui";
-      flake = false;
-    };
-
-    catppuccin-bat = {
-      url = "github:catppuccin/bat";
-      flake = false;
-    };
-
-    catppuccin-hyprland = {
-      url = "github:catppuccin/hyprland";
-      flake = false;
-    };
-
-    catppuccin-waybar = {
-      url = "github:catppuccin/waybar";
-      flake = false;
-    };
-
-    catppuccin-starship = {
-      url = "github:catppuccin/starship";
-      flake = false;
-    };
-
-    catppuccin-fcitx5 = {
-      url = "github:catppuccin/fcitx5";
-      flake = false;
-    };
-
-    catppuccin-grub = {
-      url = "github:catppuccin/grub";
+    rose-pine-fcitx5 = {
+      url = "github:rose-pine/fcitx5";
       flake = false;
     };
   };

home/features/bat.nix

@@ -1,23 +1,11 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.bat = {
     enable = true;
 
     config = {
-      theme = "Catppuccin-mocha";
       style = "changes,header";
     };
 
-    themes = {
-      Catppuccin-mocha = {
-        src = inputs.catppuccin-bat;
-        file = "Catppuccin-mocha.tmTheme";
-      };
-    };
-
     extraPackages = with pkgs.bat-extras; [
       batman
     ];

home/features/fcitx5.nix

@@ -1,8 +1,8 @@
 {inputs, ...}: {
-  xdg.dataFile."fcitx5/themes/catppuccin-mocha" = {
-    source = inputs.catppuccin-fcitx5 + "/src/catppuccin-mocha";
+  xdg.dataFile."fcitx5/themes/rose-pine-moon" = {
+    source = inputs.rose-pine-fcitx5 + "/rose-pine-moon";
   };
   xdg.configFile."fcitx5/conf/classicui.conf" = {
-    text = "Theme=catppuccin-mocha";
+    text = "Theme=rose-pine-moon";
   };
 }

home/features/fish.nix

@@ -4,9 +4,9 @@
   ...
 }: {
   xdg.configFile = {
-    "fish/themes/Catppuccin Mocha.theme" = {
-      text = builtins.readFile (inputs.catppuccin-fish + "/themes/Catppuccin Mocha.theme");
-      onChange = "${pkgs.fish}/bin/fish -c 'yes | fish_config theme save \"Catppuccin Mocha\"'";
+    "fish/themes/Rosé Pine Moon.theme" = {
+      text = builtins.readFile (inputs.rose-pine-fish + "/themes/Rosé Pine Moon.theme");
+      onChange = "${pkgs.fish}/bin/fish -c 'yes | fish_config theme save \"Rosé Pine Moon\"'";
     };
   };
 

home/features/hyprland.nix

@@ -17,8 +17,6 @@
 
       exec-once=${pkgs.waybar}/bin/waybar
 
-      source=${inputs.catppuccin-hyprland}/themes/mocha.conf
-
       animations {
         enabled = true
       }

home/features/starship.nix

@@ -1,14 +1,8 @@
-{inputs, ...}: {
+{
   programs.starship = {
     enable = true;
     enableFishIntegration = true;
     enableBashIntegration = true;
     enableZshIntegration = true;
-
-    settings =
-      {
-        palette = "catppuccin_mocha";
-      }
-      // builtins.fromTOML (builtins.readFile (inputs.catppuccin-starship + "/palettes/mocha.toml"));
   };
 }

home/features/waybar.nix

@@ -1,14 +1,8 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.waybar = {
     enable = true;
     # systemd.enable = true;
 
-    style = builtins.readFile (inputs.catppuccin-waybar + "/themes/mocha.css");
-
     settings = [
       {
         module-left = [

home/features/wezterm/wezterm.lua

@@ -33,7 +33,7 @@ return {
 	initial_rows = 24,
 
 	-- window_background_opacity = 0.8,
-	color_scheme = "Catppuccin Mocha",
+	color_scheme = "Rosé Pine Moon (base16)",
 
 	inactive_pane_hsb = {
 		saturation = 0.8,

home/users/sakuraba/QN63HFT2NY.nix

@@ -8,7 +8,6 @@
     ../../features/fish.nix
     ../../features/fzf.nix
     ../../features/git.nix
-    ../../features/gitui.nix
     ../../features/starship.nix
     ../../features/xplr.nix
     ../../features/atuin.nix

home/users/sakuraba/define7.nix

@@ -9,7 +9,6 @@
     ../../features/fish.nix
     ../../features/fzf.nix
     ../../features/git.nix
-    ../../features/gitui.nix
     ../../features/starship.nix
     ../../features/fcitx5.nix
     ../../features/xplr.nix

home/users/sakuraba/vm.nix

@@ -9,7 +9,6 @@
     ../../features/fish.nix
     ../../features/fzf.nix
     ../../features/git.nix
-    ../../features/gitui.nix
     ../../features/starship.nix
   ];
 

home/users/sakuraba/xps.nix

@@ -11,7 +11,6 @@
     ../../features/fish.nix
     ../../features/fzf.nix
     ../../features/git.nix
-    ../../features/gitui.nix
     ../../features/starship.nix
     ../../features/hyprland.nix
     ../../features/waybar.nix

nixos/common/optional/grub.nix

@@ -1,4 +1,4 @@
-{inputs, ...}: {
+{
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
 
   boot.loader = {
@@ -21,7 +21,6 @@
           chainloader /EFI/Microsoft/Boot/bootmgfw.efi
         }
       '';
-      theme = inputs.catppuccin-grub + "/src/catppuccin-mocha-grub-theme";
     };
   };
 }