diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index bf732ef..de879a4 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -69,13 +69,6 @@ in boot.supportedFilesystems = [ "ntfs" ]; - # btrfs options - fileSystems = { - "/".options = [ "compress=zstd" ]; - "/home".options = [ "compress=zstd" ]; - "/nix".options = [ "compress=zstd" "noatime" ]; - }; - boot.kernel.sysctl."kernel.sysrq" = 244; boot.plymouth = { diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix index 848ea97..8b69dbb 100644 --- a/hosts/laptop/hardware-configuration.nix +++ b/hosts/laptop/hardware-configuration.nix @@ -21,19 +21,25 @@ in fileSystems."/" = { device = root; fsType = "btrfs"; - options = [ "subvol=root" ]; + options = [ "compress=zstd" "subvol=root" ]; }; fileSystems."/nix" = { device = root; fsType = "btrfs"; - options = [ "subvol=nix" ]; + options = [ "compress=zstd" "noatime" "subvol=nix" ]; }; fileSystems."/home" = { device = root; fsType = "btrfs"; - options = [ "subvol=home" ]; + options = [ "compress=zstd" "subvol=home" ]; + }; + + fileSystems."/steamlibrary" = + { device = root; + fsType = "btrfs"; + options = [ "compress=zstd" "subvol=steamlibrary" ]; }; fileSystems."/boot" = diff --git a/hosts/laptop/mounts.nix b/hosts/laptop/mounts.nix index b3ad404..273b946 100644 --- a/hosts/laptop/mounts.nix +++ b/hosts/laptop/mounts.nix @@ -13,21 +13,4 @@ options = "defaults,exec,noauto,prealloc,uid=1000,gid=100"; } ]; - - systemd.automounts = [ - { - where = "/mounts/my_data"; - wantedBy = ["multi-user.target"]; - automountConfig = { - TimeoutIdleSec = 901; - }; - } - { - where = "/mounts/windows"; - wantedBy = ["multi-user.target"]; - automountConfig = { - TimeoutIdleSec = 901; - }; - } - ]; }