From 7c1900262f6bded7dda9d58aba83db3abd14f53d Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Thu, 2 Nov 2023 17:22:32 -0700 Subject: [PATCH] Updated --- flake.lock | 24 ++++++++++++------------ systems/x86_64-linux/carbon/zfs.nix | 8 ++++---- systems/x86_64-linux/gospel/zfs.nix | 8 ++++---- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index e0528d3..1eb9750 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1695052866, - "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", + "lastModified": 1698921442, + "narHash": "sha256-7KmvhQ7FuXlT/wG4zjTssap6maVqeAMBdtel+VjClSM=", "owner": "serokell", "repo": "deploy-rs", - "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", + "rev": "660180bbbeae7d60dad5a92b30858306945fd427", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1697662575, - "narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=", + "lastModified": 1698873617, + "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3433206e51766b4164dad368a81325efbf343fbe", + "rev": "48b0a30202516e25d9885525fbb200a045f23f26", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1697100850, - "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=", + "lastModified": 1698853384, + "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565", + "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { diff --git a/systems/x86_64-linux/carbon/zfs.nix b/systems/x86_64-linux/carbon/zfs.nix index 2b0b979..045712a 100644 --- a/systems/x86_64-linux/carbon/zfs.nix +++ b/systems/x86_64-linux/carbon/zfs.nix @@ -34,12 +34,12 @@ grub.efiSupport = true; grub.zfsSupport = true; grub.extraInstallCommands = '' - export ESP_MIRROR=$(mktemp -d -p /tmp) - cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR + export ESP_MIRROR=$(${pkgs.coreutils}/bin/mktemp -d -p /tmp) + ${pkgs.coreutils}/bin/cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR for i in /boot/efis/*; do - cp -r $ESP_MIRROR/EFI $i + ${pkgs.coreutils}/bin/cp -r $ESP_MIRROR/EFI $i done - rm -rf $ESP_MIRROR + ${pkgs.coreutils}/bin/rm -rf $ESP_MIRROR ''; grub.devices = [ "/dev/disk/by-id/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085" diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix index 58055e5..8a5b23f 100644 --- a/systems/x86_64-linux/gospel/zfs.nix +++ b/systems/x86_64-linux/gospel/zfs.nix @@ -15,12 +15,12 @@ boot.loader.grub.efiSupport = true; boot.loader.grub.zfsSupport = true; boot.loader.grub.extraInstallCommands = '' - ESP_MIRROR=$(mktemp -d) - cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR + ESP_MIRROR=$(${pkgs.coreutils}/bin/mktemp -d) + ${pkgs.coreutils}/bin/cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR for i in /boot/efis/*; do - cp -r $ESP_MIRROR/EFI $i + ${pkgs.coreutils}/bin/cp -r $ESP_MIRROR/EFI $i done - rm -rf $ESP_MIRROR + ${pkgs.coreutils}/bin/rm -rf $ESP_MIRROR ''; boot.loader.grub.devices = [ "/dev/disk/by-id/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086"