From 086e2a3786fbd8b78db0b89d566348d9f0094c17 Mon Sep 17 00:00:00 2001
From: jeirmeister <jeir@jeirslab.xyz>
Date: Fri, 1 Aug 2025 11:24:06 -0700
Subject: [PATCH] Corrections to flake formatting

---
 flake.nix | 92 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 42 deletions(-)

diff --git a/flake.nix b/flake.nix
index d40ec49..d5002ed 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,48 +9,56 @@
   };
 
   outputs = { self, nixpkgs, nix-bitcoin, nixos-generators, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs { inherit system; };
-        modules = [
-          nix-bitcoin.nixosModules.default
-          ./nix/modules/bitcoind
-          ./nix/modules/nbxplorer
-          ./nix/modules/btcpay
-        ];
-      in {
-        devShells.default = pkgs.mkShell {
-          buildInputs = [
-            nixos-generators.packages.${system}.nixos-generate
-            pkgs.just
-          ];
-          shellHook = ''
-            echo "💚 Devshell ready: nixos-generate, just available."
-          '';
-        };
-        nixosConfigurations.btc-pay-server = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = modules ++ [
-            ({ config, ... }: {
-              boot.isContainer = true;
-              system.stateVersion = "25.05";
-              services.btcpay-full.enable = true;
+    let
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
+      modules = [
+        nix-bitcoin.nixosModules.default
+        ./nix/modules/bitcoind
+        ./nix/modules/nbxplorer
+        ./nix/modules/btcpay
+      ];
+    in {
+      # Top-level nixosConfigurations for proper nixos-rebuild support
+      nixosConfigurations.btc-pay-server = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = modules ++ [
+          ({ config, ... }: {
+            boot.isContainer = true;
+            system.stateVersion = "25.05";
+            services.btcpay-full.enable = true;
 
-              users.users.root.openssh.authorizedKeys.keys = [
-                "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAaV7JtUWkWrjo5FfCcpTCCEY/OJ+T1mJOLbe4avg0XH sysadmin@skrybit.io"
-              ];
+            users.users.root.openssh.authorizedKeys.keys = [
+              "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAaV7JtUWkWrjo5FfCcpTCCEY/OJ+T1mJOLbe4avg0XH sysadmin@skrybit.io"
+            ];
 
-              services.openssh = {
-                enable = true;
-                settings = {
-                  PermitRootLogin = "prohibit-password";
-                  PasswordAuthentication = false;
-                };
+            services.openssh = {
+              enable = true;
+              settings = {
+                PermitRootLogin = "prohibit-password";
+                PasswordAuthentication = false;
               };
-            })
-            self.nixosModules.btcpay-server
-          ];
-        };
-      }
-    );
-}
\ No newline at end of file
+            };
+          })
+          self.nixosModules.btcpay-server
+        ];
+      };
+
+      # devShells and other per-system outputs, if desired
+      devShells = flake-utils.lib.eachDefaultSystem (system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in {
+          default = pkgs.mkShell {
+            buildInputs = [
+              nixos-generators.packages.${system}.nixos-generate
+              pkgs.just
+            ];
+            shellHook = ''
+              echo "💚 Devshell ready: nixos-generate, just available."
+            '';
+          };
+        }
+      );
+    };
+}