From cd204f5ac3fbd61decbefa95941e8a5c7f88b140 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:31:42 +0000
Subject: [PATCH] move apps declaration to apps directory

---
 apps/default.nix | 23 +++++++++++++++++++++++
 flake.nix        | 24 +-----------------------
 2 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 apps/default.nix

diff --git a/apps/default.nix b/apps/default.nix
new file mode 100644
index 0000000..f0076ff
--- /dev/null
+++ b/apps/default.nix
@@ -0,0 +1,23 @@
+{ 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; };
+
+}
diff --git a/flake.nix b/flake.nix
index 258bc58..09b8e3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,29 +88,7 @@
 
       apps = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };
-        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; };
-
-        });
+        in import ./apps { inherit pkgs; });
 
       devShells = forAllSystems (system:
         let pkgs = import nixpkgs { inherit system; };