From 91d1041e060df7a4c70e7703eaf93bec0c741416 Mon Sep 17 00:00:00 2001
From: GTrunSec <gtrunsec@hardenedlinux.org>
Date: Sat, 2 Apr 2022 15:31:14 -0700
Subject: [PATCH] enhace devshell

---
 .envrc                                  |  4 +++-
 devshell/default.nix                    |  7 +++++++
 devshell.toml => devshell/devshell.toml |  4 ++--
 flake.nix                               |  4 +---
 modules/generated/v1.23.nix             | 27 +++++++++++++------------
 5 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 devshell/default.nix
 rename devshell.toml => devshell/devshell.toml (92%)

diff --git a/.envrc b/.envrc
index 91b455f..72b5aae 100644
--- a/.envrc
+++ b/.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)"
diff --git a/devshell/default.nix b/devshell/default.nix
new file mode 100644
index 0000000..fff4d33
--- /dev/null
+++ b/devshell/default.nix
@@ -0,0 +1,7 @@
+{
+  pkgs,
+  inputs,
+}:
+pkgs.devshell.mkShell {
+  imports = [(pkgs.devshell.importTOML ./devshell.toml)];
+}
diff --git a/devshell.toml b/devshell/devshell.toml
similarity index 92%
rename from devshell.toml
rename to devshell/devshell.toml
index 239320b..326b662 100644
--- a/devshell.toml
+++ b/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"
diff --git a/flake.nix b/flake.nix
index d23a1a1..42fd3e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,9 +62,7 @@
 
         jobs = import ./jobs {inherit pkgs;};
 
-        devShells.default = with pkgs;
-          devshell.mkShell
-          {imports = [(devshell.importTOML ./devshell.toml)];};
+        devShells.default = import ./devshell {inherit pkgs inputs;};
 
         packages = inputs.flake-utils.lib.flattenTree {
           inherit (pkgs) kubernetes kubectl;
diff --git a/modules/generated/v1.23.nix b/modules/generated/v1.23.nix
index 70f7957..25bd4f9 100644
--- a/modules/generated/v1.23.nix
+++ b/modules/generated/v1.23.nix
@@ -72,19 +72,20 @@ with lib; let
       config = definitions."${ref}".config or {};
     });
 
-  submoduleWithMergeOf = ref: mergeKey: types.submodule ({name, ...}: let
-    convertName = name:
-      if definitions."${ref}".options.${mergeKey}.type == types.int
-      then toInt name
-      else name;
-  in {
-    options = definitions."${ref}".options;
-    config =
-      definitions."${ref}".config
-      // {
-        ${mergeKey} = mkOverride 1002 (convertName name);
-      };
-  });
+  submoduleWithMergeOf = ref: mergeKey:
+    types.submodule ({name, ...}: let
+      convertName = name:
+        if definitions."${ref}".options.${mergeKey}.type == types.int
+        then toInt name
+        else name;
+    in {
+      options = definitions."${ref}".options;
+      config =
+        definitions."${ref}".config
+        // {
+          ${mergeKey} = mkOverride 1002 (convertName name);
+        };
+    });
 
   submoduleForDefinition = ref: resource: kind: group: version: let
     apiVersion =