fix: incorrect package source

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

Hide file tree

Showing 13 changed files with 491 additions and 2,121 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/env.nix b/nix/env.nix
@@ -2,12 +2,7 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    jq
-    yq
+    atomiutils
   ];
 
   dev = [
@@ -25,7 +20,4 @@ with packages;
     treefmt
     shellcheck
   ];
-
-  releaser = [
-  ];
 }
diff --git a/nix/fmt.nix b/nix/fmt.nix
@@ -5,15 +5,9 @@ let
 
     # enable or disable formatters, see https://github.com/numtide/treefmt-nix#supported-programs
     programs = {
-      nixpkgs-fmt = {
-        enable = true;
-      };
-      prettier = {
-        enable = true;
-      };
-      shfmt = {
-        enable = true;
-      };
+      nixpkgs-fmt.enable = true;
+      prettier.enable = true;
+      shfmt.enable = true;
     };
 
 

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -6,6 +6,7 @@ let
       with atomi;
       {
         inherit
+          atomiutils
           pls;
       }
     );
@@ -16,16 +17,8 @@ let
     nix-2411 = (
       with pkgs-2411;
       {
-        yq = yq-go;
 
         inherit
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          jq
-
-
           git
 
           infisical

diff --git a/nix/pre-commit.nix b/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/nix/shells.nix b/nix/shells.nix
@@ -5,12 +5,4 @@ with env;
     buildInputs = system ++ main ++ dev ++ lint;
     inherit shellHook;
   };
-  ci = pkgs.mkShell {
-    buildInputs = system ++ main ++ lint;
-    inherit shellHook;
-  };
-  releaser = pkgs.mkShell {
-    buildInputs = system ++ main ++ lint ++ releaser;
-    inherit shellHook;
-  };
 }
diff --git a/templates/bun/nix/packages.nix b/templates/bun/nix/packages.nix
@@ -5,6 +5,16 @@ let
       with atomi;
       {
         inherit
+          /*
+          <%= if (infra) { %>
+          */
+          #infra
+          infrautils
+          infralint
+          /*
+          <%= } %>
+          */
+          atomiutils
           sg
           pls;
       }
@@ -18,10 +28,7 @@ let
       {
 
         inherit
-
           # standard
-          atomiutils
-
           git
           infisical
 
@@ -31,16 +38,6 @@ let
 
           # language
           bun
-
-          /*
-          <%= if (infra) { %>
-          */
-          #infra
-          infrautils
-          infralint
-          /*
-          <%= } %>
-          */
           ;
       }
     );

diff --git a/templates/cyanprint-bun/nix/env.nix b/templates/cyanprint-bun/nix/env.nix
@@ -20,7 +20,4 @@ with packages;
     treefmt
     shellcheck
   ];
-
-  releaser = [
-  ];
 }
diff --git a/templates/cyanprint-bun/nix/packages.nix b/templates/cyanprint-bun/nix/packages.nix
@@ -6,6 +6,7 @@ let
       with atomi;
       {
         inherit
+          atomiutils
           pls;
       }
     );
@@ -18,7 +19,6 @@ let
       {
 
         inherit
-          atomiutils
 
           git
 

diff --git a/templates/cyanprint-bun/nix/shells.nix b/templates/cyanprint-bun/nix/shells.nix
@@ -5,12 +5,4 @@ with env;
     buildInputs = system ++ main ++ dev ++ lint;
     inherit shellHook;
   };
-  ci = pkgs.mkShell {
-    buildInputs = system ++ main ++ lint;
-    inherit shellHook;
-  };
-  releaser = pkgs.mkShell {
-    buildInputs = system ++ main ++ lint ++ releaser;
-    inherit shellHook;
-  };
 }
diff --git a/templates/dotnet/nix/packages.nix b/templates/dotnet/nix/packages.nix
@@ -5,6 +5,17 @@ let
       with atomi;
       {
         inherit
+
+          /*
+          <%= if (infra) { %>
+          */
+          #infra
+          infrautils
+          infralint
+          /*
+          <%= } %>
+          */
+          atomiutils
           sg
           pls;
       }
@@ -20,24 +31,12 @@ let
         inherit
 
           # standard
-          atomiutils
-
           git
           infisical
 
           treefmt
           gitlint
           shellcheck
-
-          /*
-          <%= if (infra) { %>
-          */
-          #infra
-          infrautils
-          infralint
-          /*
-          <%= } %>
-          */
           ;
       }
     );

diff --git a/templates/go/nix/packages.nix b/templates/go/nix/packages.nix
@@ -5,6 +5,17 @@ let
       with atomi;
       {
         inherit
+
+          /*
+          <%= if (infra) { %>
+          */
+          #infra
+          infrautils
+          infralint
+          /*
+          <%= } %>
+          */
+          atomiutils
           sg
           pls;
       }
@@ -19,8 +30,6 @@ let
         inherit
 
           # standard
-          atomiutils
-
           git
           infisical
 
@@ -33,16 +42,6 @@ let
           go
           golangci-lint
           air
-
-          /*
-          <%= if (infra) { %>
-          */
-          #infra
-          infrautils
-          infralint
-          /*
-          <%= } %>
-          */
           ;
       }
     );

diff --git a/templates/normal/standard/nix/packages.nix b/templates/normal/standard/nix/packages.nix
@@ -6,6 +6,7 @@ let
       with atomi;
       {
         inherit
+          atomiutils
           sg
           pls;
       }
@@ -17,9 +18,7 @@ let
     nix-2411 = (
       with pkgs-2411;
       {
-        yq = yq-go;
         inherit
-          atomiutils
           git
           infisical
           treefmt
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,4 @@ with packages; @@
         treefmt
         shellcheck
       ];
-      releaser = [
-      ];
     }