feat: use atomiutils, infrautils & infralint

AtomiCloud · Jan 29, 2025 · 021d869 · 021d869
1 parent 1a33dcf
commit 021d869
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 150 deletions.
diff --git a/templates/bun/nix/env.nix b/templates/bun/nix/env.nix
@@ -2,14 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    bash
-    jq
-    yq
-    curl
+    atomiutils
   ];
 
   dev = [
@@ -21,9 +14,7 @@ with packages;
     <%= if (infra) { %>
   */
   infra = [
-    kubectl
-    k3d
-    helm
+    infrautils
   ];
   /*
     <%= } %>
@@ -45,8 +36,7 @@ with packages;
     /*
       <%= if (infra) { %>
     */
-    hadolint
-    helm-docs
+    infralint
     /*
       <%= } %>
     */

diff --git a/templates/bun/nix/packages.nix b/templates/bun/nix/packages.nix
@@ -17,28 +17,12 @@ let
       with pkgs-2411;
       {
 
-        yq = yq-go;
-
-        /*
-        <%= if (infra) { %>
-        */
-        helm = kubernetes-helm;
-        /*
-        <%= } %>
-        */
-
         inherit
 
           # standard
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          jq
-          bash
+          atomiutils
 
           git
-          curl
           infisical
 
           treefmt
@@ -52,13 +36,8 @@ let
           <%= if (infra) { %>
           */
           #infra
-          kubectl
-          k3d
-
-          docker
-          hadolint
-
-          helm-docs
+          infrautils
+          infralint
           /*
           <%= } %>
           */

diff --git a/templates/bun/nix/pre-commit.nix b/templates/bun/nix/pre-commit.nix
@@ -76,7 +76,7 @@ pre-commit-lib.run {
     a-enforce-exec = {
       enable = true;
       name = "Enforce Shell Script executable";
-      entry = "${packages.coreutils}/bin/chmod +x";
+      entry = "${packages.atomiutils}/bin/chmod +x";
       files = ".*sh$";
       language = "system";
       pass_filenames = true;
@@ -88,7 +88,7 @@ pre-commit-lib.run {
     a-hadolint = {
       enable = true;
       name = "Docker Linter";
-      entry = "${packages.hadolint}/bin/hadolint";
+      entry = "${packages.infralint}/bin/hadolint";
       files = ".*Dockerfile$";
       language = "system";
       pass_filenames = true;
@@ -97,7 +97,7 @@ pre-commit-lib.run {
     a-helm-docs = {
       enable = true;
       name = "Helm Docs";
-      entry = "${packages.helm-docs}/bin/helm-docs";
+      entry = "${packages.infralint}/bin/helm-docs";
       files = ".*";
       language = "system";
       pass_filenames = false;

diff --git a/templates/cyanprint-bun/nix/env.nix b/templates/cyanprint-bun/nix/env.nix
@@ -2,12 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    jq
-    yq
+    atomiutils
   ];
 
   dev = [

diff --git a/templates/cyanprint-bun/nix/packages.nix b/templates/cyanprint-bun/nix/packages.nix
@@ -16,15 +16,9 @@ let
     nix-2411 = (
       with pkgs-2411;
       {
-        yq = yq-go;
 
         inherit
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          jq
-
+          atomiutils
 
           git
 

diff --git a/templates/cyanprint-bun/nix/pre-commit.nix b/templates/cyanprint-bun/nix/pre-commit.nix
@@ -57,7 +57,7 @@ pre-commit-lib.run {
     a-enforce-exec = {
       enable = true;
       name = "Enforce Shell Script executable";
-      entry = "${packages.coreutils}/bin/chmod +x";
+      entry = "${packages.atomiutils}/bin/chmod +x";
       files = ".*sh$";
       language = "system";
       pass_filenames = true;

diff --git a/templates/dotnet/nix/env.nix b/templates/dotnet/nix/env.nix
@@ -2,14 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    bash
-    jq
-    yq
-    curl
+    atomiutils
   ];
 
   dev = [
@@ -21,9 +14,7 @@ with packages;
     <%= if (infra) { %>
   */
   infra = [
-    kubectl
-    k3d
-    helm
+    infrautils
   ];
   /*
     <%= } %>
@@ -44,8 +35,7 @@ with packages;
     /*
       <%= if (infra) { %>
     */
-    hadolint
-    helm-docs
+    infralint
     /*
       <%= } %>
     */

diff --git a/templates/dotnet/nix/packages.nix b/templates/dotnet/nix/packages.nix
@@ -16,30 +16,13 @@ let
     nix-2411 = (
       with pkgs-2411;
       {
-
-        yq = yq-go;
         dotnet = dotnet-sdk_9;
-
-        /*
-        <%= if (infra) { %>
-        */
-        helm = kubernetes-helm;
-        /*
-        <%= } %>
-        */
-
         inherit
 
           # standard
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          jq
-          bash
+          atomiutils
 
           git
-          curl
           infisical
 
           treefmt
@@ -50,13 +33,8 @@ let
           <%= if (infra) { %>
           */
           #infra
-          kubectl
-          k3d
-
-          docker
-          hadolint
-
-          helm-docs
+          infrautils
+          infralint
           /*
           <%= } %>
           */

diff --git a/templates/dotnet/nix/pre-commit.nix b/templates/dotnet/nix/pre-commit.nix
@@ -77,7 +77,7 @@ pre-commit-lib.run {
     a-enforce-exec = {
       enable = true;
       name = "Enforce Shell Script executable";
-      entry = "${packages.coreutils}/bin/chmod +x";
+      entry = "${packages.atomiutils}/bin/chmod +x";
       files = ".*sh$";
       language = "system";
       pass_filenames = true;
@@ -89,7 +89,7 @@ pre-commit-lib.run {
     a-hadolint = {
       enable = true;
       name = "Docker Linter";
-      entry = "${packages.hadolint}/bin/hadolint";
+      entry = "${packages.infralint}/bin/hadolint";
       files = ".*Dockerfile$";
       language = "system";
       pass_filenames = true;
@@ -98,7 +98,7 @@ pre-commit-lib.run {
     a-helm-docs = {
       enable = true;
       name = "Helm Docs";
-      entry = "${packages.helm-docs}/bin/helm-docs";
+      entry = "${packages.infralint}/bin/helm-docs";
       files = ".*";
       language = "system";
       pass_filenames = false;

diff --git a/templates/go/nix/env.nix b/templates/go/nix/env.nix
@@ -2,14 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    bash
-    jq
-    yq
-    curl
+    atomiutils
   ];
 
   dev = [
@@ -22,9 +15,7 @@ with packages;
     <%= if (infra) { %>
   */
   infra = [
-    kubectl
-    k3d
-    helm
+    infrautils
   ];
   /*
     <%= } %>
@@ -49,8 +40,7 @@ with packages;
     /*
       <%= if (infra) { %>
     */
-    hadolint
-    helm-docs
+    infralint
     /*
       <%= } %>
     */

diff --git a/templates/go/nix/packages.nix b/templates/go/nix/packages.nix
@@ -16,29 +16,12 @@ let
     nix-2411 = (
       with pkgs-2411;
       {
-
-        yq = yq-go;
-
-        /*
-        <%= if (infra) { %>
-        */
-        helm = kubernetes-helm;
-        /*
-        <%= } %>
-        */
-
         inherit
 
           # standard
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          jq
-          bash
+          atomiutils
 
           git
-          curl
           infisical
 
           treefmt
@@ -55,13 +38,8 @@ let
           <%= if (infra) { %>
           */
           #infra
-          kubectl
-          k3d
-
-          docker
-          hadolint
-
-          helm-docs
+          infrautils
+          infralint
           /*
           <%= } %>
           */

diff --git a/templates/go/nix/pre-commit.nix b/templates/go/nix/pre-commit.nix
@@ -77,7 +77,7 @@ pre-commit-lib.run {
     a-enforce-exec = {
       enable = true;
       name = "Enforce Shell Script executable";
-      entry = "${packages.coreutils}/bin/chmod +x";
+      entry = "${packages.atomiutils}/bin/chmod +x";
       files = ".*sh$";
       language = "system";
       pass_filenames = true;
@@ -89,7 +89,7 @@ pre-commit-lib.run {
     a-hadolint = {
       enable = true;
       name = "Docker Linter";
-      entry = "${packages.hadolint}/bin/hadolint";
+      entry = "${packages.infralint}/bin/hadolint";
       files = ".*Dockerfile$";
       language = "system";
       pass_filenames = true;
@@ -98,7 +98,7 @@ pre-commit-lib.run {
     a-helm-docs = {
       enable = true;
       name = "Helm Docs";
-      entry = "${packages.helm-docs}/bin/helm-docs";
+      entry = "${packages.infralint}/bin/helm-docs";
       files = ".*";
       language = "system";
       pass_filenames = false;

diff --git a/templates/normal/standard/nix/env.nix b/templates/normal/standard/nix/env.nix
@@ -2,13 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    bash
-    jq
-    yq
+    atomiutils
   ];
 
   dev = [