refactor: get rid of config folder

.gitignore

@@ -3,3 +3,4 @@
 /.direnv/
 /wiki
 .DS_Store
+tf/

.rgignore

@@ -1 +1,3 @@
 /config/trusted/tf/
+/config/tf
+/tf

config/tf

@@ -1 +0,0 @@
-Subproject commit 84b1742d36714279de336e2bee37848d0b3b6de8

flake.lock

@@ -96,11 +96,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1657275959,
+        "lastModified": 1657305762,
-        "narHash": "sha256-pg8FB1DRImBpqXHCp/0Y7bIphpVqGmkWgWOcFDMwdTg=",
+        "narHash": "sha256-dsuJG/y2LtqyHhDEIo3d3g/+K9IqhG3qt/tf7WYheH4=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "22448c09bae21969ca14d1558a120dafe9853c73",
+        "rev": "eae26b7d5fc04699078a1687185d65077bc73c96",
         "type": "github"
       },
       "original": {
@@ -342,12 +342,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1657208011,
+        "lastModified": 1657114324,
-        "narHash": "sha256-BlIFwopAykvdy1DYayEkj6ZZdkn+cVgPNX98QVLc0jM=",
+        "narHash": "sha256-fWuaUNXrHcz/ciHRHlcSO92dvV3EVS0GJQUSBO5JIB4=",
-        "owner": "NixOS",
+        "path": "/nix/store/7x87vd43nvg8pkcmya5ivl34q5y8kp9b-source",
-        "repo": "nixpkgs",
+        "rev": "a5c867d9fe9e4380452628e8f171c26b69fa9d3d",
-        "rev": "2770cc0b1e8faa0e20eb2c6aea64c256a706d4f2",
+        "type": "path"
-        "type": "github"
       },
       "original": {
         "id": "nixpkgs",
@@ -388,11 +387,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1657272425,
+        "lastModified": 1657315594,
-        "narHash": "sha256-Y1vbPYhUi0ZKqn6XxQeE/RnyMcfHIE0YCkR1iPGoToo=",
+        "narHash": "sha256-lkAqmREtGhWwHK3wdVSfqt+Q+xUhZmQ0UZyubeMJLR4=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "4a0d26d6ccb60f24a5e771c6de4c64622fb2b4af",
+        "rev": "fae381cd12525fdfb5163ce0ac78c2705d5917c4",
         "type": "github"
       },
       "original": {
@@ -567,6 +566,7 @@
     "trusted": {
       "flake": false,
       "locked": {
+        "lastModified": 1,
         "narHash": "sha256-Q3QXOoy+iN4VK2CflvRulYvPZXYgF0dO7FoF7CvWFTA=",
         "path": "./empty/.",
         "type": "path"

modules/meta/deploy.nix

@@ -31,13 +31,13 @@ let
 in
 {
   imports = [
-    (toString (inputs.tf-nix + "/modules/run.nix"))
+    "${toString inputs.tf-nix}/modules/run.nix"
   ] ++ (optional (builtins.pathExists ../../tf/tf.nix) (../../tf/tf.nix));
   options = {
     deploy = {
       dataDir = mkOption {
         type = types.path;
-        default = ../../../tf;
+        default = ../../tf;
       };
       local = {
         isRoot = mkOption {

modules/meta/imports.nix

@@ -25,19 +25,19 @@ with lib;
   config = {
     network.importing = {
       nixosImports = mkDefault (map (path: toString path) [
-        (root + "/config/nodes/nixos/HN.nix")
+        (root + "/nodes/nixos/HN.nix")
-        (root + "/config/nodes/nixos/HN/nixos.nix")
+        (root + "/nodes/nixos/HN/nixos.nix")
-        (root + "/config/trusted/nodes/nixos/HN/nixos.nix")
+        (root + "/trusted/nodes/nixos/HN/nixos.nix")
       ]);
       darwinImports = mkDefault (map (path: toString path) [
-        (root + "/config/nodes/darwin/HN.nix")
+        (root + "/nodes/darwin/HN.nix")
-        (root + "/config/nodes/darwin/HN/darwin.nix")
+        (root + "/nodes/darwin/HN/darwin.nix")
-        (root + "/config/trusted/nodes/darwin/HN/darwin.nix")
+        (root + "/trusted/nodes/darwin/HN/darwin.nix")
       ]);
       homeImports = mkDefault (map (path: toString path) [
-        (root + "/config/nodes/nixos/HN/home.nix")
+        (root + "/nodes/nixos/HN/home.nix")
-        (root + "/config/nodes/darwin/HN/home.nix")
+        (root + "/nodes/darwin/HN/home.nix")
-        (root + "/config/trusted/nodes/HN/home.nix")
+        (root + "/trusted/nodes/HN/home.nix")
       ]);
       users = mkDefault (singleton "kat");
     };

nodes/darwin/sumireko.nix

@@ -5,7 +5,9 @@
       users.kat.darwin
       users.kat.dev
   ];
+  
   security.pam.enableSudoTouchIdAuth = true;
+
   homebrew = {
     brewPrefix = "/opt/homebrew/bin";
     casks = [
@@ -15,6 +17,7 @@
       "discord"
     ];
   };
+
   environment.systemPackages = with pkgs; [
     awscli
     jq

outputs.nix

@@ -7,8 +7,20 @@
   mkTree = import ./tree.nix { inherit lib; };
   localTree = mkTree {
     inherit inputs;
-    folder = ./config;
+    folder = ./.;
     config = {
+      "/" = {
+        excludes = [
+          "tf"
+          "inputs"
+          "tree"
+          "flake"
+          "meta"
+          "outputs"
+          "inputs"
+          "trusted"
+        ];
+      };
       "modules/nixos" = {
         functor = {
           enable = true;