diff --git a/flake.lock b/flake.lock index 3c23363..741ded2 100644 --- a/flake.lock +++ b/flake.lock @@ -16,27 +16,6 @@ "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", @@ -60,7 +39,7 @@ }, "deploy-rs": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs" ], @@ -124,22 +103,6 @@ } }, "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, @@ -349,7 +312,6 @@ "root": { "inputs": { "betterfox": "betterfox", - "comin": "comin", "crowdsec": "crowdsec", "deploy-rs": "deploy-rs", "disko": "disko", diff --git a/flake.nix b/flake.nix index a2f5d4d..4494c33 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,6 @@ 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/hosts/common.nix b/hosts/common.nix index 97fbd32..79ed82d 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -75,13 +75,12 @@ }; 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; diff --git a/hosts/vps-monitor/default.nix b/hosts/vps-monitor/default.nix index b1c07f9..da28565 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-private/default.nix b/hosts/vps-private/default.nix index d394503..b073dfb 100644 --- a/hosts/vps-private/default.nix +++ b/hosts/vps-private/default.nix @@ -38,9 +38,10 @@ enable = true; onlyCleanRoots = true; }; - comin.enable = true; + sshd.enable = true; dns.enable = true; + syncthing = { enable = true; isServer = true; diff --git a/hosts/vps-public/default.nix b/hosts/vps-public/default.nix index 7fc8cb4..56e5fd9 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}" = { diff --git a/modules/system/services/comin.nix b/modules/system/services/comin.nix deleted file mode 100644 index 76bcc79..0000000 --- a/modules/system/services/comin.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - 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"; - }; - }; - }; -}