diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..cb1f162
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,83 @@
+{
+  "nodes": {
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1771587924,
+        "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771625283,
+        "narHash": "sha256-1T88/PSNKpRNtaiXATTae0hpRnBpjmIL0b1QfGO6HBA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "a913ae61bf3b9f4312f6097b68cdf0a0fa699279",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "catppuccin": "catppuccin",
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs_2"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..65eefd4
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,34 @@
+{
+  description = "Home manager config";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    catppuccin.url = "github:catppuccin/nix";
+  };
+
+  outputs =
+    {
+      nixpkgs,
+      home-manager,
+      catppuccin,
+      ...
+    }:
+    {
+
+      homeConfigurations."szymon" = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs {
+          system = "x86_64-linux";
+        };
+
+        modules = [
+          ./home.nix
+          catppuccin.homeModules.catppuccin
+        ];
+      };
+    };
+}
diff --git a/home.nix b/home.nix
index 0bd3bc6..ca8bb70 100644
--- a/home.nix
+++ b/home.nix
@@ -14,6 +14,12 @@
     ];
   };
 
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+    accent = "mauve";
+  };
+
   imports = [
     ./modules/packages.nix
     ./modules/fish.nix
@@ -25,6 +31,7 @@
     ./modules/ssh.nix
     ./modules/bat.nix
     ./modules/git.nix
+    ./modules/kitty.nix
   ];
 
   home.stateVersion = "25.11"; # Please read the comment before changing.
diff --git a/modules/bat.nix b/modules/bat.nix
index 5ad371b..e6d74fa 100644
--- a/modules/bat.nix
+++ b/modules/bat.nix
@@ -3,22 +3,5 @@
 {
   programs.bat = {
     enable = true;
-
-    config = {
-      theme = "catppuccin-mocha";
-    };
-
-    themes = {
-      catppuccin-mocha = {
-        src = pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "6810349b28055dce54076712fc05fc68da4b8ec0";
-          hash = "sha256-lJapSgRVENTrbmpVyn+UQabC9fpV1G1e+CdlJ090uvg=";
-
-        };
-        file = "themes/Catppuccin Mocha.tmTheme";
-      };
-    };
   };
 }
diff --git a/modules/btop.nix b/modules/btop.nix
index 1a6fc88..ef4140d 100644
--- a/modules/btop.nix
+++ b/modules/btop.nix
@@ -1,11 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.btop = {
     enable = true;
     settings = {
       vim_keys = true;
-      color_theme = "catppuccin_mocha";
     };
   };
 }
diff --git a/modules/kitty.nix b/modules/kitty.nix
new file mode 100644
index 0000000..31fcea1
--- /dev/null
+++ b/modules/kitty.nix
@@ -0,0 +1,41 @@
+{ pkgs, lib, ... }:
+
+{
+  programs.kitty = lib.mkForce {
+    enable = true;
+    package = pkgs.runCommand "dummy-kitty" { } "mkdir $out";
+    settings = {
+      confirm_os_window_close = 0;
+      dynamic_background_opacity = true;
+      enable_audio_bell = false;
+      mouse_hide_wait = "-1.0";
+      window_padding_width = 10;
+      background_opacity = "0.5";
+      background_blur = 5;
+      symbol_map =
+        let
+          mappings = [
+            "U+23FB-U+23FE"
+            "U+2B58"
+            "U+E200-U+E2A9"
+            "U+E0A0-U+E0A3"
+            "U+E0B0-U+E0BF"
+            "U+E0C0-U+E0C8"
+            "U+E0CC-U+E0CF"
+            "U+E0D0-U+E0D2"
+            "U+E0D4"
+            "U+E700-U+E7C5"
+            "U+F000-U+F2E0"
+            "U+2665"
+            "U+26A1"
+            "U+F400-U+F4A8"
+            "U+F67C"
+            "U+E000-U+E00A"
+            "U+F300-U+F313"
+            "U+E5FA-U+E62B"
+          ];
+        in
+        (builtins.concatStringsSep "," mappings) + " Symbols Nerd Font";
+    };
+  };
+}