diff --git a/flake.lock b/flake.lock index ad466de..d4e6fe1 100644 --- a/flake.lock +++ b/flake.lock @@ -16,11 +16,11 @@ ] }, "locked": { - "lastModified": 1691766113, - "narHash": "sha256-yPHhQ9rBgp6PC2AHmFA4GICGQ+LzSWkmQUFtKLfsyuE=", + "lastModified": 1691767701, + "narHash": "sha256-HZaSlgROVejhroxNmOsJ/28SfqbOZ0SKgF3FCrIhLDA=", "ref": "refs/heads/main", - "rev": "3edd686996c2d0e8e43c3e66677ccc12baa48f25", - "revCount": 311, + "rev": "f626c6e81577509b72469a7312054cd3c55fa8f1", + "revCount": 316, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1691423834, - "narHash": "sha256-xcjbbK7j0xbX6VvYg03mI0DbcpjtVC6FuoO5SRYLPe4=", + "lastModified": 1691743546, + "narHash": "sha256-nS2uWOeEmMgUBEMDCvwLlXBBCLkW7agDcMtOXuf9PDc=", "owner": "nix-community", "repo": "disko", - "rev": "5a9bfa9fa612cc1888a886f6900bf7afcdfd8d92", + "rev": "241c878d4b542fea7c61ed4421e9224af054ff56", "type": "github" }, "original": { diff --git a/modules/hetzner-ex101.nix b/modules/hetzner-ex101.nix index 436a824..cafb6eb 100644 --- a/modules/hetzner-ex101.nix +++ b/modules/hetzner-ex101.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # Enable raid support specifically, this will disable srvos's # systemd-initrd as well, which currently is not compatible with mdraid. - boot.initrd.services.swraid.enable = true; + boot.swraid.enable = true; systemd.services.mdmonitor.enable = false; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/targets/web01/deploy.sh b/targets/web01/deploy.sh index 4181cfc..2066ccf 100755 --- a/targets/web01/deploy.sh +++ b/targets/web01/deploy.sh @@ -3,12 +3,4 @@ set -euo pipefail -path=$(nix flake metadata --json '.#' | jq -r .path) -ip=clan.lol -rsync --checksum -vaF --delete -e ssh "${path}/" "root@${ip}:/etc/nixos" - -ssh "root@$ip" nixos-rebuild switch \ - --fast \ - --option keep-going true \ - --option accept-flake-config true \ - --flake '/etc/nixos#web01' +clan update clan.lol