feat(modules): move to catppuccin namespace (#371)

Co-authored-by: Weathercold <[email protected]> Co-authored-by: seth <[email protected]>
catppuccin · Dec 19, 2024 · 20c0cb2 · 20c0cb2
1 parent 5cdefd6
commit 20c0cb2
Show file tree

Hide file tree

Showing 57 changed files with 1,019 additions and 232 deletions.
diff --git a/docs/mk-search.nix b/docs/mk-search.nix
@@ -3,7 +3,7 @@
 { catppuccin, versionName }:
 
 let
-  urlPrefix = "https://github.com/catppuccin/nix/tree/${catppuccin.rev}/";
+  urlPrefix = "https://github.com/catppuccin/nix/tree/${catppuccin.rev or "main"}/";
 in
 
 mkMultiSearch {

diff --git a/modules/home-manager/aerc.nix b/modules/home-manager/aerc.nix
@@ -3,13 +3,20 @@
 
 let
   inherit (config.catppuccin) sources;
-
-  cfg = config.programs.aerc.catppuccin;
+  cfg = config.catppuccin.aerc;
   themeName = "catppuccin-${cfg.flavor}";
 in
-
 {
-  options.programs.aerc.catppuccin = catppuccinLib.mkCatppuccinOption { name = "aerc"; };
+  options.catppuccin.aerc = catppuccinLib.mkCatppuccinOption { name = "aerc"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "aerc"
+      "catppuccin"
+    ];
+    to = "aerc";
+  };
 
   config = lib.mkIf cfg.enable {
     programs.aerc = {

diff --git a/modules/home-manager/alacritty.nix b/modules/home-manager/alacritty.nix
@@ -3,12 +3,19 @@
 
 let
   inherit (config.catppuccin) sources;
-
-  cfg = config.programs.alacritty.catppuccin;
+  cfg = config.catppuccin.alacritty;
 in
-
 {
-  options.programs.alacritty.catppuccin = catppuccinLib.mkCatppuccinOption { name = "alacritty"; };
+  options.catppuccin.alacritty = catppuccinLib.mkCatppuccinOption { name = "alacritty"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "alacritty"
+      "catppuccin"
+    ];
+    to = "alacritty";
+  };
 
   config = lib.mkIf cfg.enable {
     programs.alacritty = {

diff --git a/modules/home-manager/all-modules.nix b/modules/home-manager/all-modules.nix
@@ -5,7 +5,7 @@
   ./bottom.nix
   ./btop.nix
   ./cava.nix
-  ./cursor.nix
+  ./cursors.nix
   ./delta.nix
   ./dunst.nix
   ./fcitx5.nix
@@ -41,7 +41,7 @@
   ./sway.nix
   ./tmux.nix
   ./tofi.nix
-  ./obs-studio.nix
+  ./obs.nix
   ./waybar.nix
   ./yazi.nix
   ./zathura.nix

diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix
@@ -3,13 +3,20 @@
 
 let
   inherit (config.catppuccin) sources;
-
-  cfg = config.programs.bat.catppuccin;
+  cfg = config.catppuccin.bat;
   themeName = "Catppuccin ${catppuccinLib.mkUpper cfg.flavor}";
 in
-
 {
-  options.programs.bat.catppuccin = catppuccinLib.mkCatppuccinOption { name = "bat"; };
+  options.catppuccin.bat = catppuccinLib.mkCatppuccinOption { name = "bat"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "bat"
+      "catppuccin"
+    ];
+    to = "bat";
+  };
 
   config = lib.mkIf cfg.enable {
     programs.bat = {

diff --git a/modules/home-manager/bottom.nix b/modules/home-manager/bottom.nix
@@ -3,12 +3,19 @@
 
 let
   inherit (config.catppuccin) sources;
-
-  cfg = config.programs.bottom.catppuccin;
+  cfg = config.catppuccin.bottom;
 in
-
 {
-  options.programs.bottom.catppuccin = catppuccinLib.mkCatppuccinOption { name = "bottom"; };
+  options.catppuccin.bottom = catppuccinLib.mkCatppuccinOption { name = "bottom"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "bottom"
+      "catppuccin"
+    ];
+    to = "bottom";
+  };
 
   config = lib.mkIf cfg.enable {
     programs.bottom = {

diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix
@@ -4,7 +4,7 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.programs.btop.catppuccin;
+  cfg = config.catppuccin.btop;
   enable = cfg.enable && config.programs.btop.enable;
 
   themeFile = "catppuccin_${cfg.flavor}.theme";
@@ -13,7 +13,16 @@ let
 in
 
 {
-  options.programs.btop.catppuccin = catppuccinLib.mkCatppuccinOption { name = "btop"; };
+  options.catppuccin.btop = catppuccinLib.mkCatppuccinOption { name = "btop"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "btop"
+      "catppuccin"
+    ];
+    to = "btop";
+  };
 
   config = lib.mkIf enable {
     xdg.configFile = {

diff --git a/modules/home-manager/cava.nix b/modules/home-manager/cava.nix
@@ -4,15 +4,39 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.programs.cava.catppuccin;
+  cfg = config.catppuccin.cava;
   flavor = "${cfg.flavor}" + lib.optionalString cfg.transparent "-transparent";
 in
-
 {
-  options.programs.cava.catppuccin = catppuccinLib.mkCatppuccinOption { name = "cava"; } // {
+  options.catppuccin.cava = catppuccinLib.mkCatppuccinOption { name = "cava"; } // {
     transparent = lib.mkEnableOption "transparent version of flavor";
   };
 
+  imports =
+    (catppuccinLib.mkRenamedCatppuccinOptions {
+      from = [
+        "programs"
+        "cava"
+        "catppuccin"
+      ];
+      to = "cava";
+    })
+    ++ [
+      (lib.mkRenamedOptionModule
+        [
+          "programs"
+          "cava"
+          "catppuccin"
+          "transparent"
+        ]
+        [
+          "catppuccin"
+          "cava"
+          "transparent"
+        ]
+      )
+    ];
+
   config = lib.mkIf cfg.enable {
     programs.cava = {
       settings = catppuccinLib.fromINIRaw (sources.cava + "/themes/${flavor}.cava");

diff --git a/modules/home-manager/cursor.nix → modules/home-manager/cursors.nix b/modules/home-manager/cursor.nix → modules/home-manager/cursors.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  cfg = config.catppuccin.pointerCursor;
+  cfg = config.catppuccin.cursors;
 
   # "dark" and "light" can be used alongside the regular accents
   cursorAccentType = catppuccinLib.mergeEnums catppuccinLib.types.accent (
@@ -19,7 +19,7 @@ let
 in
 
 {
-  options.catppuccin.pointerCursor =
+  options.catppuccin.cursors =
     catppuccinLib.mkCatppuccinOption {
       name = "pointer cursors";
       # NOTE: We exclude this as there is no `enable` option in the upstream
@@ -34,6 +34,15 @@ in
       };
     };
 
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "catppuccin"
+      "pointerCursor"
+    ];
+    to = "cursors";
+    accentSupport = true;
+  };
+
   config = lib.mkIf cfg.enable {
     home.pointerCursor = {
       name = "catppuccin-${cfg.flavor}-${cfg.accent}-cursors";

diff --git a/modules/home-manager/delta.nix b/modules/home-manager/delta.nix
@@ -4,12 +4,22 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.programs.git.delta.catppuccin;
+  cfg = config.catppuccin.delta;
   enable = cfg.enable && config.programs.git.delta.enable;
 in
 
 {
-  options.programs.git.delta.catppuccin = catppuccinLib.mkCatppuccinOption { name = "delta"; };
+  options.catppuccin.delta = catppuccinLib.mkCatppuccinOption { name = "delta"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "git"
+      "delta"
+      "catppuccin"
+    ];
+    to = "delta";
+  };
 
   config = lib.mkIf enable {
     programs.git = {

diff --git a/modules/home-manager/dunst.nix b/modules/home-manager/dunst.nix
@@ -4,19 +4,44 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.services.dunst.catppuccin;
+  cfg = config.catppuccin.dunst;
   enable = cfg.enable && config.services.dunst.enable;
 in
 
 {
-  options.services.dunst.catppuccin = catppuccinLib.mkCatppuccinOption { name = "dunst"; } // {
+  options.catppuccin.dunst = catppuccinLib.mkCatppuccinOption { name = "dunst"; } // {
     prefix = lib.mkOption {
       type = lib.types.str;
       default = "00";
       description = "Prefix to use for the dunst drop-in file";
     };
   };
 
+  imports =
+    (catppuccinLib.mkRenamedCatppuccinOptions {
+      from = [
+        "services"
+        "dunst"
+        "catppuccin"
+      ];
+      to = "dunst";
+    })
+    ++ [
+      (lib.mkRenamedOptionModule
+        [
+          "services"
+          "dunst"
+          "catppuccin"
+          "prefix"
+        ]
+        [
+          "catppuccin"
+          "dunst"
+          "prefix"
+        ]
+      )
+    ];
+
   # Dunst currently has no "include" functionality, but has "drop-ins"
   # Unfortunately, this may cause inconvenience as it overrides ~/.config/dunst/dunstrc
   # but it can be overridden by another drop-in.

diff --git a/modules/home-manager/fcitx5.nix b/modules/home-manager/fcitx5.nix
@@ -4,12 +4,12 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.i18n.inputMethod.fcitx5.catppuccin;
+  cfg = config.catppuccin.fcitx5;
   enable = cfg.enable && config.i18n.inputMethod.enabled == "fcitx5";
 in
 
 {
-  options.i18n.inputMethod.fcitx5.catppuccin =
+  options.catppuccin.fcitx5 =
     catppuccinLib.mkCatppuccinOption {
       name = "Fcitx5";
       accentSupport = true;
@@ -25,6 +25,34 @@ in
       };
     };
 
+  imports =
+    (catppuccinLib.mkRenamedCatppuccinOptions {
+      from = [
+        "i18n"
+        "inputMethod"
+        "fcitx5"
+        "catppuccin"
+      ];
+      to = "fcitx5";
+      accentSupport = true;
+    })
+    ++ [
+      (lib.mkRenamedOptionModule
+        [
+          "i18n"
+          "inputMethod"
+          "fcitx5"
+          "catppuccin"
+          "apply"
+        ]
+        [
+          "catppuccin"
+          "fcitx5"
+          "apply"
+        ]
+      )
+    ];
+
   config = lib.mkIf enable {
     xdg.dataFile = {
       "fcitx5/themes/catppuccin-${cfg.flavor}-${cfg.accent}" = {

diff --git a/modules/home-manager/fish.nix b/modules/home-manager/fish.nix
@@ -4,15 +4,24 @@
 let
   inherit (config.catppuccin) sources;
 
-  cfg = config.programs.fish.catppuccin;
+  cfg = config.catppuccin.fish;
   enable = cfg.enable && config.programs.fish.enable;
 
   themeName = "Catppuccin ${catppuccinLib.mkUpper cfg.flavor}";
   themePath = "/themes/${themeName}.theme";
 in
 
 {
-  options.programs.fish.catppuccin = catppuccinLib.mkCatppuccinOption { name = "fish"; };
+  options.catppuccin.fish = catppuccinLib.mkCatppuccinOption { name = "fish"; };
+
+  imports = catppuccinLib.mkRenamedCatppuccinOptions {
+    from = [
+      "programs"
+      "fish"
+      "catppuccin"
+    ];
+    to = "fish";
+  };
 
   config = lib.mkIf enable {
     xdg.configFile."fish${themePath}".source = "${sources.fish}${themePath}";