diff --git a/flake.lock b/flake.lock
index 83c1dd5..54b8caf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -114,6 +114,21 @@
         "type": "github"
       }
     },
+    "catppuccin": {
+      "locked": {
+        "lastModified": 1724156255,
+        "narHash": "sha256-rpUCeS/QZwQdJmDrvCm0hRi8bFvQNQKAnIMK5ZDBfpM=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "8886a68edadb1d93c7101337f995ffce4b410ff2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -415,6 +430,7 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "disko": "disko",
         "home-manager": "home-manager",
         "nix": "nix",
diff --git a/flake.nix b/flake.nix
index 6c44444..d147157 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    catppuccin.url = "github:catppuccin/nix";
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager/master";
@@ -17,6 +18,7 @@
     nixos-hardware,
     home-manager,
     stylix,
+    catppuccin,
     ...
   }: let
     inherit (self) outputs;
diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix
index 8711906..1a9407f 100644
--- a/hosts/eve/default.nix
+++ b/hosts/eve/default.nix
@@ -9,6 +9,7 @@
   imports = [
     inputs.nixos-hardware.nixosModules.google-pixelbook
     inputs.stylix.nixosModules.stylix
+    inputs.catppuccin.nixosModules.catppuccin
     ./hardware-configuration.nix
     # ../disko/mmcblk.nix
     ../workstation
diff --git a/hosts/themes.nix b/hosts/themes.nix
index e99bcdc..08fdf47 100644
--- a/hosts/themes.nix
+++ b/hosts/themes.nix
@@ -6,26 +6,45 @@
   pkgs,
   ...
 }: {
-  stylix = {
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
-    image = ./fan-table-device-box-wallpaper.jpg;
-    fonts = {
-      # monospace = {
-      #   package = pkgs.nerdfonts.override {fonts = ["Source Code Pro"];};
-      #   # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
-      # };
-      sizes = {
-        applications = 10;
-        terminal = 9;
-        desktop = 10;
-        popups = 10;
-      };
-    };
-    opacity = {
-      applications = 1.0;
-      terminal = 0.75;
-      desktop = 1.0;
-      popups = 1.0;
-    };
+  # stylix = {
+  #   base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml";
+  #   image = ./fan-table-device-box-wallpaper.jpg;
+  #   fonts = {
+  #     # monospace = {
+  #     #   package = pkgs.nerdfonts.override {fonts = ["Source Code Pro"];};
+  #     #   # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+  #     # };
+  #     sizes = {
+  #       applications = 10;
+  #       terminal = 9;
+  #       desktop = 10;
+  #       popups = 10;
+  #     };
+  #   };
+  #   opacity = {
+  #     applications = 1.0;
+  #     terminal = 0.75;
+  #     desktop = 1.0;
+  #     popups = 1.0;
+  #   };
+  # };
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
   };
+  console.catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
+
+  # services.displayManager = {
+  #   sddm = {
+  #     enable = true;
+  #     catppuccin = {
+  #       enable = true;
+  #       flavor = "mocha";
+  #       background = ./fan-table-device-box-wallpaper.jpg;
+  #     };
+  #   };
+  # };
 }
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index e8ee112..aabf050 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -116,31 +116,31 @@ in {
         ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none"
       '';
     };
-    kmscon = {
-      enable = true;
-      fonts = [
-        {
-          name = "Source Code Pro";
-          package = pkgs.source-code-pro;
-        }
-      ];
-      extraConfig = ''
-        font-size=10
-        palette=custom
-        palette-black=33, 34, 44
-        palette-cyan=128, 255, 234
-        palette-dark-grey=182, 185, 201
-        palette-green=138, 255, 128
-        palette-dark-grey=65, 69, 88
-        palette-light-grey=98, 103, 132
-        palette-light-green=208, 255, 204
-        palette-light-red=255, 212, 204
-        palette-light-yellow=255, 255, 204
-        palette-red=255, 149, 128
-        palette-white=248, 248, 242
-        palette-yellow=255, 255, 128
-      '';
-    };
+    # kmscon = {
+    #   enable = true;
+    #   fonts = [
+    #     {
+    #       name = "Source Code Pro";
+    #       package = pkgs.source-code-pro;
+    #     }
+    #   ];
+    #   extraConfig = ''
+    #     font-size=10
+    #     palette=custom
+    #     palette-black=33, 34, 44
+    #     palette-cyan=128, 255, 234
+    #     palette-dark-grey=182, 185, 201
+    #     palette-green=138, 255, 128
+    #     palette-dark-grey=65, 69, 88
+    #     palette-light-grey=98, 103, 132
+    #     palette-light-green=208, 255, 204
+    #     palette-light-red=255, 212, 204
+    #     palette-light-yellow=255, 255, 204
+    #     palette-red=255, 149, 128
+    #     palette-white=248, 248, 242
+    #     palette-yellow=255, 255, 128
+    #   '';
+    # };
     pcscd = {
       enable = true;
     };