From 6078bf6b6a7056b1dc79428504c9cccf4d3ded37 Mon Sep 17 00:00:00 2001
From: Core <core@coredev.uk>
Date: Tue, 24 Dec 2024 13:28:33 +0000
Subject: [PATCH] chore: Update lockfile and apply Package Changes

---
 flake.lock                        | 18 +++++++++---------
 home/common/desktop/alacritty.nix |  3 ++-
 home/common/desktop/dunst.nix     |  4 ++--
 home/common/desktop/polybar.nix   |  3 ++-
 home/common/desktop/rofi.nix      |  6 ++----
 home/common/shell/bat.nix         |  3 ++-
 home/common/shell/bottom.nix      |  3 ++-
 home/common/shell/vim.nix         |  3 ++-
 home/common/shell/zsh.nix         |  3 ++-
 9 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 18d08d8..e73a875 100644
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1734734291,
-        "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=",
+        "lastModified": 1735028008,
+        "narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8",
+        "rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734944412,
-        "narHash": "sha256-36QfCAl8V6nMIRUCgiC79VriJPUXXkHuR8zQA1vAtSU=",
+        "lastModified": 1734992499,
+        "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8264bfe3a064d704c57df91e34b795b6ac7bad9e",
+        "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1734820165,
-        "narHash": "sha256-qkPmnVYb6w2KdipyigI9ipNR7A8dsFStBRH5sZ+rmqA=",
+        "lastModified": 1734994463,
+        "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "26a59c1b037e43f82b0fada2a218aeb128bc5d21",
+        "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67",
         "type": "github"
       },
       "original": {
diff --git a/home/common/desktop/alacritty.nix b/home/common/desktop/alacritty.nix
index a5ec1f1..86c985a 100755
--- 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
index 71e4fcf..3c20553 100644
--- 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
index fe5355d..4f01967 100755
--- 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
index eef087b..9023c5a 100755
--- 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
index e275958..4e3cea0 100644
--- 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
index 81ffb79..65272f1 100644
--- 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
index fc2891a..448aeb8 100644
--- 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
index 848c062..b4cb516 100755
--- 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 = {