diff --git a/flake.lock b/flake.lock
index 76b2287..019bd04 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,21 @@
         "type": "gitlab"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1713895615,
+        "narHash": "sha256-SVkxhcL0/IN5fNI2dqr702wXOnzktsm0LCEVGRAJQcY=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "a48e70a31616cb63e4794fd3465bff1835cc4246",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "complement": {
       "flake": false,
       "locked": {
@@ -817,6 +832,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "conduit": "conduit",
         "disko": "disko",
         "flake-utils": "flake-utils_3",
diff --git a/flake.nix b/flake.nix
index ce30709..e183a9f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # catpuccin theme
+    catppuccin.url = "github:catppuccin/nix";
+
     # Conduit fork without all the fuss and drama
     conduit = {
       url = "github:girlbossceo/conduwuit";
@@ -79,6 +82,7 @@
     self,
     nixpkgs,
     nixos-generators,
+    catppuccin,
     disko,
     home-manager,
     sops-nix,
@@ -139,8 +143,12 @@
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           nix-index-database.nixosModules.nix-index
+          catppuccin.nixosModules.catppuccin
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
           }
         ];
       };
@@ -156,8 +164,12 @@
           disko.nixosModules.disko
           home-manager.nixosModules.home-manager
           nix-index-database.nixosModules.nix-index
+          catppuccin.nixosModules.catppuccin
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+            ];
           }
         ];
       };
@@ -171,6 +183,12 @@
           sops-nix.nixosModules.sops
           disko.nixosModules.disko
           simple-nixos-mailserver.nixosModule
+          catppuccin.nixosModules.catppuccin
+          {
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+            ];
+          }
         ];
       };
 
@@ -185,8 +203,12 @@
           disko.nixosModules.disko
           jovian.nixosModules.jovian
           home-manager.nixosModules.home-manager
+          catppuccin.nixosModules.catppuccin
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+              inputs.catppuccin.homeManagerModules.catppuccin
+            ];
           }
         ];
       };
@@ -201,8 +223,12 @@
           sops-nix.nixosModules.sops
           home-manager.nixosModules.home-manager
           nix-index-database.nixosModules.nix-index
+          catppuccin.nixosModules.catppuccin
           {
-            home-manager.sharedModules = [inputs.plasma-manager.homeManagerModules.plasma-manager];
+            home-manager.sharedModules = [
+              inputs.plasma-manager.homeManagerModules.plasma-manager
+              inputs.catppuccin.homeManagerModules.catppuccin
+            ];
           }
         ];
       };
@@ -211,6 +237,7 @@
         system = "armv7l-linux";
         specialArgs = {inherit inputs outputs;};
         modules = [
+          catppuccin.nixosModules.catppuccin
           # make the module declared by the linger flake available to our config
           #linger.nixosModules."armv7l-linux".default
           #pihole.nixosModules."armv7l-linux".default
@@ -218,6 +245,11 @@
           # > Our main nixos configuration file <
           ./nixos/hosts/wheatley/configuration.nix
           sops-nix.nixosModules.sops
+          {
+            home-manager.sharedModules = [
+              inputs.catppuccin.homeManagerModules.catppuccin
+            ];
+          }
         ];
       };
     };
diff --git a/home-manager/package-configs/zsh.nix b/home-manager/package-configs/zsh.nix
index f7346cd..f5fde16 100644
--- a/home-manager/package-configs/zsh.nix
+++ b/home-manager/package-configs/zsh.nix
@@ -9,6 +9,7 @@
   # Enable starship
   programs.starship = {
     enable = true;
+    catppuccin.enable = true;
   };
 
   programs.zoxide = {
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index 55493b2..43711d2 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -36,6 +36,11 @@
     };
   };
 
+  catppuccin.flavour = "macchiato";
+  catppuccin.enable = true;
+
+  console.catppuccin.enable = true;
+
   users.users.lillian = {
     isNormalUser = true;
     extraGroups = ["sudo" "networkmanager" "wheel" "vboxsf" "docker"];