Set-up marabethia as a development machine

modules/nixos/development/android/default.nix

@@ -22,6 +22,6 @@
       zfs.homeLinks = [{ path = ".android"; type = "cache"; }];
     };
     programs.adb.enable = true;
-    users.users.charlotte.extraGroups = [ "adbusers" ];
+    users.users.charlotte.extraGroups = [ "adbusers" "dialout" "uucp" ];
   };
 }

modules/nixos/development/default.nix

@@ -4,13 +4,13 @@
   imports = [
     ./android
     ./docker
-    ./git
   ];
 
   config = lib.mkIf config.chvp.development.enable {
-    chvp.development.docker.enable = lib.mkDefault true;
-
-    users.users.charlotte.extraGroups = [ "dialout" "uucp" ];
+    chvp = {
+      base.zfs.homeLinks = [{ path = "repos"; type = "cache"; }];
+      development.docker.enable = lib.mkDefault true;
+    };
 
     boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
   };

modules/nixos/development/git/default.nix

@@ -1,6 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home-manager.users.charlotte.programs.git = lib.mkIf config.chvp.development.git.enable {
-  };
-}

modules/nixos/graphical/xdg/default.nix

@@ -13,7 +13,6 @@
       { path = "downloads"; type = "cache"; }
       { path = "music"; type = "data"; }
       { path = "pictures"; type = "cache"; }
-      { path = "repos"; type = "cache"; }
       { path = "templates"; type = "data"; }
       { path = "videos"; type = "data"; }
     ];