From 3aa54b226f613b4967ebb37f28e227c2e317830a Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Tue, 3 Feb 2026 18:31:40 +0100
Subject: [PATCH 1/4] comin: Init module

---
 flake.lock                        | 40 ++++++++++++++++++++++++++++++-
 flake.nix                         |  5 ++++
 modules/system/services/comin.nix | 21 ++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 modules/system/services/comin.nix

diff --git a/flake.lock b/flake.lock
index 741ded2..3c23363 100644
--- a/flake.lock
+++ b/flake.lock
@@ -16,6 +16,27 @@
         "type": "github"
       }
     },
+    "comin": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769758502,
+        "narHash": "sha256-jFT7y3qJdngk4yfS4FM3TC+MBhob/wEVkb/vEh3eF40=",
+        "owner": "nlewo",
+        "repo": "comin",
+        "rev": "69ee06dc03cdd50e72a71634d7840af01afc6114",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nlewo",
+        "repo": "comin",
+        "type": "github"
+      }
+    },
     "crowdsec": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -39,7 +60,7 @@
     },
     "deploy-rs": {
       "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -103,6 +124,22 @@
       }
     },
     "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1765121682,
+        "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
       "flake": false,
       "locked": {
         "lastModified": 1733328505,
@@ -312,6 +349,7 @@
     "root": {
       "inputs": {
         "betterfox": "betterfox",
+        "comin": "comin",
         "crowdsec": "crowdsec",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
diff --git a/flake.nix b/flake.nix
index 4494c33..a2f5d4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    comin = {
+      url = "github:nlewo/comin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     deploy-rs = {
       url = "github:serokell/deploy-rs";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/system/services/comin.nix b/modules/system/services/comin.nix
new file mode 100644
index 0000000..76bcc79
--- /dev/null
+++ b/modules/system/services/comin.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  inputs,
+  lib,
+  ...
+}:
+{
+  imports = [ inputs.comin.nixosModules.comin ];
+
+  options.custom.services.comin.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.custom.services.comin.enable {
+    services.comin = {
+      enable = true;
+      remotes = lib.singleton {
+        name = "origin";
+        url = "https://github.com/SebastianStork/nixos-config.git";
+      };
+    };
+  };
+}

From 16b8bbf076ef094fb98ca904698b857c98e0f0f5 Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Tue, 3 Feb 2026 18:31:51 +0100
Subject: [PATCH 2/4] vps-private: Enable comin

---
 hosts/vps-private/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hosts/vps-private/default.nix b/hosts/vps-private/default.nix
index b073dfb..d394503 100644
--- a/hosts/vps-private/default.nix
+++ b/hosts/vps-private/default.nix
@@ -38,10 +38,9 @@
           enable = true;
           onlyCleanRoots = true;
         };
-
+        comin.enable = true;
         sshd.enable = true;
         dns.enable = true;
-
         syncthing = {
           enable = true;
           isServer = true;

From 9bcbe7e031e31d093edcaf363a3fe197b88f77d6 Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Tue, 3 Feb 2026 18:38:36 +0100
Subject: [PATCH 3/4] Install btop everywhere

---
 hosts/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hosts/common.nix b/hosts/common.nix
index 79ed82d..97fbd32 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -75,12 +75,13 @@
   };
 
   environment.systemPackages = [
+    (lib.hiPrio pkgs.uutils-coreutils-noprefix)
     pkgs.git
     pkgs.just
     pkgs.nh
     pkgs.dust
-    (lib.hiPrio pkgs.uutils-coreutils-noprefix)
     pkgs.comma
+    pkgs.btop
   ];
 
   nixpkgs.config.allowUnfree = true;

From 5c61459fe751b7452f1c81b302eace3353ba854e Mon Sep 17 00:00:00 2001
From: SebastianStork <git@sstork.dev>
Date: Tue, 3 Feb 2026 18:42:12 +0100
Subject: [PATCH 4/4] Enable comin on remaining servers

---
 hosts/vps-monitor/default.nix | 2 +-
 hosts/vps-public/default.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/vps-monitor/default.nix b/hosts/vps-monitor/default.nix
index da28565..b1c07f9 100644
--- a/hosts/vps-monitor/default.nix
+++ b/hosts/vps-monitor/default.nix
@@ -34,7 +34,7 @@
         enable = true;
         onlyCleanRoots = true;
       };
-
+      comin.enable = true;
       sshd.enable = true;
       dns.enable = true;
     };
diff --git a/hosts/vps-public/default.nix b/hosts/vps-public/default.nix
index 56e5fd9..7fc8cb4 100644
--- a/hosts/vps-public/default.nix
+++ b/hosts/vps-public/default.nix
@@ -37,7 +37,7 @@
           enable = true;
           onlyCleanRoots = true;
         };
-
+        comin.enable = true;
         sshd.enable = true;
 
         caddy.virtualHosts."dav.${sproutedDomain}" = {