enhace devshell

.envrc

@@ -1,5 +1,7 @@
 watch_file flake.nix flake.lock \
-    modules/*
+    modules/* \
+    devshell/*
+
 {
     mkdir -p "$(direnv_layout_dir)"
     eval "$(nix print-dev-env --no-update-lock-file --no-write-lock-file --profile $(direnv_layout_dir)/flake-profile)"

devshell/default.nix

@@ -0,0 +1,7 @@
+{
+  pkgs,
+  inputs,
+}:
+pkgs.devshell.mkShell {
+  imports = [(pkgs.devshell.importTOML ./devshell.toml)];
+}

devshell/devshell.toml

@@ -10,8 +10,8 @@ eval = "$DEVSHELL_ROOT/kubeconfig.json"
 name = "kubenix"
 packages = [
   "fd",
-  "nixpkgs-fmt",
   "dive",
+  "alejandra",
   "kube3d",
   "kubie",
   "k9s",
@@ -21,7 +21,7 @@ packages = [
 name = "fmt"
 help = "Check Nix formatting"
 category = "checks"
-command = "nixpkgs-fmt ${@} ."
+command = "alejandra ${@} ."
 
 [[commands]]
 name = "evalnix"

flake.nix

@@ -62,9 +62,7 @@
 
         jobs = import ./jobs {inherit pkgs;};
 
-        devShells.default = with pkgs;
+        devShells.default = import ./devshell {inherit pkgs inputs;};
-          devshell.mkShell
-          {imports = [(devshell.importTOML ./devshell.toml)];};
 
         packages = inputs.flake-utils.lib.flattenTree {
           inherit (pkgs) kubernetes kubectl;

modules/generated/v1.23.nix

@@ -72,7 +72,8 @@ with lib; let
       config = definitions."${ref}".config or {};
     });
 
-  submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let
+  submoduleWithMergeOf = ref: mergeKey:
+    types.submodule ({name, ...}: let
       convertName = name:
         if definitions."${ref}".options.${mergeKey}.type == types.int
         then toInt name