This commit is contained in:
Alejandro Angulo 2023-11-02 17:22:32 -07:00
parent 98855cfc94
commit 7c1900262f
Signed by: alejandro-angulo
GPG key ID: 75579581C74554B6
3 changed files with 20 additions and 20 deletions

View file

@ -33,11 +33,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1695052866, "lastModified": 1698921442,
"narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", "rev": "660180bbbeae7d60dad5a92b30858306945fd427",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -121,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697662575, "lastModified": 1698873617,
"narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=", "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3433206e51766b4164dad368a81325efbf343fbe", "rev": "48b0a30202516e25d9885525fbb200a045f23f26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,11 +173,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1697100850, "lastModified": 1698853384,
"narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +189,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697456312, "lastModified": 1698611440,
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -34,12 +34,12 @@
grub.efiSupport = true; grub.efiSupport = true;
grub.zfsSupport = true; grub.zfsSupport = true;
grub.extraInstallCommands = '' grub.extraInstallCommands = ''
export ESP_MIRROR=$(mktemp -d -p /tmp) export ESP_MIRROR=$(${pkgs.coreutils}/bin/mktemp -d -p /tmp)
cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR ${pkgs.coreutils}/bin/cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR
for i in /boot/efis/*; do for i in /boot/efis/*; do
cp -r $ESP_MIRROR/EFI $i ${pkgs.coreutils}/bin/cp -r $ESP_MIRROR/EFI $i
done done
rm -rf $ESP_MIRROR ${pkgs.coreutils}/bin/rm -rf $ESP_MIRROR
''; '';
grub.devices = [ grub.devices = [
"/dev/disk/by-id/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085" "/dev/disk/by-id/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085"

View file

@ -15,12 +15,12 @@
boot.loader.grub.efiSupport = true; boot.loader.grub.efiSupport = true;
boot.loader.grub.zfsSupport = true; boot.loader.grub.zfsSupport = true;
boot.loader.grub.extraInstallCommands = '' boot.loader.grub.extraInstallCommands = ''
ESP_MIRROR=$(mktemp -d) ESP_MIRROR=$(${pkgs.coreutils}/bin/mktemp -d)
cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR ${pkgs.coreutils}/bin/cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR
for i in /boot/efis/*; do for i in /boot/efis/*; do
cp -r $ESP_MIRROR/EFI $i ${pkgs.coreutils}/bin/cp -r $ESP_MIRROR/EFI $i
done done
rm -rf $ESP_MIRROR ${pkgs.coreutils}/bin/rm -rf $ESP_MIRROR
''; '';
boot.loader.grub.devices = [ boot.loader.grub.devices = [
"/dev/disk/by-id/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086" "/dev/disk/by-id/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086"