From 323010bb040a013dbcc05095510f31a30e8c389d Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 6 Sep 2024 21:38:50 +0200 Subject: [PATCH] revert machine_id pull request --- checks/backups/flake-module.nix | 4 -- checks/borgbackup/default.nix | 4 -- checks/container/default.nix | 1 - checks/deltachat/default.nix | 4 -- checks/flash/flake-module.nix | 13 +---- checks/installation/flake-module.nix | 20 +------ checks/lib/age/privkey | 1 - checks/lib/age/pubkey | 1 - checks/matrix-synapse/default.nix | 5 +- checks/mumble/default.nix | 8 --- checks/nixos-documentation/flake-module.nix | 8 +-- checks/postgresql/default.nix | 5 -- checks/secrets/default.nix | 4 -- checks/syncthing/default.nix | 12 ---- checks/wayland-proxy-virtwl/default.nix | 4 -- checks/zt-tcp-relay/default.nix | 4 -- clanModules/single-disk/default.nix | 25 ++------ docs/mkdocs.yml | 1 - docs/site/getting-started/disk-encryption.md | 14 ++--- inventory.json | 3 +- lib/eval-clan-modules/default.nix | 3 - lib/inventory/build-inventory/interface.nix | 34 +++++------ nixosModules/clanCore/default.nix | 1 - nixosModules/clanCore/machine_id.nix | 58 ------------------- .../app/src/routes/machines/details.tsx | 6 +- templates/flake-parts/modules/disko.nix | 10 +--- templates/new-clan/modules/disko.nix | 10 +--- 27 files changed, 46 insertions(+), 217 deletions(-) delete mode 100644 checks/lib/age/privkey delete mode 100644 checks/lib/age/pubkey delete mode 100644 nixosModules/clanCore/machine_id.nix diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index ae3bf4177..d237cb138 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -134,10 +134,6 @@ ]; virtualisation.emptyDiskImages = [ 256 ]; clan.core.clanDir = ./.; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; }; testScript = '' diff --git a/checks/borgbackup/default.nix b/checks/borgbackup/default.nix index 25106b8bf..d376b354b 100644 --- a/checks/borgbackup/default.nix +++ b/checks/borgbackup/default.nix @@ -18,10 +18,6 @@ { clan.core.machineName = "machine"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; clan.core.state.testState.folders = [ "/etc/state" ]; environment.etc.state.text = "hello world"; systemd.tmpfiles.settings."vmsecrets" = { diff --git a/checks/container/default.nix b/checks/container/default.nix index 4b265559c..61c75a0e9 100644 --- a/checks/container/default.nix +++ b/checks/container/default.nix @@ -9,7 +9,6 @@ networking.hostName = "machine"; services.openssh.enable = true; services.openssh.startWhenNeeded = false; - }; testScript = '' start_all() diff --git a/checks/deltachat/default.nix b/checks/deltachat/default.nix index 733d62b89..efee1e417 100644 --- a/checks/deltachat/default.nix +++ b/checks/deltachat/default.nix @@ -12,10 +12,6 @@ { clan.core.machineName = "machine"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; } ]; }; diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index 1a85621a3..7887005cb 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -10,7 +10,6 @@ let dependencies = [ pkgs.disko - pkgs.age self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.toplevel self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.diskoScript self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.diskoScript.drvPath @@ -26,11 +25,9 @@ nodes.target = { virtualisation.emptyDiskImages = [ 4096 ]; virtualisation.memorySize = 3000; - environment.systemPackages = [ - self.packages.${pkgs.system}.clan-cli - ] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies; - environment.variables."SOPS_AGE_KEY" = builtins.readFile ../lib/age/privkey; + environment.systemPackages = [ self.packages.${pkgs.system}.clan-cli ]; environment.etc."install-closure".source = "${closureInfo}/store-paths"; + nix.settings = { substituters = lib.mkForce [ ]; hashed-mirrors = null; @@ -41,15 +38,11 @@ "flakes" ]; }; - system.extraDependencies = dependencies; }; testScript = '' start_all() - machine.succeed("cp -r ${../..} test-flake && chmod -R +w test-flake") - machine.succeed("clan secrets key generate") - machine.succeed("clan secrets users add --debug --flake test-flake testuser '${builtins.readFile ../lib/age/pubkey}'") - machine.succeed("clan flash --debug --flake test-flake --yes --disk main /dev/vdb test-install-machine") + machine.succeed("clan flash --debug --flake ${../..} --yes --disk main /dev/vdb test-install-machine") ''; } { inherit pkgs self; }; }; diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index e4f2ea254..ecfcd7b2d 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -1,12 +1,7 @@ { self, lib, ... }: - { clan.machines.test-install-machine = { clan.core.networking.targetHost = "test-install-machine"; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; fileSystems."/".device = lib.mkDefault "/dev/vdb"; boot.loader.grub.device = lib.mkDefault "/dev/vdb"; @@ -22,10 +17,7 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; clan.single-disk.device = "/dev/vdb"; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; + environment.etc."install-successful".text = "ok"; boot.consoleLogLevel = lib.mkForce 100; @@ -42,10 +34,8 @@ let dependencies = [ self - pkgs.age self.nixosConfigurations.test-install-machine.config.system.build.toplevel self.nixosConfigurations.test-install-machine.config.system.build.diskoScript - self.clanInternals.machines.${pkgs.hostPlatform.system}.test-install-machine.config.system.build.diskoScript.drvPath self.nixosConfigurations.test-install-machine.config.system.clan.deployment.file pkgs.stdenv.drvPath pkgs.nixos-anywhere @@ -60,7 +50,6 @@ services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keyFiles = [ ../lib/ssh/pubkey ]; system.nixos.variant_id = "installer"; - virtualisation.emptyDiskImages = [ 4096 ]; nix.settings = { substituters = lib.mkForce [ ]; @@ -78,7 +67,6 @@ self.packages.${pkgs.system}.clan-cli ] ++ self.packages.${pkgs.system}.clan-cli.runtimeDependencies; environment.etc."install-closure".source = "${closureInfo}/store-paths"; - environment.variables."SOPS_AGE_KEY" = builtins.readFile ../lib/age/privkey; virtualisation.memorySize = 2048; nix.settings = { substituters = lib.mkForce [ ]; @@ -111,11 +99,9 @@ client.wait_until_succeeds("timeout 2 ssh -o StrictHostKeyChecking=accept-new -v root@target hostname") client.succeed("cp -r ${../..} test-flake && chmod -R +w test-flake") client.fail("test -f test-flake/machines/test-install-machine/hardware-configuration.nix") - client.succeed("clan secrets key generate") - client.succeed("clan secrets users add --debug --flake test-flake testuser '${builtins.readFile ../lib/age/pubkey}'") - client.succeed("clan machines hw-generate --debug --flake test-flake test-install-machine root@target>&2") + client.succeed("clan machines hw-generate --flake test-flake test-install-machine root@target>&2") client.succeed("test -f test-flake/machines/test-install-machine/hardware-configuration.nix") - client.succeed("clan machines install --debug --flake test-flake --yes test-install-machine root@target >&2") + client.succeed("clan machines install --debug --flake ${../..} --yes test-install-machine root@target >&2") try: target.shutdown() except BrokenPipeError: diff --git a/checks/lib/age/privkey b/checks/lib/age/privkey deleted file mode 100644 index f707304a7..000000000 --- a/checks/lib/age/privkey +++ /dev/null @@ -1 +0,0 @@ -AGE-SECRET-KEY-1KF8E3SR3TTGL6M476SKF7EEMR4H9NF7ZWYSLJUAK8JX276JC7KUSSURKFK \ No newline at end of file diff --git a/checks/lib/age/pubkey b/checks/lib/age/pubkey deleted file mode 100644 index 80b46d53c..000000000 --- a/checks/lib/age/pubkey +++ /dev/null @@ -1 +0,0 @@ -age1dhwqzkah943xzc34tc3dlmfayyevcmdmxzjezdgdy33euxwf59vsp3vk3c \ No newline at end of file diff --git a/checks/matrix-synapse/default.nix b/checks/matrix-synapse/default.nix index 17f86a9e2..0e16cf545 100644 --- a/checks/matrix-synapse/default.nix +++ b/checks/matrix-synapse/default.nix @@ -17,10 +17,7 @@ { clan.core.machineName = "machine"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; + services.nginx.virtualHosts."matrix.clan.test" = { enableACME = lib.mkForce false; forceSSL = lib.mkForce false; diff --git a/checks/mumble/default.nix b/checks/mumble/default.nix index f4fc8bb04..d29c8a7ae 100644 --- a/checks/mumble/default.nix +++ b/checks/mumble/default.nix @@ -32,10 +32,6 @@ common { clan.core.machineName = "peer1"; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; environment.etc = { "mumble-key".source = ./peer_1/peer_1_test_key; "mumble-cert".source = ./peer_1/peer_1_test_cert; @@ -69,10 +65,6 @@ imports = [ common { - clan.core.machine = { - id = "a73f5245cdba4576ab6cfef3145ac9ec"; - diskId = "c4c47b"; - }; clan.core.machineName = "peer2"; environment.etc = { "mumble-key".source = ./peer_2/peer_2_test_key; diff --git a/checks/nixos-documentation/flake-module.nix b/checks/nixos-documentation/flake-module.nix index ab804d3b1..743d97c19 100644 --- a/checks/nixos-documentation/flake-module.nix +++ b/checks/nixos-documentation/flake-module.nix @@ -8,13 +8,7 @@ let self.nixosModules.clanCore # This is the only option that is not part of the # module because it is usually set by flake-parts - { - clan.core.clanDir = ./.; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; - } + { clan.core.clanDir = ./.; } ]; }; in diff --git a/checks/postgresql/default.nix b/checks/postgresql/default.nix index 41475283c..595e00203 100644 --- a/checks/postgresql/default.nix +++ b/checks/postgresql/default.nix @@ -15,11 +15,6 @@ clan.localbackup.targets.hdd.directory = "/mnt/external-disk"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; - systemd.services.sample-service = { wantedBy = [ "multi-user.target" ]; script = '' diff --git a/checks/secrets/default.nix b/checks/secrets/default.nix index 1ea1b3b02..034625de2 100644 --- a/checks/secrets/default.nix +++ b/checks/secrets/default.nix @@ -12,10 +12,6 @@ clan.core.clanDir = "${./.}"; clan.core.machineName = "machine"; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; networking.hostName = "machine"; }; diff --git a/checks/syncthing/default.nix b/checks/syncthing/default.nix index 3e8fb37a5..75d9447c4 100644 --- a/checks/syncthing/default.nix +++ b/checks/syncthing/default.nix @@ -14,10 +14,6 @@ { clan.core.machineName = "introducer"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; environment.etc = { "syncthing.pam".source = ./introducer/introducer_test_cert; "syncthing.key".source = ./introducer/introducer_test_key; @@ -59,10 +55,6 @@ { clan.core.machineName = "peer1"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "645a43ad1d6f456aa2d623464efed096"; - diskId = "9404bf2fb28343cba82e64d1a9131ea4"; - }; clan.syncthing.introducer = lib.strings.removeSuffix "\n" ( builtins.readFile ./introducer/introducer_device_id ); @@ -85,10 +77,6 @@ { clan.core.machineName = "peer2"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "dd0927b2113b4fa58a94a4be15b0408e"; - diskId = "05d6d08214d14261b001782b417ca2a3"; - }; clan.syncthing.introducer = lib.strings.removeSuffix "\n" ( builtins.readFile ./introducer/introducer_device_id ); diff --git a/checks/wayland-proxy-virtwl/default.nix b/checks/wayland-proxy-virtwl/default.nix index 140d28b1e..e09e85cc6 100644 --- a/checks/wayland-proxy-virtwl/default.nix +++ b/checks/wayland-proxy-virtwl/default.nix @@ -16,10 +16,6 @@ import ../lib/test-base.nix ( { clan.core.machineName = "machine"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; } ]; services.wayland-proxy-virtwl.enable = true; diff --git a/checks/zt-tcp-relay/default.nix b/checks/zt-tcp-relay/default.nix index 015ed81ff..08f616bfc 100644 --- a/checks/zt-tcp-relay/default.nix +++ b/checks/zt-tcp-relay/default.nix @@ -12,10 +12,6 @@ { clan.core.machineName = "machine"; clan.core.clanDir = ./.; - clan.core.machine = { - id = "df97124f09da48e3a22d77ce30ee8da6"; - diskId = "c9c52c"; - }; } ]; }; diff --git a/clanModules/single-disk/default.nix b/clanModules/single-disk/default.nix index 5c31faf76..6a9d8e01a 100644 --- a/clanModules/single-disk/default.nix +++ b/clanModules/single-disk/default.nix @@ -1,7 +1,4 @@ { lib, config, ... }: -let - cfg = config.clan.single-disk; -in { options.clan.single-disk = { device = lib.mkOption { @@ -11,38 +8,26 @@ in # Question: should we set a default here? # default = "/dev/null"; }; - suffix = lib.mkOption { - default = config.clan.core.machine.diskId; - defaultText = "abcdef"; - type = lib.types.nullOr lib.types.str; - description = "The suffix to use for the disk"; - }; }; config = { - assertions = [ - { - assertion = cfg.suffix != null; - message = "clan.core.machine.diskId must be set, please run `clan facts generate`"; - } - ]; boot.loader.grub.efiSupport = lib.mkDefault true; boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; - disko.devices = lib.mkIf (cfg.suffix != null) { + disko.devices = { disk = { main = { type = "disk"; # This is set through the UI - device = cfg.device; + device = config.clan.single-disk.device; content = { type = "gpt"; partitions = { - "boot-${cfg.suffix}" = { + "${config.networking.hostName}-boot" = { size = "1M"; type = "EF02"; # for grub MBR priority = 1; }; - "ESP-${cfg.suffix}" = { + "${config.networking.hostName}-ESP" = { size = "512M"; type = "EF00"; content = { @@ -51,7 +36,7 @@ in mountpoint = "/boot"; }; }; - "root-${cfg.suffix}" = { + "${config.networking.hostName}-root" = { size = "100%"; content = { type = "filesystem"; diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 61df29941..eaee14bac 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -108,7 +108,6 @@ nav: - reference/clan-core/sops.md - reference/clan-core/state.md - reference/clan-core/deployment.md - - reference/clan-core/machine.md - reference/clan-core/networking.md - Nix API: - reference/nix-api/index.md diff --git a/docs/site/getting-started/disk-encryption.md b/docs/site/getting-started/disk-encryption.md index a11f461e5..8217ef761 100644 --- a/docs/site/getting-started/disk-encryption.md +++ b/docs/site/getting-started/disk-encryption.md @@ -17,19 +17,18 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT ```nix hl_lines="14 40" { lib, ... }: let - suffix = config.clan.core.machine.diskId; mirrorBoot = idx: { type = "disk"; device = "/dev/disk/by-id/${idx}"; content = { type = "gpt"; partitions = { - "boot-${suffix}" = { + "${config.networking.hostName}-boot" = { size = "1M"; type = "EF02"; # for grub MBR priority = 1; }; - "ESP-${suffix}" = lib.mkIf (idx == "nvme-eui.002538b931b59865") { + "${config.networking.hostName}-ESP" = lib.mkIf (idx == "nvme-eui.002538b931b59865") { size = "1G"; type = "EF00"; content = { @@ -39,7 +38,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT mountOptions = [ "nofail" ]; }; }; - "root-${suffix}" = { + "${config.networking.hostName}-root" = { size = "100%"; content = { type = "zfs"; @@ -109,19 +108,18 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT ```nix hl_lines="14 40 41" { lib, ... }: let - suffix = config.clan.core.machine.diskId; mirrorBoot = idx: { type = "disk"; device = "/dev/disk/by-id/${idx}"; content = { type = "gpt"; partitions = { - "boot-${suffix}" = { + boot = { size = "1M"; type = "EF02"; # for grub MBR priority = 1; }; - "ESP-${suffix}" = lib.mkIf (idx == "nvme-eui.002538b931b59865") { + ESP = lib.mkIf (idx == "nvme-eui.002538b931b59865") { size = "1G"; type = "EF00"; content = { @@ -131,7 +129,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT mountOptions = [ "nofail" ]; }; }; - "root-${suffix}" = { + zfs = { size = "100%"; content = { type = "zfs"; diff --git a/inventory.json b/inventory.json index d401953bf..028bc4112 100644 --- a/inventory.json +++ b/inventory.json @@ -88,8 +88,7 @@ "machines": { "test-inventory-machine": { "config": { - "device": "/dev/null", - "suffix": "foobar" + "device": "/dev/null" }, "imports": [] } diff --git a/lib/eval-clan-modules/default.nix b/lib/eval-clan-modules/default.nix index c984270d3..ccef35868 100644 --- a/lib/eval-clan-modules/default.nix +++ b/lib/eval-clan-modules/default.nix @@ -25,9 +25,6 @@ let evaled = lib.evalModules { modules = [ baseModule - ({ - clan.core.clanDir = ./.; - }) clan-core.nixosModules.clanCore ] ++ (map (name: clanModules.${name}) modulenames); }; diff --git a/lib/inventory/build-inventory/interface.nix b/lib/inventory/build-inventory/interface.nix index d4b26338d..133e65c58 100644 --- a/lib/inventory/build-inventory/interface.nix +++ b/lib/inventory/build-inventory/interface.nix @@ -23,27 +23,27 @@ let description = '' List of imported '.nix' files. - Each filename must be a string and is interpreted relative to the 'directory' passed to buildClan. - The import only happens if the machine is part of the service or role. + Each filename must be a string and is interpreted relative to the 'directory' passed to buildClan. + The import only happens if the machine is part of the service or role. - ## Example + ## Example - To import the `special.nix` file + To import the `special.nix` file - ``` - . Clan Directory - ├── flake.nix - ... - └── modules - ├── special.nix - └── ... - ``` + ``` + . Clan Directory + ├── flake.nix + ... + └── modules + ├── special.nix + └── ... + ``` - ```nix - { - imports = [ "modules/special.nix" ]; - } - ``` + ```nix + { + imports = [ "modules/special.nix" ]; + } + ``` ''; default = [ ]; diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix index 4ac8018ba..cb469bee3 100644 --- a/nixosModules/clanCore/default.nix +++ b/nixosModules/clanCore/default.nix @@ -18,6 +18,5 @@ ./vm.nix ./wayland-proxy-virtwl.nix ./zerotier - ./machine_id.nix ]; } diff --git a/nixosModules/clanCore/machine_id.nix b/nixosModules/clanCore/machine_id.nix deleted file mode 100644 index d42e00345..000000000 --- a/nixosModules/clanCore/machine_id.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: - -let - cfg = config.clan.core.machine; -in -{ - options.clan.core.machine = { - id = lib.mkOption { - type = lib.types.nullOr lib.types.str; - description = "The machine id"; - }; - idShort = lib.mkOption { - readOnly = true; - type = lib.types.nullOr lib.types.str; - description = "The short machine id"; - }; - diskId = lib.mkOption { - type = lib.types.nullOr lib.types.str; - description = "The disk id"; - }; - }; - - config = { - clan.core.machine.id = - lib.mkDefault - config.clan.core.facts.services."machine_id".public."machine_id".value; - clan.core.machine.idShort = if (cfg.id != null) then (lib.substring 0 8 cfg.id) else null; - - clan.core.machine.diskId = - lib.mkDefault - config.clan.core.facts.services."machine_id".public."diskId".value; - - clan.core.facts.services."machine_id" = { - public."machine_id" = { }; - public."diskId" = { }; - generator.path = [ - pkgs.coreutils - ]; - generator.script = '' - machine_uuid=$(dd if=/dev/urandom bs=1 count=16 2>/dev/null | od -An -tx1 | tr -d ' \n') - disk_uuid=$(dd if=/dev/urandom bs=1 count=3 2>/dev/null | od -An -tx1 | tr -d ' \n') - echo -n "$machine_uuid" > "$facts"/machine_id - echo -n "$disk_uuid" > "$facts"/diskId - ''; - }; - - networking.hostId = lib.mkIf (cfg.id != null) (lib.mkDefault cfg.idShort); - - boot.kernelParams = lib.mkIf (cfg.id != null) [ - ''systemd.machine_id=${cfg.id}'' - ]; - }; -} diff --git a/pkgs/webview-ui/app/src/routes/machines/details.tsx b/pkgs/webview-ui/app/src/routes/machines/details.tsx index 97444d434..821e9cea6 100644 --- a/pkgs/webview-ui/app/src/routes/machines/details.tsx +++ b/pkgs/webview-ui/app/src/routes/machines/details.tsx @@ -112,15 +112,15 @@ const InstallMachine = (props: InstallMachineProps) => { e.preventDefault(); const curr_uri = activeURI(); const disk = getValue(formStore, "disk"); - const diskId = props.disks.find((d) => d.name === disk)?.id_link; - if (!curr_uri || !diskId || !props.name) { + const disk_id = props.disks.find((d) => d.name === disk)?.id_link; + if (!curr_uri || !disk_id || !props.name) { return; } const r = await callApi("set_single_disk_uuid", { base_path: curr_uri, machine_name: props.name, - disk_uuid: diskId, + disk_uuid: disk_id, }); if (r.status === "error") { toast.error("Failed to set disk"); diff --git a/templates/flake-parts/modules/disko.nix b/templates/flake-parts/modules/disko.nix index 44bdcb2d9..474a31c39 100644 --- a/templates/flake-parts/modules/disko.nix +++ b/templates/flake-parts/modules/disko.nix @@ -1,8 +1,4 @@ { lib, ... }: - -let - suffix = config.clan.core.machine.diskId; -in { boot.loader.grub.efiSupport = lib.mkDefault true; boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; @@ -15,12 +11,12 @@ in content = { type = "gpt"; partitions = { - "boot-${suffix}" = { + "boot" = { size = "1M"; type = "EF02"; # for grub MBR priority = 1; }; - "ESP-${suffix}" = { + "ESP" = { size = "512M"; type = "EF00"; content = { @@ -29,7 +25,7 @@ in mountpoint = "/boot"; }; }; - "root-${suffix}" = { + "root" = { size = "100%"; content = { type = "filesystem"; diff --git a/templates/new-clan/modules/disko.nix b/templates/new-clan/modules/disko.nix index 3ed0c6db2..b98423bc5 100644 --- a/templates/new-clan/modules/disko.nix +++ b/templates/new-clan/modules/disko.nix @@ -1,8 +1,4 @@ { lib, ... }: - -let - suffix = config.clan.core.machine.diskId; -in { # TO NOT EDIT THIS FILE AFTER INSTALLATION of a machine # Otherwise your system might not boot because of missing partitions / filesystems @@ -17,12 +13,12 @@ in content = { type = "gpt"; partitions = { - "boot-${suffix}" = { + "boot" = { size = "1M"; type = "EF02"; # for grub MBR priority = 1; }; - "ESP-${suffix}" = { + "ESP" = { size = "512M"; type = "EF00"; content = { @@ -32,7 +28,7 @@ in mountOptions = [ "nofail" ]; }; }; - "root-${suffix}" = { + "root" = { size = "100%"; content = { type = "filesystem";