From a3230128b2b0299cb5ca015534ad7afa8828d39a Mon Sep 17 00:00:00 2001 From: beatzaplenty Date: Sat, 18 Jul 2026 05:54:32 +1000 Subject: [PATCH] updated proxmox disko configuration --- flake.nix | 1 + hosts/linode-minimal/configuration.nix | 1 - hosts/pxe-boot/configuration.nix | 1 + modules/disko/linode.nix | 64 ------------------- modules/hardware-configuration/vm/proxmox.nix | 2 +- 5 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 modules/disko/linode.nix diff --git a/flake.nix b/flake.nix index d2012e0..d193ff1 100644 --- a/flake.nix +++ b/flake.nix @@ -131,6 +131,7 @@ docker = nixpkgs.lib.nixosSystem { pxe-boot = nixpkgs.lib.nixosSystem { inherit system; modules = [ + inputs.disko.nixosModules.disko ./hosts/pxe-boot/configuration.nix ./modules/hardware-configuration/vm/proxmox.nix diff --git a/hosts/linode-minimal/configuration.nix b/hosts/linode-minimal/configuration.nix index 45d4402..e6d44c0 100644 --- a/hosts/linode-minimal/configuration.nix +++ b/hosts/linode-minimal/configuration.nix @@ -8,7 +8,6 @@ imports = [ # Include the results of the hardware scan. ../../modules/common/configuration.nix - # ../../modules/disko/linode.nix ]; # Use the GRUB 2 boot loader. diff --git a/hosts/pxe-boot/configuration.nix b/hosts/pxe-boot/configuration.nix index c4b4d07..b307b46 100644 --- a/hosts/pxe-boot/configuration.nix +++ b/hosts/pxe-boot/configuration.nix @@ -96,6 +96,7 @@ in ../../modules/common/configuration.nix ../../modules/nix/cache-client.nix ../../modules/nix/remote-builder-client.nix + ../../modules/disko/proxmox.nix ]; networking.hostName = "pxe-boot"; diff --git a/modules/disko/linode.nix b/modules/disko/linode.nix deleted file mode 100644 index 8771a21..0000000 --- a/modules/disko/linode.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ ... }: - -{ - disko.devices = { - disk.main = { - type = "disk"; - device = "/dev/sda"; - - content = { - type = "gpt"; - - partitions = { - - # bios = { - # size = "1M"; - # # content = { - # # type = "EF02"; - # # }; - - # }; - - root = { - priority = 1; - size = "100%"; - - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - extraArgs = [ - "-L" - "nixos" - ]; - }; - }; - }; - }; - }; - - disk.swap = { - type = "disk"; - device = "/dev/sdb"; - - content = { - type = "gpt"; - - partitions = { - swap = { - priority = 1; - size = "100%"; - - content = { - type = "swap"; - extraArgs = [ - "-L" - "swap" - ]; - }; - }; - }; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/hardware-configuration/vm/proxmox.nix b/modules/hardware-configuration/vm/proxmox.nix index 982cc49..cd6be8b 100644 --- a/modules/hardware-configuration/vm/proxmox.nix +++ b/modules/hardware-configuration/vm/proxmox.nix @@ -12,7 +12,7 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + boot.loader.grub.device = "/dev/sda2"; # or "nodev" for efi only # fileSystems."/" = # { device = "/dev/disk/by-label/nixos";