diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix index 944e1fd..c525cc8 100644 --- a/hosts/workstation/hardware-configuration.nix +++ b/hosts/workstation/hardware-configuration.nix @@ -108,10 +108,10 @@ in "x-systemd.idle-timeout=600" ]; }; - btrfsMount = device: subvol: { + btrfsMount = device: subvol: extraOpts: { inherit device; fsType = "btrfs"; - options = [ + options = extraOpts ++ [ "subvol=${subvol}" "ssd" "compress=lzo" @@ -119,15 +119,18 @@ in "space_cache=v2" "commit=120" "datacow" - ] - ++ (if subvol == "nixos" then [ "noatime" ] else [ ]); + ]; }; + trashOptions = [ + "x-gvfs-trash" + "x-gvfs-show" + ]; in { - "/" = btrfsMount (getMapper "nvme") "nixos"; - "/home" = btrfsMount (getMapper "nvme") "home"; - "/srv/games" = btrfsMount (getMapper "nvme") "games"; - "/srv/ai" = btrfsMount (getUUID "ca1671e1-e201-4960-ad30-593393f970fb") "ai"; + "/" = btrfsMount (getMapper "nvme") "nixos" [ "noatime" ]; + "/home" = btrfsMount (getMapper "nvme") "home" [ ]; + "/srv/games" = btrfsMount (getMapper "nvme") "games" trashOptions; + "/srv/ai" = btrfsMount (getUUID "ca1671e1-e201-4960-ad30-593393f970fb") "ai" trashOptions; "/srv/pool" = nfsMount "server" "pool"; "/srv/server_home" = nfsMount "server" "jawz"; "/srv/backups" = nfsMount "server" "backups";