From dfa1fcd04509961b8a46e0cbec82f506ea712892 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Jan 2025 03:10:34 +0000 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/f7b572b004be8e60c6727b3856a13efe17323212?narHash=sha256-xP8UQqo3XSXy92tQ%2BwFvps46rVHnIc8W7ShQ5CUQALo%3D' (2025-01-22) → 'github:nixos/nixpkgs/8827312350044725e010d9fe11dc50869f1c64f8?narHash=sha256-iF7lFu65s358zskK12Zd8mY68mU8EdEKfEyflvsC94U%3D' (2025-01-24) • Updated input 'nixpkgs-unstable': 'github:nixos/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21) → 'github:nixos/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9?narHash=sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ%2BNH28%3D' (2025-01-23) • Updated input 'nur': 'github:nix-community/NUR/80b6ff6a51dbebbe0bcc71858ae9a299e1207704?narHash=sha256-Jr7tmhsZVAebD/TCpijDqcxr4w15wnPCOrlk%2Bt4lrJA%3D' (2025-01-23) → 'github:nix-community/NUR/6872236a5739af0352f764ba00bc537d985e36e5?narHash=sha256-oSmrvHlvITBCK49l7hn6M19LmZ6wqLWWsu5KeK4xbLE%3D' (2025-01-25) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab?narHash=sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk%3D' (2025-01-21) → 'github:nixos/nixpkgs/0aa475546ed21629c4f5bbf90e38c846a99ec9e9?narHash=sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ%2BNH28%3D' (2025-01-23) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index c2b0dd8..dba15af 100644 --- a/flake.lock +++ b/flake.lock @@ -601,11 +601,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -633,11 +633,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737584761, - "narHash": "sha256-xP8UQqo3XSXy92tQ+wFvps46rVHnIc8W7ShQ5CUQALo=", + "lastModified": 1737761447, + "narHash": "sha256-iF7lFu65s358zskK12Zd8mY68mU8EdEKfEyflvsC94U=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f7b572b004be8e60c6727b3856a13efe17323212", + "rev": "8827312350044725e010d9fe11dc50869f1c64f8", "type": "github" }, "original": { @@ -649,11 +649,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -699,11 +699,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1737602136, - "narHash": "sha256-Jr7tmhsZVAebD/TCpijDqcxr4w15wnPCOrlk+t4lrJA=", + "lastModified": 1737774428, + "narHash": "sha256-oSmrvHlvITBCK49l7hn6M19LmZ6wqLWWsu5KeK4xbLE=", "owner": "nix-community", "repo": "NUR", - "rev": "80b6ff6a51dbebbe0bcc71858ae9a299e1207704", + "rev": "6872236a5739af0352f764ba00bc537d985e36e5", "type": "github" }, "original": { From c3004ad56f3b252c85edfdfe49906604206f1f16 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Jan 2025 20:22:42 +0000 Subject: [PATCH 2/3] change cloudnix dev ids --- hosts/cloudnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/cloudnix/default.nix b/hosts/cloudnix/default.nix index 1fe6c4e..a88b912 100644 --- a/hosts/cloudnix/default.nix +++ b/hosts/cloudnix/default.nix @@ -8,7 +8,7 @@ user = "admin"; merlinIp = configVars.networking.addresses.merlin.ip; cloudnixIp = configVars.networking.addresses.cloudnix.ip; - btrfsMountDevice = "/dev/sda2"; + btrfsMountDevice = "/dev/by-uuid/2aec8052-68fc-4bac-9b8d-c10b9b659ad8"; in { imports = [ # Create users for this host @@ -39,7 +39,7 @@ in { efi.canTouchEfiVariables = false; grub = { enable = true; - devices = ["/dev/sda"]; + devices = ["/dev/by-id/scsi-0QEMU_QEMU_HARDDISK_57492184"]; }; }; }; From 2fede917609477e181803b8c6028f1755f0e4c77 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Jan 2025 20:25:40 +0000 Subject: [PATCH 3/3] fix disk wrong path --- hosts/cloudnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/cloudnix/default.nix b/hosts/cloudnix/default.nix index a88b912..bddaabd 100644 --- a/hosts/cloudnix/default.nix +++ b/hosts/cloudnix/default.nix @@ -8,7 +8,7 @@ user = "admin"; merlinIp = configVars.networking.addresses.merlin.ip; cloudnixIp = configVars.networking.addresses.cloudnix.ip; - btrfsMountDevice = "/dev/by-uuid/2aec8052-68fc-4bac-9b8d-c10b9b659ad8"; + btrfsMountDevice = "/dev/disk/by-uuid/2aec8052-68fc-4bac-9b8d-c10b9b659ad8"; in { imports = [ # Create users for this host @@ -39,7 +39,7 @@ in { efi.canTouchEfiVariables = false; grub = { enable = true; - devices = ["/dev/by-id/scsi-0QEMU_QEMU_HARDDISK_57492184"]; + devices = ["/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_57492184"]; }; }; };