From d20f63a876088566db4e1dc9cc8225386d12c63c Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 24 Feb 2024 17:50:27 -0500
Subject: [PATCH] simplify top-level flake

---
 flake.nix                | 40 +++++++++-------------------------------
 systems/darwin.nix       |  7 +++++++
 systems/hetzner/ax41.nix |  8 ++++++++
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/flake.nix b/flake.nix
index f79d450..91732ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,40 +74,18 @@
       flake = {
         # Configurations for Linux (NixOS) systems
         nixosConfigurations = {
-          linux-builder = self.nixos-flake.lib.mkLinuxSystem
-            ./systems/linux-builder.nix;
-
-          immediacy = self.nixos-flake.lib.mkLinuxSystem {
-            imports = [
-              self.nixosModules.default # Defined in nixos/default.nix
-              inputs.sops-nix.nixosModules.sops
-              ./systems/hetzner/ax41.nix
-              ./nixos/server/harden
-            ];
-            sops.defaultSopsFile = ./secrets.json;
-            sops.defaultSopsFormat = "json";
-            services.tailscale.enable = true;
-          };
+          linux-builder =
+            self.nixos-flake.lib.mkLinuxSystem
+              ./systems/linux-builder.nix;
+          immediacy =
+            self.nixos-flake.lib.mkLinuxSystem
+              ./systems/hetzner/ax41.nix;
         };
 
         # Configurations for my (only) macOS machine (using nix-darwin)
-        darwinConfigurations = {
-          appreciate = self.nixos-flake.lib.mkMacosSystem {
-            nixpkgs.hostPlatform = "aarch64-darwin";
-            imports = [
-              self.darwinModules.default # Defined in nix-darwin/default.nix
-              ./systems/darwin.nix
-              ./systems/darwin/ci.nix
-            ];
-          };
-          naivete = self.nixos-flake.lib.mkMacosSystem {
-            nixpkgs.hostPlatform = "aarch64-darwin";
-            imports = [
-              self.darwinModules.default # Defined in nix-darwin/default.nix
-              ./systems/darwin.nix
-            ];
-          };
-        };
+        darwinConfigurations.appreciate =
+          self.nixos-flake.lib.mkMacosSystem
+            ./systems/darwin.nix;
       };
 
       perSystem = { self', system, pkgs, lib, config, inputs', ... }: {
diff --git a/systems/darwin.nix b/systems/darwin.nix
index 7bf69d2..48a0e4a 100644
--- a/systems/darwin.nix
+++ b/systems/darwin.nix
@@ -2,6 +2,13 @@
 
 # See nix-darwin/default.nix for other modules in use.
 {
+  imports = [
+    flake.inputs.self.darwinModules.default
+    ./darwin/ci.nix
+  ];
+
+  nixpkgs.hostPlatform = "aarch64-darwin";
+
   environment.systemPackages = with pkgs; [
     # macOS GUI programs
     wezterm
diff --git a/systems/hetzner/ax41.nix b/systems/hetzner/ax41.nix
index 583b3b6..8eebc64 100644
--- a/systems/hetzner/ax41.nix
+++ b/systems/hetzner/ax41.nix
@@ -1,11 +1,19 @@
 { flake, modulesPath, lib, ... }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
+    flake.inputs.self.nixosModules.default # Defined in nixos/default.nix
+    flake.inputs.sops-nix.nixosModules.sops
     flake.inputs.disko.nixosModules.disko
     ./nixos-container.nix
+    ../../nixos/server/harden
   ];
   system.stateVersion = "23.11";
+
+  sops.defaultSopsFile = ./secrets.json;
+  sops.defaultSopsFormat = "json";
+  services.tailscale.enable = true;
   services.openssh.enable = true;
+
   boot = {
     loader.grub = {
       devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];