Fix infinite recursion with pkgs.devshell.mkShell

template/flake.nix

@@ -12,20 +12,8 @@
       "x86_64-darwin"
       "x86_64-linux"
     ]
-      (system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-          };
-        in
-        {
-        devshellModules.tritonshell = { config, lib, ... }: {
-          options.environment = {
-            enable = lib.mkEnableOption "environment";
-            # TODO: add real config here
-          };
-          config =
-            # TODO: set some devshell config here, like add a new command
+    (
+      system:
       let
         pkgs = import nixpkgs {
           inherit system;
@@ -35,21 +23,15 @@
             (import ./overlay.nix)
           ];
         };
-
-              # HINT: add your extra devshell pkgs here, use any packages you want
-              # available in your devshell's PATH
-              # Use https://search.nixos.org/packages to find available packages
-              # in the unstable channel
-              # These get appended to devshell.packages in ./tritonshell.nix
-              extraDevshellPkgs = with pkgs; [
-                #hello
-              ];
-
       in
-              lib.optionalAttrs config.environment.enable {
-                devShells.default =
-                  (import ./tritonshell.nix { inherit extraDevshellPkgs devshell pkgs self system; });
+      {
+        devshellModules.tritonshell = { config, lib, ... }: {
+          options.environment = {
+            enable = lib.mkEnableOption "triton DevOps shell environment";
           };
+
+          config =
+            lib.mkIf config.environment.enable (import ./tritonshell.nix { inherit devshell pkgs self system; });
         };
         # Internal utility package with shell function and env vars helper.
         # These get source'd in devshell.bash.extra when starting tritonshell
@@ -70,5 +52,6 @@
             inherit pkgs cnsBaseDomain dataCenters mantaDomain tritonApiDomain;
           };
         };
-        });
+      }
+    );
 }

template/tritonshell.nix

@@ -1,5 +1,5 @@
-{ extraDevshellPkgs, devshell, pkgs, self, system, ... }:
-pkgs.devshell.mkShell {
+{ devshell, pkgs, self, system, ... }:
+{
   # devshell docs: https://numtide.github.io/devshell/modules_schema.html
   name = "tritonshell";
 
@@ -62,7 +62,7 @@ pkgs.devshell.mkShell {
     # useful for working with JSON data
     jq
     bunyan-rs
-  ] ++ extraDevshellPkgs;
+  ];
 
   env = [
     # workaround for TLS certs bug in docker-compose, CERTIFICATE_VERIFY_FAILED