mixed: gpg fixes, refactoring

systems/default.nix

@@ -71,8 +71,10 @@
         }
         .${toLower config.type};
       modules = with tree; [
-        tree.${config.folder}.modules
-        system
+        tree.modules.${config.folder}
+        tree.${config.folder}.common
+        tree.kat.user.${config.folder}
+        common
       ];
       builder =
         {

systems/sumireko.nix

@@ -1,8 +1,7 @@
 _: let
   hostConfig = {tree, ...}: {
     imports = with tree; [
-      darwin.base
-      darwin.kat
+      kat.work
     ];
 
     security.pam.enableSudoTouchIdAuth = true;