.gitignore

@@ -4,5 +4,3 @@
 **/.direnv/**
 result
 .luarc.json
-private/**
-!private/**.age

apps/default.nix

@@ -1,23 +0,0 @@
-{ pkgs, ... }: rec {
-
-  default = readme;
-
-  # Format and install from nothing
-  installer = import ./installer.nix { inherit pkgs; };
-
-  # Display the readme for this repository
-  readme = import ./readme.nix { inherit pkgs; };
-
-  # Load the SSH key for this machine
-  loadkey = import ./loadkey.nix { inherit pkgs; };
-
-  # Encrypt secret for all machines
-  encrypt-secret = import ./encrypt-secret.nix { inherit pkgs; };
-
-  # Re-encrypt secrets for all machines
-  reencrypt-secrets = import ./reencrypt-secrets.nix { inherit pkgs; };
-
-  # Connect machine metrics to Netdata Cloud
-  netdata = import ./netdata-cloud.nix { inherit pkgs; };
-
-}

flake.nix

@@ -88,7 +88,29 @@
 
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };
-        in import ./apps { inherit pkgs; });
+        in rec {
+          default = readme;
+
+          # Format and install from nothing
+          installer = import ./apps/installer.nix { inherit pkgs; };
+
+          # Display the readme for this repository
+          readme = import ./apps/readme.nix { inherit pkgs; };
+
+          # Load the SSH key for this machine
+          loadkey = import ./apps/loadkey.nix { inherit pkgs; };
+
+          # Encrypt secret for all machines
+          encrypt-secret = import ./apps/encrypt-secret.nix { inherit pkgs; };
+
+          # Re-encrypt secrets for all machines
+          reencrypt-secrets =
+            import ./apps/reencrypt-secrets.nix { inherit pkgs; };
+
+          # Connect machine metrics to Netdata Cloud
+          netdata = import ./apps/netdata-cloud.nix { inherit pkgs; };
+
+        });
 
       devShells = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };