From 604288d883cbbabc2a4621d609258244f750874a Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 16:24:37 +0000 Subject: [PATCH 1/7] Update vm.nix --- systems/vm.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/systems/vm.nix b/systems/vm.nix index 9057e1c..b588097 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -7,6 +7,7 @@ imports = [ ./hardware-configuration.nix + disko # ./programs.nix ]; @@ -19,12 +20,12 @@ systemd-boot.consoleMode = "0"; }; - boot.initrd.luks.devices = { - root = { - device = "/dev/sda"; - preLVM = true; - }; - }; + # boot.initrd.luks.devices = { + # root = { + # device = "/dev/sda"; + # preLVM = true; + # }; + #}; #nix.settings.auto-optimise-store = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; From 007c95b5c35635a91ac8a62cddc2cd2249b76423 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 16:51:00 +0000 Subject: [PATCH 2/7] Update simple-efi.nix --- partitions/simple-efi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partitions/simple-efi.nix b/partitions/simple-efi.nix index 2c0dd87..3332773 100644 --- a/partitions/simple-efi.nix +++ b/partitions/simple-efi.nix @@ -2,7 +2,7 @@ disko.devices = { disk = { vda = { - device = "/dev/vda"; + device = "/dev/sda"; type = "disk"; content = { type = "gpt"; From 23f8ca631066848f0a1888d9c7ba1524ab768164 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 17:32:35 +0000 Subject: [PATCH 3/7] Update luks-btrfs-subvolumes.nix --- partitions/luks-btrfs-subvolumes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/partitions/luks-btrfs-subvolumes.nix b/partitions/luks-btrfs-subvolumes.nix index dc8b6fe..6fa5122 100644 --- a/partitions/luks-btrfs-subvolumes.nix +++ b/partitions/luks-btrfs-subvolumes.nix @@ -3,7 +3,7 @@ disk = { vdb = { type = "disk"; - device = "/dev/vdb"; + device = "/dev/sda"; content = { type = "gpt"; partitions = { From ec1e91bb2155d00b67e6e34d3ef091799bee7fa3 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 20:03:06 +0000 Subject: [PATCH 4/7] Update configuration.nix --- configuration.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4a36bfb..0187921 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,6 +7,7 @@ imports = [ ./hardware-configuration.nix + disko # ./programs.nix ]; @@ -18,13 +19,6 @@ systemd-boot.consoleMode = "0"; }; - boot.initrd.luks.devices = { - root = { - device = "/dev/sda"; - preLVM = true; - }; - }; - #nix.settings.auto-optimise-store = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; From 66d3d9a457db6ac1b30cc077489f2cfa92404abb Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 20:03:36 +0000 Subject: [PATCH 5/7] Update vm.nix --- systems/vm.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/systems/vm.nix b/systems/vm.nix index b588097..6ed4b0b 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -20,13 +20,6 @@ systemd-boot.consoleMode = "0"; }; - # boot.initrd.luks.devices = { - # root = { - # device = "/dev/sda"; - # preLVM = true; - # }; - #}; - #nix.settings.auto-optimise-store = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; From 13b8d90dabef166e5ff1aef1646be081d9cb4e5e Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 20:16:39 +0000 Subject: [PATCH 6/7] Update vm.nix --- systems/vm.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systems/vm.nix b/systems/vm.nix index 6ed4b0b..b63b265 100644 --- a/systems/vm.nix +++ b/systems/vm.nix @@ -7,7 +7,8 @@ imports = [ ./hardware-configuration.nix - disko + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + ./disko-config.nix # ./programs.nix ]; From df58298c850e302ed368720e4d66d4f8993394a3 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 29 Dec 2023 20:17:09 +0000 Subject: [PATCH 7/7] Update configuration.nix --- configuration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 0187921..4e428c5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,7 +7,8 @@ imports = [ ./hardware-configuration.nix - disko + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + ./disko-config.nix # ./programs.nix ];