Tree! It's the square hole for imports. That's right. It goes in the

square hole.

config/users/arc/settings.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-  defaultOnly = true;
-  includeFolders = {
-    enable = true;
-    default.enable = true;
-  };
-}

config/users/hexchen/settings.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-  defaultOnly = true;
-  includeFolders = {
-    enable = true;
-    default.enable = true;
-  };
-}

config/users/kat/base/vim/default.nix

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

config/users/kat/default.nix

@@ -1,19 +1,19 @@
 { lib, tree, ... }: with lib; let
   wrapImports = imports: mapAttrs
-    (name: paths: { config, ... }: {
+    (_: paths: { config, ... }: {
       config.home-manager.users.kat = {
-        imports = if isAttrs paths then attrValues paths else singleton paths;
+        imports = singleton paths;
       };
     })
     imports;
-  dirImports = wrapImports tree.dirs;
-  serviceImports = wrapImports tree.dirs.services;
+  dirImports = wrapImports tree.prev;
+  serviceImports = wrapImports tree.prev.services;
 in
-(removeAttrs dirImports (singleton "base")) // {
+dirImports // {
   base = {
     imports = [
       dirImports.base
-      tree.files.nixos
+      tree.prev.nixos
     ];
   };
   server = { };

config/users/kat/dev/settings.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-  excludes = [
-  ];
-}

config/users/kat/settings.nix

@@ -1,7 +0,0 @@
-{ ... }: {
-  defaultOnly = true;
-  recursiveInclude = true;
-  includeFolders = {
-    default.enable = true;
-  };
-}