From 6b602f0aba1e277490914b2eab772b465c8d3d0e Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Sun, 8 Sep 2024 00:03:23 -0700
Subject: Bump: btrfs

---
 hosts/kansai/hardware-configuration.nix | 32 +++++++++++++++++++++++++++++++-
 modules/system/services/default.nix     |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/hosts/kansai/hardware-configuration.nix b/hosts/kansai/hardware-configuration.nix
index 6878d23..0c24a23 100644
--- a/hosts/kansai/hardware-configuration.nix
+++ b/hosts/kansai/hardware-configuration.nix
@@ -4,6 +4,17 @@
   modulesPath,
   ...
 }:
+let
+  uuid = "59148bdd-ecb1-49a0-beec-89d0adf909ae";
+
+  btrfsOptions = [
+    "compress-force=zstd:1"
+    "noatime"
+    "discard=async"
+    "space_cache=v2"
+    "ssd"
+  ];
+in
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -26,8 +37,27 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/59148bdd-ecb1-49a0-beec-89d0adf909ae";
+      device = "/dev/disk/by-uuid/${uuid}";
+      fsType = "btrfs";
+      options = btrfsOptions;
+    };
+
+    "/home" = {
+      device = "/dev/disk/by-uuid/${uuid}";
+      fsType = "btrfs";
+      options = btrfsOptions ++ [ "subvol=@home" ];
+    };
+
+    "/var" = {
+      device = "/dev/disk/by-uuid/${uuid}";
+      fsType = "btrfs";
+      options = btrfsOptions ++ [ "subvol=@var" ];
+    };
+
+    "/nix" = {
+      device = "/dev/disk/by-uuid/${uuid}";
       fsType = "btrfs";
+      options = btrfsOptions ++ [ "subvol=@nix" ];
     };
 
     "/boot" = {
diff --git a/modules/system/services/default.nix b/modules/system/services/default.nix
index a8292b2..f126f62 100644
--- a/modules/system/services/default.nix
+++ b/modules/system/services/default.nix
@@ -13,7 +13,7 @@
   services = {
     printing.enable = false;
     gnome.gnome-keyring.enable = true;
-    fstrim.enable = true;
+    fstrim.enable = false;
     gvfs.enable = true;
     udev.packages = with pkgs; [ pkgs.logitech-udev-rules ];
     thermald.enable = true;
-- 
cgit v1.2.3