diff options
Diffstat (limited to 'hosts/thinkpad')
| -rw-r--r-- | hosts/thinkpad/configuration.nix | 16 | ||||
| -rw-r--r-- | hosts/thinkpad/disko.nix | 81 | ||||
| -rw-r--r-- | hosts/thinkpad/home.nix | 1 |
3 files changed, 59 insertions, 39 deletions
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index 69134eb..f97d714 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -3,12 +3,12 @@ system.stateVersion = "25.05"; imports = [ - inputs.disko.nixosModules.disko - ./disko.nix + inputs.disko.nixosModules.disko + ./disko.nix - ./hardware-configuration.nix - ../../os/default.nix - ]; + ./hardware-configuration.nix + ../../os/default.nix + ]; os = { core = { @@ -47,12 +47,8 @@ thunar.enable = true; utils.enable = true; }; - # gaming = { - # enable = true; - # steam.enable = true; - # vr.enable = true; - # }; # kvm.enable = true; + kdeconnect.enable = true; nix-helper.enable = true; }; wm = { diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix index 120efbc..f3243d8 100644 --- a/hosts/thinkpad/disko.nix +++ b/hosts/thinkpad/disko.nix @@ -8,7 +8,7 @@ type = "gpt"; partitions = { ESP = { - size = "1G"; + size = "2G"; type = "EF00"; content = { type = "filesystem"; @@ -17,35 +17,60 @@ mountOptions = [ "umask=0077" ]; }; }; - root = { + luks = { size = "100%"; content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "@" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd:1" "noatime" ]; - }; - "@home" = { - mountpoint = "/home"; - mountOptions = [ "compress=zstd:1" "noatime" ]; - }; - "@nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd:1" "noatime" ]; - }; - "@log" = { - mountpoint = "/var/log"; - mountOptions = [ "compress=zstd:1" "noatime" ]; - }; - "@vms" = { - mountpoint = "/vms"; - mountOptions = [ "nodatacow" "noatime" ]; - }; - "@swap" = { - mountpoint = "/.swapvol"; - mountOptions = [ "nodatacow" "noatime" ]; + type = "luks"; + name = "crypted"; + settings = { + allowDiscards = true; + }; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "@" = { + mountpoint = "/"; + mountOptions = [ + "compress=zstd:1" + "noatime" + ]; + }; + "@home" = { + mountpoint = "/home"; + mountOptions = [ + "compress=zstd:1" + "noatime" + ]; + }; + "@nix" = { + mountpoint = "/nix"; + mountOptions = [ + "compress=zstd:1" + "noatime" + ]; + }; + "@log" = { + mountpoint = "/var/log"; + mountOptions = [ + "compress=zstd:1" + "noatime" + ]; + }; + "@vms" = { + mountpoint = "/vms"; + mountOptions = [ + "nodatacow" + "noatime" + ]; + }; + "@swap" = { + mountpoint = "/.swapvol"; + mountOptions = [ + "nodatacow" + "noatime" + ]; + }; }; }; }; diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix index 666a3b0..78a39d9 100644 --- a/hosts/thinkpad/home.nix +++ b/hosts/thinkpad/home.nix @@ -37,7 +37,6 @@ }; soft = { browser.brave.enable = true; - kdeconnect.enable = true; media.enable = true; mpv.enable = true; nixcord.enable = true; |