diff --git a/home-manager/flake.lock b/home-manager/flake.lock
index 098c200..14e5ada 100644
--- a/home-manager/flake.lock
+++ b/home-manager/flake.lock
@@ -84,13 +84,34 @@
         "type": "github"
       }
     },
-    "codex-cli-nix": {
+    "claude-code-nix": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
+      "locked": {
+        "lastModified": 1771545934,
+        "narHash": "sha256-z2ZijehdcpfRnwu717pFirzHUoYfHHlo1Eu+Ajfme4U=",
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
+        "rev": "d09b5d8e0678cd5c87443d85d48983f866ef6f1c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sadjow",
+        "repo": "claude-code-nix",
+        "type": "github"
+      }
+    },
+    "codex-cli-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
         "lastModified": 1771399619,
         "narHash": "sha256-N6EixHow33gRNkAhHr7ySRBXPxtS1Eg2PZGcL1Me/cI=",
@@ -194,6 +215,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -405,6 +444,7 @@
     },
     "root": {
       "inputs": {
+        "claude-code-nix": "claude-code-nix",
         "codex-cli-nix": "codex-cli-nix",
         "home-manager": "home-manager",
         "niri": "niri",
@@ -465,7 +505,7 @@
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -516,6 +556,21 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {
diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index 39246a5..6e6e4db 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -38,9 +38,14 @@
       url = "github:sadjow/codex-cli-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    claude-code-nix = {
+      url = "github:sadjow/claude-code-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, rust-overlay, stylix, niri, codex-cli-nix, ... }@inputs: {
+  outputs = { nixpkgs, home-manager, rust-overlay, stylix, niri, codex-cli-nix, claude-code-nix, ... }@inputs: {
     homeConfigurations.lusia = home-manager.lib.homeManagerConfiguration {
       pkgs = nixpkgs.legacyPackages.x86_64-linux;
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index ea57ff7..6fa1e04 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,7 +9,7 @@
 
   home.packages = with pkgs; [
     # Window manager & desktop environment
-    inputs.niri.packages.${pkgs.system}.niri
+    inputs.niri.packages.${pkgs.stdenv.hostPlatform.system}.niri
     swayidle
     swww
     kanshi
@@ -82,8 +82,8 @@
     gnome-boxes
 
     # AI development tools
-    claude-code
-    inputs.codex-cli-nix.packages.${pkgs.system}.default
+    inputs.claude-code-nix.packages.${pkgs.stdenv.hostPlatform.system}.default
+    inputs.codex-cli-nix.packages.${pkgs.stdenv.hostPlatform.system}.default
     gemini-cli
 
     # Internet & networking