From 5d4118354edfda3a97f62fd254e3fc7e53c7ef5a Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sat, 12 Jul 2025 16:58:52 +0200 Subject: [PATCH] Templates: remove disko.nix from all templates --- templates/clan/default/modules/disko.nix | 61 -------------------- templates/clan/flake-parts/modules/disko.nix | 51 ---------------- 2 files changed, 112 deletions(-) delete mode 100644 templates/clan/default/modules/disko.nix delete mode 100644 templates/clan/flake-parts/modules/disko.nix diff --git a/templates/clan/default/modules/disko.nix b/templates/clan/default/modules/disko.nix deleted file mode 100644 index d42864893..000000000 --- a/templates/clan/default/modules/disko.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - clan-core, - config, - ... -}: - -let - suffix = config.clan.core.vars.generators.disk-id.files.diskId.value; -in -{ - imports = [ - clan-core.clanModules.disk-id - ]; - - # DO NOT EDIT THIS FILE AFTER INSTALLATION of a machine - # Otherwise your system might not boot because of missing partitions / filesystems - 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-" + suffix; - type = "disk"; - # Set the following in flake.nix for each maschine: - # 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"; - # format = "btrfs"; - # format = "bcachefs"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/templates/clan/flake-parts/modules/disko.nix b/templates/clan/flake-parts/modules/disko.nix deleted file mode 100644 index 5bc1e84bd..000000000 --- a/templates/clan/flake-parts/modules/disko.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, clan-core, ... }: - -let - suffix = config.clan.core.vars.generators.disk-id.files.diskId.value; -in -{ - imports = [ - clan-core.clanModules.disk-id - ]; - - 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-" + suffix; - type = "disk"; - # Set the following in flake.nix for each maschine: - # 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"; - }; - }; - "root" = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -}