yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'docs: Fix line highlighting, add warning to single-disk' (#2091) from Qubasa/clan-core:Qubasa-main into main

Browse Source
This commit is contained in:
clan-bot
2024-09-13 13:07:15 +00:00
parent b62b034e41 edc879b276
commit 253156574e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clanModules/single-disk/default.nix
View File

@@ -5,11 +5,13 @@
default = null; default = null;
type = lib.types.nullOr lib.types.str; type = lib.types.nullOr lib.types.str;
description = "The primary disk device to install the system on"; description = "The primary disk device to install the system on";
# Question: should we set a default here?
# default = "/dev/null";
}; };
}; };
config = { config = {
warnings = [
"clanModules.single-disk is deprecated. Please copy the disko config from the module into your machine config."
];
boot.loader.grub.efiSupport = lib.mkDefault true; boot.loader.grub.efiSupport = lib.mkDefault true;
boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true; boot.loader.grub.efiInstallAsRemovable = lib.mkDefault true;
disko.devices = { disko.devices = {

4
docs/site/getting-started/disk-encryption.md
View File

@@ -14,7 +14,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
=== "**Single Disk**" === "**Single Disk**"
Below is the configuration for `disko.nix` Below is the configuration for `disko.nix`
```nix hl_lines="16 47" ```nix hl_lines="17 48"
{ lib, clan-core, ... }: { lib, clan-core, ... }:
let let
suffix = config.clan.core.vars.generators.disk-id.files.diskId.value; suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;
@@ -115,7 +115,7 @@ lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
=== "**Raid 1**" === "**Raid 1**"
Below is the configuration for `disko.nix` Below is the configuration for `disko.nix`
```nix hl_lines="16 47 48" ```nix hl_lines="17 48 49"
{ lib, clan-core, ... }: { lib, clan-core, ... }:
let let
suffix = config.clan.core.vars.generators.disk-id.files.diskId.value; suffix = config.clan.core.vars.generators.disk-id.files.diskId.value;