use deployed environment for launching nixops4 from the panel

this still needs more work to clean up fully

flake.nix

@@ -10,70 +10,64 @@
     inputs@{ flake-parts, ... }:
     let
       sources = import ./npins;
-      inherit (import "${sources.flake-inputs}/lib.nix") import-flake;
+      inherit (import "${flake-inputs}/lib.nix") import-flake;
       inherit (sources) git-hooks agenix;
-      nixpkgs = import-flake sources.nixpkgs;
+      nixpkgs = import-flake  sources.nixpkgs;
     in
-    flake-parts.lib.mkFlake
+    flake-parts.lib.mkFlake { inputs = inputs // { inherit nixpkgs; }; } {
-      {
+      systems = [
-        inputs = inputs // {
+        "x86_64-linux"
-          inherit nixpkgs;
+        "aarch64-linux"
-        };
+        "x86_64-darwin"
-      }
+        "aarch64-darwin"
-      {
+      ];
-        systems = [
-          "x86_64-linux"
-          "aarch64-linux"
-          "x86_64-darwin"
-          "aarch64-darwin"
-        ];
 
-        imports = [
+      imports = [
-          (import "${git-hooks}/flake-module.nix")
+        (import "${git-hooks}/flake-module.nix")
-          inputs.nixops4.modules.flake.default
+        inputs.nixops4.modules.flake.default
 
-          ./deployment/flake-part.nix
+        ./deployment/flake-part.nix
-          ./infra/flake-part.nix
+        ./infra/flake-part.nix
-        ];
+      ];
 
-        perSystem =
+      perSystem =
-          {
+        {
-            pkgs,
+          pkgs,
-            lib,
+          lib,
-            inputs',
+          inputs',
-            ...
+          ...
-          }:
+        }:
-          {
+        {
-            formatter = pkgs.nixfmt-rfc-style;
+          formatter = pkgs.nixfmt-rfc-style;
 
-            pre-commit.settings.hooks =
+          pre-commit.settings.hooks =
-              let
+            let
-                ## Add a directory here if pre-commit hooks shouldn't apply to it.
+              ## Add a directory here if pre-commit hooks shouldn't apply to it.
-                optout = [ "npins" ];
+              optout = [ "npins" ];
-                excludes = map (dir: "^${dir}/") optout;
+              excludes = map (dir: "^${dir}/") optout;
-                addExcludes = lib.mapAttrs (_: c: c // { inherit excludes; });
+              addExcludes = lib.mapAttrs (_: c: c // { inherit excludes; });
-              in
+            in
-              addExcludes {
+            addExcludes {
-                nixfmt-rfc-style.enable = true;
+              nixfmt-rfc-style.enable = true;
-                deadnix.enable = true;
+              deadnix.enable = true;
-                trim-trailing-whitespace.enable = true;
+              trim-trailing-whitespace.enable = true;
-                shellcheck.enable = true;
+              shellcheck.enable = true;
-              };
-
-            devShells.default = pkgs.mkShell {
-              packages = [
-                pkgs.npins
-                pkgs.nil
-                (pkgs.callPackage "${agenix}/pkgs/agenix.nix" { })
-                pkgs.openssh
-                pkgs.httpie
-                pkgs.jq
-                # exposing this env var as a hack to pass info in from form
-                (inputs'.nixops4.packages.default.overrideAttrs {
-                  impureEnvVars = [ "DEPLOYMENT" ];
-                })
-              ];
             };
+
+          devShells.default = pkgs.mkShell {
+            packages = [
+              pkgs.npins
+              pkgs.nil
+              (pkgs.callPackage "${agenix}/pkgs/agenix.nix" { })
+              pkgs.openssh
+              pkgs.httpie
+              pkgs.jq
+              # exposing this env var as a hack to pass info in from form
+              (inputs'.nixops4.packages.default.overrideAttrs {
+                impureEnvVars = [ "DEPLOYMENT" ];
+              })
+            ];
           };
-      };
+        };
+    };
 }

panel/nix/configuration.nix

@@ -185,7 +185,7 @@ in
         ]
         ++ (
           with pkgs;
-          lib.makeBinPath [
+          lib.mkBinPath [
             nix
             git
           ]