remove host 'smrk'
8 files changed, 3 insertions(+), 189 deletions(-)
M data/default.nix → data/default.nix
@@ -26,16 +26,6 @@ builder = { system = "x86_64-linux"; }; }; - smrk = { - publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINU03etY1me+35aJ7DTJID60cHlvYx6lV8A6V+OiR7hr"; - domains = [ - tailnet - pubnet - ]; - builder = { - system = "x86_64-linux"; - }; - }; prefect = { publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGmHQIaiJAz9EZwu0anojtj9lO4gXN2YtWqk37WAROKW"; domains = [
M flake.lock → flake.lock
@@ -288,47 +288,6 @@ "repo": "home-manager", "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "vpsadminos", - "impermanence", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "impermanence": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1769548169, - "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", - "owner": "nix-community", - "repo": "impermanence", - "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "impermanence", - "type": "github" - } - }, "minimal-emacs": { "flake": false, "locked": {@@ -436,22 +395,6 @@ }, "original": { "owner": "NixOS", "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgsUnstable": { - "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" }@@ -533,38 +476,6 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts",@@ -676,8 +587,7 @@ "nixvim": "nixvim", "rosetta-builder": "rosetta-builder", "scriptura": "scriptura", "searchix": "searchix", - "srvos": "srvos", - "vpsadminos": "vpsadminos" + "srvos": "srvos" } }, "rosetta-builder": {@@ -916,27 +826,6 @@ }, "original": { "owner": "pyproject-nix", "repo": "uv2nix", - "type": "github" - } - }, - "vpsadminos": { - "inputs": { - "impermanence": "impermanence", - "nixpkgs": "nixpkgs_8", - "nixpkgsUnstable": "nixpkgsUnstable" - }, - "locked": { - "lastModified": 1780642121, - "narHash": "sha256-iVCJcK+VgJKPQOoOhPm+b8raaIg80GRfG2cjvDcEW5U=", - "owner": "vpsfreecz", - "repo": "vpsadminos", - "rev": "62de2d8b03876d84a997fcfd5fc30740da786ddf", - "type": "github" - }, - "original": { - "owner": "vpsfreecz", - "ref": "staging", - "repo": "vpsadminos", "type": "github" } }
M flake.nix → flake.nix
@@ -11,7 +11,6 @@ }; nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; - vpsadminos.url = "github:vpsfreecz/vpsadminos/staging"; nanopi = { url = "github:alinnow/nixos-nanopi"; inputs.nixpkgs.follows = "nixpkgs";@@ -167,17 +166,6 @@ ./packages/modules/nixos/bark.nix ./system/hosts/hasel.nix ]; }; - smrk = nixosSystem { - system = "x86_64-linux"; - modules = [ - srvos.nixosModules.server - vpsadminos.nixosConfigurations.containerStable - agenix.nixosModules.default - ./packages/modules/nixos/laminar.nix - ./packages/modules/nixos/bark.nix - ./system/hosts/smrk.nix - ]; - }; }; darwinConfigurations = { marvin = darwin.lib.darwinSystem {@@ -216,15 +204,6 @@ modules = [ ./user/hosts/server.nix { home.stateVersion = "26.05"; - } - ]; - }; - "alin@smrk" = mkHomeConfiguration { - system = "x86_64-linux"; - modules = [ - ./user/hosts/server.nix - { - home.stateVersion = "25.11"; } ]; };
M secrets/secrets.nix → secrets/secrets.nix
@@ -11,46 +11,36 @@ secrets = with machines; { acme = [ hasel - smrk r5 ]; redis-website = [ - smrk hasel ]; caddy = [ r5 - smrk hasel ]; pocket-id = [ - smrk hasel ]; binarycache = [ - smrk hasel ]; paperless = [ - smrk hasel ]; powerdns = [ - smrk hasel ]; readeck = [ - smrk hasel ]; codeberg-runner = [ - smrk hasel ]; vpsfreectl = [ - smrk ]; dyndns = [ r5 ];
D system/hosts/smrk.nix
@@ -1,33 +0,0 @@ -{ - pkgs, - ... -}: -let - hostname = "smrk"; -in -{ - imports = [ - ../roles/remote.nix - ../roles/server.nix - ../roles/vpsfree-manager.nix - - ../roles/webserver/reverse-proxy.nix - ]; - system.stateVersion = "25.11"; - - environment.systemPackages = with pkgs; [ - knot-dns - ]; - - networking.hostName = hostname; - - nix = { - settings = { - max-jobs = 1; - }; - }; - systemd.services.nix-daemon.serviceConfig = { - MemoryHigh = "25%"; - MemoryMax = "30%"; - }; -}
M system/roles/ci-runner.nix → system/roles/ci-runner.nix
@@ -39,7 +39,7 @@ rsync go ]; openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHeFYWByDp3lurxzYbQPiMJfHcFEDUdj3TAu5ib2Sv1A laminar@smrk.alin.ovh" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHeFYWByDp3lurxzYbQPiMJfHcFEDUdj3TAu5ib2Sv1A laminar@hasel.alin.ovh" ]; }; }
M system/roles/nix-remote-builder.nix → system/roles/nix-remote-builder.nix
@@ -10,7 +10,6 @@ home = "/var/lib/nixremote/"; createHome = true; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKGzXGgFm/4Da2KNl1wb7TC2YOu/baP/2eFVBaJY0Wq root@marvin" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFhZ8cbSTN/lkbBCDoGXjb2zxTmzWfZNnW1gCN9Z8jh root@smrk" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINDi3OcY2fSW7iCozQyUGHOqbZbcqChd/djOcwQCwVMA root@prefect" ]; };
M user/settings/development/base.nix → user/settings/development/base.nix
@@ -171,7 +171,7 @@ er = "direnv reload"; ea = "direnv allow"; ex = "direnv exec"; es = "direnv status"; - laminarc = "ssh smrk laminarc"; + laminarc = "ssh ci.alin.ovh laminarc"; }; programs.direnv = { enable = true;