From bb5250fef5964c739bb27a09f669986258dfc91f Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Wed, 1 Jan 2025 16:37:31 -0500
Subject: [PATCH] Make server build without snapper and whatnot

---
 hosts/kitty/hardware/default.nix              | 55 +++++++------------
 modules/home/settings/dconf/default.nix       |  4 +-
 .../devices/disks/snapper/jimbo/default.nix   |  4 +-
 .../devices/disks/snapper/root/default.nix    |  4 +-
 4 files changed, 25 insertions(+), 42 deletions(-)

diff --git a/hosts/kitty/hardware/default.nix b/hosts/kitty/hardware/default.nix
index 8b41111..23ac7da 100644
--- a/hosts/kitty/hardware/default.nix
+++ b/hosts/kitty/hardware/default.nix
@@ -20,70 +20,53 @@
   # Main root
   fileSystems = {
     "/" = {
-      device = "/dev/server/root";
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
     "/home" = {
-      device = "/dev/server/root";
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
       fsType = "btrfs";
       options = [ "subvol=@home" ];
     };
     "/nix" = {
-      device = "/dev/server/root";
+      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
       fsType = "btrfs";
       options = [ "subvol=@nix" ];
     };
     "/var" = {
-      device = "/dev/server/root";
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
       fsType = "btrfs";
       options = [ "subvol=@var" ];
     };
-    "/srv/minecraft" = {
-      device = "/dev/server/root";
-      fsType = "btrfs";
-      options = [ "subvol=@minecraft" "compress=zstd" ];
-    };
     "/boot" = {
       device = "/dev/disk/by-uuid/CD94-1D3F";
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-    # Files
-    "/export/JimboNFS/Downloads" = {
-      device = "/dev/server/root";
+    # Subvols and bindmounts
+    "/persist" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
       fsType = "btrfs";
-      options = [ "subvol=@downloads" "compress=zstd" ];
+      options = [ "subvol=persist" "compress=zstd" ];
     };
-    "/export/JimboNFS/Documents" = {
-      device = "/dev/server/root";
-      fsType = "btrfs";
-      options = [ "subvol=@docs" "compress=zstd" ];
+    "/export/JimboNFS" = {
+      depends = [ "/persist" ];
+      device = "/persist/export/JimboNFS";
+      fsType = "none";
+      options = [ "bind" ];
     };
-
-    # Media
-    "/export/JimboNFS/Photos" = {
-      device = "/dev/server/root";
-      fsType = "btrfs";
-      options = [ "subvol=@photos" "compress=zstd" ];
-    };
-    "/export/JimboNFS/Videos" = {
-      device = "/dev/server/root";
-      fsType = "btrfs";
-      options = [ "subvol=@videos" "compress=zstd" ];
-    };
-
-    # Music
-    "/export/JimboNFS/Music" = {
-      device = "/dev/server/root";
-      fsType = "btrfs";
-      options = [ "subvol=@music" "compress=zstd" ];
+    "/srv/minecraft" = {
+      depends = [ "/persist" ];
+      device = "/persist/srv/minecraft";
+      fsType = "none";
+      options = [ "bind" ];
     };
   };
 
   swapDevices = [
-    { device = "/dev/server/root/swap"; }
+    { device = "/dev/disk/by-uuid/57178cfc-3e71-4d35-8c7f-e355f9dc84df"; }
   ];
 
   networking.useDHCP = lib.mkDefault true;
diff --git a/modules/home/settings/dconf/default.nix b/modules/home/settings/dconf/default.nix
index 0e8a058..85759dd 100644
--- a/modules/home/settings/dconf/default.nix
+++ b/modules/home/settings/dconf/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  dconf.settings = {
+  dconf.settings = lib.mkIf config.home.desktop.enable {
     "org/gnome/desktop/interface/color-scheme" = {
       color-scheme = "prefer-dark";
     };
diff --git a/modules/system/devices/disks/snapper/jimbo/default.nix b/modules/system/devices/disks/snapper/jimbo/default.nix
index 56e07d5..229beef 100644
--- a/modules/system/devices/disks/snapper/jimbo/default.nix
+++ b/modules/system/devices/disks/snapper/jimbo/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  services.snapper.configs.jimbo = {
+  services.snapper.configs.jimbo = lib.mkIf config.environment.persistence."/persist".enable {
     SUBVOLUME = "/persist/home/jimbo";
     TIMELINE_CREATE = true;
     TIMELINE_CLEANUP = true;
diff --git a/modules/system/devices/disks/snapper/root/default.nix b/modules/system/devices/disks/snapper/root/default.nix
index 92e28cf..b6de751 100644
--- a/modules/system/devices/disks/snapper/root/default.nix
+++ b/modules/system/devices/disks/snapper/root/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  services.snapper.configs.root = {
+  services.snapper.configs.root = lib.mkIf config.environment.persistence."/persist".enable {
     SUBVOLUME = "/persist";
     TIMELINE_CREATE = true;
     TIMELINE_CLEANUP = true;