chore: Update lockfile and apply Package Changes

coredev-uk · Dec 24, 2024 · 6078bf6 · 6078bf6
1 parent 1da26d1
commit 6078bf6
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/common/desktop/alacritty.nix b/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";

diff --git a/home/common/desktop/dunst.nix b/home/common/desktop/dunst.nix
@@ -4,11 +4,11 @@ let
   theme = import "${self}/lib/theme" { inherit pkgs; };
 in
 {
+  catppuccin.dunst.enable = true;
+
   services.dunst = {
     enable = true;
 
-    catppuccin.enable = true;
-
     iconTheme = {
       package = pkgs.papirus-icon-theme;
       name = "Papirus";

diff --git a/home/common/desktop/polybar.nix b/home/common/desktop/polybar.nix
@@ -90,9 +90,10 @@ let
   '';
 in
 {
+  catppuccin.polybar.enable = true;
+
   services.polybar = {
     enable = true;
-    catppuccin.enable = true;
 
     script = ''
       for m in $(polybar --list-monitors | ${pkgs.coreutils}/bin/cut -d":" -f1); do

diff --git a/home/common/desktop/rofi.nix b/home/common/desktop/rofi.nix
@@ -1,13 +1,11 @@
 { pkgs, desktop, ... }:
 
 {
+  catppuccin.rofi.enable = true;
+
   programs.rofi = {
     enable = true;
     package = if desktop == "i3" then pkgs.rofi else pkgs.rofi-wayland;
-    catppuccin = {
-      enable = true;
-      flavor = "mocha";
-    };
     terminal = "${pkgs.alacritty}/bin/alacritty";
 
     extraConfig = {

diff --git a/home/common/shell/bat.nix b/home/common/shell/bat.nix
@@ -1,8 +1,9 @@
 _: {
+  catppuccin.bat.enable = true;
+
   programs = {
     bat = {
       enable = true;
-      catppuccin.enable = true;
     };
   };
 }
diff --git a/home/common/shell/bottom.nix b/home/common/shell/bottom.nix
@@ -1,6 +1,7 @@
 _: {
+  catppuccin.bottom.enable = true;
+
   programs.bottom = {
     enable = true;
-    catppuccin.enable = true;
   };
 }
diff --git a/home/common/shell/vim.nix b/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;

diff --git a/home/common/shell/zsh.nix b/home/common/shell/zsh.nix
@@ -7,6 +7,8 @@
     starship
   ];
 
+  catppuccin.zsh-syntax-highlighting.enable = true;
+
   programs = {
     zsh = {
       enable = true;
@@ -16,7 +18,6 @@
       autosuggestion.enable = true;
       syntaxHighlighting = {
         enable = true;
-        catppuccin.enable = true;
       };
 
       history = {