From e10e3059b948aa236ce58675505ba3f6e4deda44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20I=C8=99an?= Date: Thu, 23 Apr 2026 22:33:33 +0200 Subject: [PATCH] palantir: changed disko config --- disko/palantir/lvm-striped.nix | 96 ++++++++++++++++++++++++++++++++++ disko/palantir/lvm.nix | 36 ++++++------- hosts/palantir.nix | 9 ---- modules/base.nix | 1 + 4 files changed, 115 insertions(+), 27 deletions(-) create mode 100644 disko/palantir/lvm-striped.nix diff --git a/disko/palantir/lvm-striped.nix b/disko/palantir/lvm-striped.nix new file mode 100644 index 0000000..ef91064 --- /dev/null +++ b/disko/palantir/lvm-striped.nix @@ -0,0 +1,96 @@ +{...}: + +let + disks = [ + "/dev/disk/by-id/ata-KINGSTON_SA400S37960G_50026B7383515406" + "/dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_184377804456" + ]; +in +{ + disko.devices = { + disk = { + ssd0 = { + type = "disk"; + device = builtins.elemAt disks 0; + content = { + type = "gpt"; + partitions = { + esp = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot/efi"; + mountOptions = [ "umask=0077" ]; + }; + }; + + raid = { + size = "100%"; + content = { + type = "mdraid"; + name = "md0"; + }; + }; + }; + }; + }; + + ssd1 = { + type = "disk"; + device = builtins.elemAt disks 1; + content = { + type = "gpt"; + partitions = { + raid = { + size = "100%"; + content = { + type = "mdraid"; + name = "md0"; + }; + }; + }; + }; + }; + }; + + mdadm = { + md0 = { + type = "mdadm"; + level = 0; # RAID0 + content = { + type = "gpt"; + partitions = { + root = { + size = "30G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + + nix = { + size = "50G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/nix"; + }; + }; + + games = { + size = "130G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/games"; + }; + }; + }; + }; + }; + }; + }; +} diff --git a/disko/palantir/lvm.nix b/disko/palantir/lvm.nix index 1e997a7..16b7833 100644 --- a/disko/palantir/lvm.nix +++ b/disko/palantir/lvm.nix @@ -3,7 +3,7 @@ let disks = [ "/dev/disk/by-id/ata-KINGSTON_SA400S37960G_50026B7383515406" - #"/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055" + "/dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_184377804456" ]; in { @@ -37,22 +37,22 @@ in }; }; - #ssd1 = { - # type = "disk"; - # device = builtins.elemAt disks 1; - # content = { - # type = "gpt"; - # partitions = { - # lvm = { - # size = "100%"; - # content = { - # type = "lvm_pv"; - # vg = "mainpool"; - # }; - # }; - # }; - # }; - #}; + ssd1 = { + type = "disk"; + device = builtins.elemAt disks 1; + content = { + type = "gpt"; + partitions = { + lvm = { + size = "100%"; + content = { + type = "lvm_pv"; + vg = "mainpool"; + }; + }; + }; + }; + }; }; lvm_vg = { @@ -89,4 +89,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/hosts/palantir.nix b/hosts/palantir.nix index f50b2e6..7ccf6a1 100644 --- a/hosts/palantir.nix +++ b/hosts/palantir.nix @@ -31,15 +31,6 @@ }; }; - # Mounts - #fileSystems."/games" = { - # device = "/dev/disk/by-uuid/90bea801-2b8a-40db-8862-ccc55f2b2262"; - # fsType = "ext4"; - # options = [ - # "nofail" # Prevent system from failing if this drive doesn't mount - # ]; - #}; - # Release system.stateVersion = release; } diff --git a/modules/base.nix b/modules/base.nix index b1cf5ed..7211411 100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -16,6 +16,7 @@ killall neovim progress + pv ]; # SSH