Merge pull request 'flake.lock: Update' (#84) from Mic92-flake-parts-refactoring into main
All checks were successful
build / test (push) Successful in 7s

This commit is contained in:
clan-bot 2023-08-11 15:36:00 +00:00
commit 2a766b2eac
3 changed files with 9 additions and 17 deletions

View File

@ -16,11 +16,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691766113, "lastModified": 1691767701,
"narHash": "sha256-yPHhQ9rBgp6PC2AHmFA4GICGQ+LzSWkmQUFtKLfsyuE=", "narHash": "sha256-HZaSlgROVejhroxNmOsJ/28SfqbOZ0SKgF3FCrIhLDA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3edd686996c2d0e8e43c3e66677ccc12baa48f25", "rev": "f626c6e81577509b72469a7312054cd3c55fa8f1",
"revCount": 311, "revCount": 316,
"type": "git", "type": "git",
"url": "https://git.clan.lol/clan/clan-core" "url": "https://git.clan.lol/clan/clan-core"
}, },
@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691423834, "lastModified": 1691743546,
"narHash": "sha256-xcjbbK7j0xbX6VvYg03mI0DbcpjtVC6FuoO5SRYLPe4=", "narHash": "sha256-nS2uWOeEmMgUBEMDCvwLlXBBCLkW7agDcMtOXuf9PDc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5a9bfa9fa612cc1888a886f6900bf7afcdfd8d92", "rev": "241c878d4b542fea7c61ed4421e9224af054ff56",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,7 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }: {
# Enable raid support specifically, this will disable srvos's # Enable raid support specifically, this will disable srvos's
# systemd-initrd as well, which currently is not compatible with mdraid. # 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; systemd.services.mdmonitor.enable = false;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View File

@ -3,12 +3,4 @@
set -euo pipefail set -euo pipefail
path=$(nix flake metadata --json '.#' | jq -r .path) clan update clan.lol
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'