refactor: update flake

* move to catppuccin namespace (catppuccin/nix#371)
42willow · Dec 26, 2024 · 08a925e · 08a925e
1 parent 35e8d49
commit 08a925e
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 66 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -63,7 +63,6 @@
     self,
     nixpkgs,
     home-manager,
-    catppuccin,
     ...
   } @ inputs: let
     username = "willow";
@@ -74,7 +73,6 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/earthy
-          catppuccin.nixosModules.catppuccin
           home-manager.nixosModules.home-manager
         ];
         specialArgs = {
@@ -86,7 +84,6 @@
         system = "aarch64-linux";
         modules = [
           ./hosts/anemone
-          catppuccin.nixosModules.catppuccin
           home-manager.nixosModules.home-manager
         ];
         specialArgs = {
@@ -98,7 +95,6 @@
         system = "x86_64-linux";
         modules = [
           ./hosts/lily
-          catppuccin.nixosModules.catppuccin
           home-manager.nixosModules.home-manager
         ];
         specialArgs = {

diff --git a/modules/themes/catppuccin.nix b/modules/themes/catppuccin.nix
@@ -1,7 +1,11 @@
-{catppuccin, ...}: {
+{inputs, ...}: {
+  imports = [
+    inputs.catppuccin.nixosModules.catppuccin
+  ];
   catppuccin = {
     flavor = "macchiato";
     accent = "pink";
+
+    tty.enable = true;
   };
-  console.catppuccin.enable = true;
 }
diff --git a/users/willow/pkgs/default.nix b/users/willow/pkgs/default.nix
@@ -14,7 +14,7 @@
       # TODO: whiskers
       # catppuccin-whiskers.packages.${pkgs.system}.whiskers
       catppuccin-catwalk.packages.${pkgs.system}.catwalk
-      inputs.zen-browser.packages."${pkgs.system}".specific
+      inputs.zen-browser.packages."${pkgs.system}".default
     ]
     ++ (with inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; [
       calibre # ebooks

diff --git a/users/willow/pkgs/gui/hyprland/settings.nix b/users/willow/pkgs/gui/hyprland/settings.nix
@@ -1,5 +1,4 @@
 {...}: {
-  wayland.windowManager.hyprland.catppuccin.enable = true;
   wayland.windowManager.hyprland.settings = {
     # See https://wiki.hyprland.org/Configuring/
 

diff --git a/users/willow/pkgs/gui/obs-studio.nix b/users/willow/pkgs/gui/obs-studio.nix
@@ -4,6 +4,5 @@
     plugins = with pkgs.obs-studio-plugins; [
       wlrobs
     ];
-    catppuccin.enable = true;
   };
 }
diff --git a/users/willow/pkgs/tui/yazi.nix b/users/willow/pkgs/tui/yazi.nix
@@ -1,6 +1,3 @@
 {...}: {
-  programs.yazi = {
-    enable = true;
-    catppuccin.enable = true;
-  };
+  programs.yazi.enable = true;
 }
diff --git a/users/willow/themes/catppuccin.nix b/users/willow/themes/catppuccin.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.catppuccin.homeManagerModules.catppuccin
+  ];
+
+  catppuccin = {
+    flavor = "macchiato";
+    accent = "pink";
+
+    enable = true;
+  };
+
+}
diff --git a/users/willow/themes/ctp.nix b/users/willow/themes/ctp.nix
diff --git a/users/willow/themes/default.nix b/users/willow/themes/default.nix
@@ -1,6 +1,8 @@
 {...}: {
   imports = [
-    ./ctp.nix
+    ./catppuccin.nix
+    ./gtk.nix
+    ./qt.nix
     ./stylix.nix
   ];
 }
diff --git a/users/willow/themes/gtk.nix b/users/willow/themes/gtk.nix
@@ -0,0 +1,16 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  gtk = {
+    enable = true;
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.catppuccin-papirus-folders.override {
+        flavor = "macchiato";
+        accent = "pink";
+      };
+    };
+  };
+}
diff --git a/users/willow/themes/qt.nix b/users/willow/themes/qt.nix
@@ -0,0 +1,9 @@
+{...}: {
+  qt = {
+    enable = true;
+    platformTheme.name = "kvantum";
+    style = {
+      name = "kvantum";
+    };
+  };
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,5 @@ @@
         plugins = with pkgs.obs-studio-plugins; [
           wlrobs
         ];
-        catppuccin.enable = true;
       };
     }