From dc93ae7c0c3835c0d173f18e1e3fc40ac218f234 Mon Sep 17 00:00:00 2001 From: Jermeiah S Date: Sat, 14 Jun 2025 06:07:02 -0400 Subject: [PATCH] migrate disko not currently used due to lxc assumption --- configurations/nixos/tofu/configuration.nix | 1 - configurations/nixos/tofu/disko.nix | 47 ------------------- modules/nixos/common/disko.nix | 52 +++++++++++++++++++++ 3 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 configurations/nixos/tofu/disko.nix create mode 100644 modules/nixos/common/disko.nix diff --git a/configurations/nixos/tofu/configuration.nix b/configurations/nixos/tofu/configuration.nix index c8dcd00..07354af 100644 --- a/configurations/nixos/tofu/configuration.nix +++ b/configurations/nixos/tofu/configuration.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { - disko.devices.disk.main.device = "/dev/vda"; services.tty-ips.enable = true; networking.yggdrasil = { diff --git a/configurations/nixos/tofu/disko.nix b/configurations/nixos/tofu/disko.nix deleted file mode 100644 index 804896c..0000000 --- a/configurations/nixos/tofu/disko.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - config, - ... -}: -{ - boot.loader.grub.efiSupport = lib.mkDefault true; - boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; - disko.devices = { - disk = { - "main" = { - # suffix is to prevent disk name collisions - name = "main-" + config.networking.hostName; - type = "disk"; - # device = ; - content = { - type = "gpt"; - partitions = { - "boot" = { - size = "1M"; - type = "EF02"; # for grub MBR - priority = 1; - }; - "ESP" = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "nofail" ]; - }; - }; - "root" = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/modules/nixos/common/disko.nix b/modules/nixos/common/disko.nix new file mode 100644 index 0000000..dacc315 --- /dev/null +++ b/modules/nixos/common/disko.nix @@ -0,0 +1,52 @@ +{ + lib, + config, + ... +}: +{ + + # disko.devices.disk.main.device = "/dev/vda"; + options.internal.disko.default.enable = lib.mkEnableOption ""; + config = lib.mkIf config.internal.disko.default.enable { + boot.loader.grub.efiSupport = lib.mkDefault true; + boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; + disko.devices = { + disk = { + "main" = { + # suffix is to prevent disk name collisions + name = "main-" + config.networking.hostName; + type = "disk"; + # device = ; + content = { + type = "gpt"; + partitions = { + "boot" = { + size = "1M"; + type = "EF02"; # for grub MBR + priority = 1; + }; + "ESP" = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "nofail" ]; + }; + }; + "root" = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + }; + }; + }; + }; + }; + }; +}