Alright this ain't finished cause of the home stuff but I don't wanna lose what I've done. Impermanence, disko, lots of changes. TODO: add modularity to home.

modules/system/services/pc/default.nix

@@ -1,11 +1,11 @@
 { ... }:
 {
   imports = [
-    ./fwupd
     ./gnome-keyring
+    ./gvfs
     ./keyd
     ./mpd
-    ./networkfs
     ./polkit
+    ./snapper
   ];
 }

modules/system/services/pc/fwupd/default.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  services.fwupd.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    fwupd
-  ];
-}

modules/system/services/pc/keyd/default.nix

@@ -8,7 +8,6 @@
         main = {
           capslock = "overload(control,esc)";
           leftcontrol = "overload(ctrlmod,noop)";
-
           esc = "`";
           rightcontrol = "esc";
           left = "noop";

modules/system/services/pc/school/default.nix

@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./globalprotect
-  ];
-}

modules/system/services/pc/school/globalprotect/default.nix

@@ -1,4 +0,0 @@
-{ ... }:
-{
-  services.globalprotect.enable = true;
-}

modules/system/services/pc/snapper/default.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  imports = [
+    ./root
+    ./jimbo
+  ];
+
+  services.snapper = {
+    snapshotInterval = "0/6:00:00";
+    cleanupInterval = "12:00:00";
+    persistentTimer = true;
+  };
+}

modules/system/services/pc/snapper/jimbo/default.nix

@@ -0,0 +1,12 @@
+{ ... }:
+{
+  services.snapper.configs.jimbo = {
+    SUBVOLUME = "/persist/home/jimbo";
+    TIMELINE_CREATE = true;
+    TIMELINE_CLEANUP = true;
+    TIMELINE_LIMIT_DAILY = 1;
+    TIMELINE_LIMIT_WEEKLY = 1;
+    TIMELINE_LIMIT_MONTHLY = 0;
+    TIMELINE_LIMIT_YEARLY = 0;
+  };
+}

modules/system/services/pc/snapper/root/default.nix

@@ -0,0 +1,12 @@
+{ ... }:
+{
+  services.snapper.configs.root = {
+    SUBVOLUME = "/persist";
+    TIMELINE_CREATE = true;
+    TIMELINE_CLEANUP = true;
+    TIMELINE_LIMIT_DAILY = 1;
+    TIMELINE_LIMIT_WEEKLY = 0;
+    TIMELINE_LIMIT_MONTHLY = 0;
+    TIMELINE_LIMIT_YEARLY = 0;
+  };
+}

modules/system/services/pc/sunshine/default.nix

@@ -2,7 +2,6 @@
 {
   services.sunshine = {
     enable = true;
-    settings.port = 57989;
     autoStart = false;
   };
 }