tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-12 10:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

desktop: fixing commit

Browse Source
This commit is contained in:
tomasr
2026-06-06 19:04:35 +02:00
parent 23606fecb6
commit a63984816d
5 changed files with 35 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hardware/disko/disko-config.nix
+31 -60
View File
@@ -24,56 +24,41 @@ _: {
};
};
luks = {
root = {
size = "100%";
content = {
type = "luks";
name = "cryptroot";
type = "btrfs";
# You will type this password at boot.
settings.allowDiscards = true;
extraArgs = [ "-f" ];
content = {
type = "btrfs";
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
extraArgs = ["-f"];
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@home" = {
mountpoint = "/home";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [
"compress=zstd"
"noatime"
];
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
# Keyfile storage.
# This subvolume will contain the key used
# to unlock the HDD automatically.
"@keys" = {
mountpoint = "/keys";
};
"@snapshots" = {
mountpoint = "/.snapshots";
};
};
};
@@ -92,27 +77,13 @@ _: {
type = "gpt";
partitions = {
luks = {
data = {
size = "100%";
content = {
type = "luks";
name = "cryptdata";
# IMPORTANT:
# This keyfile will be created after installation.
# The SSD unlocks first.
# Then this keyfile unlocks the HDD automatically.
settings = {
keyFile = "/keys/hdd.key";
};
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
type = "filesystem";
format = "ext4";
mountpoint = "/data";
};
};
};