diff --git a/flake.lock b/flake.lock
index 8b8ea79..4713bdb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,26 @@
         "type": "github"
       }
     },
+    "comin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734693645,
+        "narHash": "sha256-Vw3YpuQxwBse5JiTGBH5MSPmqXOXFI4ROs7IF3tRc7k=",
+        "owner": "xinyangli",
+        "repo": "comin",
+        "rev": "c8a66bbd129e88ad916cac59f1ad9f45d39b3190",
+        "type": "github"
+      },
+      "original": {
+        "owner": "xinyangli",
+        "repo": "comin",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "nixpkgs": [
@@ -642,6 +662,7 @@
       "inputs": {
         "catppuccin": "catppuccin",
         "colmena": "colmena",
+        "comin": "comin",
         "disko": "disko",
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager",
diff --git a/flake.nix b/flake.nix
index 4da0466..becf4ba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,6 +55,11 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    comin = {
+      url = "github:xinyangli/comin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -72,6 +77,7 @@
       colmena,
       nix-index-database,
       disko,
+      comin,
       ...
     }:
     let
@@ -114,6 +120,7 @@
           catppuccin.nixosModules.catppuccin
           machines/calcite/configuration.nix
           (mkHome "xin" "calcite")
+          comin.nixosModules.comin
         ];
         hk-00 = [
           ./machines/dolomite/claw.nix
diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix
index c5afb73..c8e4e4a 100644
--- a/machines/calcite/configuration.nix
+++ b/machines/calcite/configuration.nix
@@ -15,6 +15,18 @@ in
     ../sops.nix
   ];
 
+  services.comin = {
+    enable = true;
+    remotes = [
+      {
+        name = "origin";
+        url = "https://github.com/xinyangli/nixos-config.git";
+        branches.main.name = "deploy-comin-eval";
+      }
+    ];
+    hostname = config.networking.hostName;
+  };
+
   commonSettings = {
     # auth.enable = true;
     nix = {
@@ -176,7 +188,7 @@ in
         ];
         settings = {
           main = {
-            capslock = "overload(control, esc)";
+            leftcontrol = "overload(control, esc)";
           };
         };
       };