diff options
Diffstat (limited to 'hosts/desktop')
| -rw-r--r-- | hosts/desktop/configuration.nix | 12 | ||||
| -rw-r--r-- | hosts/desktop/disko.nix | 44 |
2 files changed, 25 insertions, 31 deletions
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index f825848..50fb2c9 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -9,11 +9,14 @@ imports = [ inputs.disko.nixosModules.disko - + # ./disko.nix ./hardware-configuration.nix + ../../os/default.nix ]; + # hardware.facter.reportPath = /etc/nixos/hosts/desktop/facter.json; + os = { core = { allowUnfree.enable = true; @@ -23,7 +26,11 @@ enable = true; disable-devices.enable = true; }; - bootloader.type = "systemd-boot"; + bootloader = { + type = "systemd-boot"; + timeout = 0; + # luks.enable = true; + }; drivers = { enable = true; cpu = "amd"; @@ -85,7 +92,6 @@ }; boot = { - kernelParams = [ "video=DP-1:2560x1440@240" ]; kernelModules = [ "nct6687" ]; extraModulePackages = [ config.boot.kernelPackages.nct6687d diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix index 78eb6a0..cda1979 100644 --- a/hosts/desktop/disko.nix +++ b/hosts/desktop/disko.nix @@ -31,76 +31,65 @@ mountpoint = "/"; mountOptions = [ "compress=zstd:1" - "noatime" + "space_cache=v2" "discard=async" + "noatime" ]; }; "nix" = { mountpoint = "/nix"; mountOptions = [ "compress=zstd:1" - "noatime" - "discard=async" + "nodev" ]; }; "home" = { mountpoint = "/home"; mountOptions = [ "compress=zstd:1" - "noatime" "nosuid" "nodev" - "discard=async" ]; }; "log" = { mountpoint = "/var/log"; mountOptions = [ "compress=zstd:1" - "noatime" "nosuid" "nodev" - "discard=async" ]; }; "games" = { mountpoint = "/games"; mountOptions = [ - "compress=zstd:1" - "noatime" + "compress=none" "nosuid" "nodev" - "discard=async" ]; }; "llms" = { mountpoint = "/llms"; mountOptions = [ - "nodatacow" "compress=none" - "noatime" + "nodatacow" "nosuid" "nodev" - "discard=async" ]; }; "vms" = { mountpoint = "/vms"; mountOptions = [ - "nodatacow" "compress=none" - "noatime" + "nodatacow" "nosuid" "nodev" - "discard=async" ]; }; "swap" = { mountpoint = "/.swapvol"; mountOptions = [ + "compress=none" "nodatacow" - "noatime" - "discard=async" ]; }; }; @@ -131,54 +120,53 @@ mountOptions = [ "compress=zstd:1" "autodefrag" - "noatime" - "nofail" "nosuid" "nodev" + "nofail" "x-systemd.device-timeout=5s" ]; }; "movies" = { mountpoint = "/storage/movies"; mountOptions = [ + "compress=none" "autodefrag" - "noatime" - "nofail" "nosuid" "nodev" + "nofail" "x-systemd.device-timeout=5s" ]; }; "anime" = { mountpoint = "/storage/anime"; mountOptions = [ + "compress=none" "autodefrag" - "noatime" - "nofail" "nosuid" "nodev" + "nofail" "x-systemd.device-timeout=5s" ]; }; "pictures" = { mountpoint = "/storage/pics"; mountOptions = [ + "compress=none" "autodefrag" - "noatime" - "nofail" "nosuid" "nodev" + "nofail" "x-systemd.device-timeout=5s" ]; }; "videos" = { mountpoint = "/storage/vids"; mountOptions = [ + "compress=none" "autodefrag" - "noatime" - "nofail" "nosuid" "nodev" + "nofail" "x-systemd.device-timeout=5s" ]; }; |