reformat with updated nixfmt

this still needs more work to clean up fully

flake.nix

@@ -14,60 +14,66 @@
       inherit (sources) git-hooks agenix;
       nixpkgs = import-flake sources.nixpkgs;
     in
-    flake-parts.lib.mkFlake { inputs = inputs // { inherit nixpkgs; }; } {
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-
-      imports = [
-        (import "${git-hooks}/flake-module.nix")
-        inputs.nixops4.modules.flake.default
-
-        ./deployment/flake-part.nix
-        ./infra/flake-part.nix
-      ];
-
-      perSystem =
-        {
-          pkgs,
-          lib,
-          inputs',
-          ...
-        }:
-        {
-          formatter = pkgs.nixfmt-rfc-style;
-
-          pre-commit.settings.hooks =
-            let
-              ## Add a directory here if pre-commit hooks shouldn't apply to it.
-              optout = [ "npins" ];
-              excludes = map (dir: "^${dir}/") optout;
-              addExcludes = lib.mapAttrs (_: c: c // { inherit excludes; });
-            in
-            addExcludes {
-              nixfmt-rfc-style.enable = true;
-              deadnix.enable = true;
-              trim-trailing-whitespace.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" ];
-              })
-            ];
-          };
+    flake-parts.lib.mkFlake
+      {
+        inputs = inputs // {
+          inherit nixpkgs;
         };
-    };
+      }
+      {
+        systems = [
+          "x86_64-linux"
+          "aarch64-linux"
+          "x86_64-darwin"
+          "aarch64-darwin"
+        ];
+
+        imports = [
+          (import "${git-hooks}/flake-module.nix")
+          inputs.nixops4.modules.flake.default
+
+          ./deployment/flake-part.nix
+          ./infra/flake-part.nix
+        ];
+
+        perSystem =
+          {
+            pkgs,
+            lib,
+            inputs',
+            ...
+          }:
+          {
+            formatter = pkgs.nixfmt-rfc-style;
+
+            pre-commit.settings.hooks =
+              let
+                ## Add a directory here if pre-commit hooks shouldn't apply to it.
+                optout = [ "npins" ];
+                excludes = map (dir: "^${dir}/") optout;
+                addExcludes = lib.mapAttrs (_: c: c // { inherit excludes; });
+              in
+              addExcludes {
+                nixfmt-rfc-style.enable = true;
+                deadnix.enable = true;
+                trim-trailing-whitespace.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" ];
+                })
+              ];
+            };
+          };
+      };
 }

panel/env.nix

@@ -9,10 +9,4 @@ in
 {
   REPO_DIR = toString ../.;
   # explicitly use nix, as e.g. lix does not have configurable-impure-env
-  BIN_PATH = lib.makeBinPath [
-    # explicitly use nix, as e.g. lix does not have configurable-impure-env
-    pkgs.nix
-    # nixops error maybe due to our flake git hook: executing 'git': No such file or directory
-    pkgs.git
-  ];
 }

panel/nix/configuration.nix

@@ -181,6 +181,8 @@ in
       path = [
         python-environment
         manage-service
+        nix
+        git
       ];
       preStart = ''
         # Auto-migrate on first run or if the package has changed

panel/src/panel/settings.py

@@ -240,8 +240,6 @@ if user_settings_file is not None:
 #     The correct thing to do here would be using a helper function such as with `get_secret()` that will catch the exception and explain what's wrong and where to put the right values.
 #     Replacing the `USER_SETTINGS_FILE` mechanism following the comment there would probably be a good thing.
 
-# PATH to expose to launch button
-bin_path=env['BIN_PATH']
 # path of the root flake to trigger nixops from, see #94.
 # to deploy this should be specified, for dev just use a relative path.
 repo_dir = env["REPO_DIR"]

panel/src/panel/views.py

@@ -89,7 +89,7 @@ class DeploymentStatus(ConfigurationForm):
 
     def deployment(self, config: BaseModel):
         env = {
-            "PATH": settings.bin_path,
+            "PATH": os.environ.get("PATH"),
             # pass in form info to our deployment
             "DEPLOYMENT": config.json()
         }