chore: refactor catpuccin module usage

Author: jnsgruk

home/common/desktop/alacritty.nix

@@ -3,9 +3,10 @@ let
   theme = import "${self}/lib/theme" { inherit pkgs; };
 in
 {
+  catppuccin.alacritty.enable = true;
+
   programs.alacritty = {
     enable = true;
-    catppuccin.enable = true;
     settings = {
       env = {
         TERM = "alacritty";

home/common/desktop/mako.nix

@@ -8,10 +8,11 @@ let
   theme = import "${self}/lib/theme" { inherit pkgs; };
 in
 {
+  catppuccin.mako.enable = true;
+
   services = {
     mako = {
       enable = true;
-      catppuccin.enable = true;
       actions = true;
       anchor = if hostname == "kara" then "top-center" else "top-right";
       borderRadius = 8;

home/common/desktop/rofi.nix

@@ -1,12 +1,13 @@
 { pkgs, ... }:
 {
+  catppuccin.rofi = {
+    enable = true;
+    flavor = "mocha";
+  };
+
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
-    catppuccin = {
-      enable = true;
-      flavor = "mocha";
-    };
     terminal = "${pkgs.alacritty}/bin/alacritty";
 
     extraConfig = {

home/common/shell/bat.nix

@@ -1,8 +1,9 @@
 _: {
+  catppuccin.bat.enable = true;
+
   programs = {
     bat = {
       enable = true;
-      catppuccin.enable = true;
     };
   };
 }

home/common/shell/bottom.nix

@@ -1,6 +1,7 @@
 _: {
+  catppuccin.bottom.enable = true;
+
   programs.bottom = {
     enable = true;
-    catppuccin.enable = true;
   };
 }

home/common/shell/fzf.nix

@@ -1,8 +1,9 @@
 _: {
+  catppuccin.fzf.enable = true;
+
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
-    catppuccin.enable = true;
 
     changeDirWidgetOptions = [ "--preview 'tree -C {} | head -200'" ];
 

home/common/shell/tmux.nix

@@ -1,10 +1,11 @@
 _: {
+  catppuccin.tmux.enable = true;
+
   programs = {
     tmate.enable = true;
 
     tmux = {
       enable = true;
-      catppuccin.enable = true;
 
       aggressiveResize = true;
       baseIndex = 1;

home/common/shell/vim.nix

@@ -1,9 +1,10 @@
 { pkgs, ... }:
 {
+  catppuccin.nvim.enable = true;
+
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-unwrapped;
-    catppuccin.enable = true;
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;

home/common/shell/zsh.nix

@@ -1,4 +1,6 @@
 {
+  catppuccin.zsh-syntax-highlighting.enable = true;
+
   programs = {
     zsh = {
       enable = true;
@@ -8,7 +10,6 @@
       autosuggestion.enable = true;
       syntaxHighlighting = {
         enable = true;
-        catppuccin.enable = true;
       };
 
       history = {