feat: use atomiutils

AtomiCloud · Jan 29, 2025 · cc963c8 · cc963c8
1 parent 44bbdc5
commit cc963c8
Show file tree

Hide file tree

Showing 8 changed files with 443 additions and 2,946 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,7 @@
     # registry
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nixpkgs-2411.url = "nixpkgs/nixos-24.11";
-    atomipkgs.url = "github:AtomiCloud/nix-registry/v1.0.0";
+    atomipkgs.url = "github:AtomiCloud/nix-registry/v1";
 
   };
   outputs =

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 = [

diff --git a/nix/packages.nix b/nix/packages.nix
@@ -6,6 +6,7 @@ let
       with atomi;
       {
         inherit
+          atomiutils
           pls;
       }
     );
@@ -16,16 +17,7 @@ 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/template/nix/env.nix b/template/nix/env.nix
@@ -2,16 +2,8 @@
 with packages;
 {
   system = [
-    coreutils
-    findutils
-    gnugrep
-    gnused
-    bash
-    jq
-    yq
-    curl
+    atomiutils
     xmlstarlet
-    bc
   ];
 
   dev = [

diff --git a/template/nix/packages.nix b/template/nix/packages.nix
@@ -5,6 +5,7 @@ let
       with atomi;
       {
         inherit
+          atomiutils
           sg
           pls;
       }
@@ -17,28 +18,15 @@ let
       with pkgs-2411;
       {
 
-        yq = yq-go;
         dotnet = dotnet-sdk_9;
         jdk = zulu17;
 
         inherit
-
-          # standard
-          coreutils
-          findutils
-          gnugrep
-          gnused
-          gcc
-          jq
-          bash
-          bc
+          xmlstarlet
 
           git
-          curl
           infisical
 
-          xmlstarlet
-
           treefmt
           gitlint
           shellcheck

diff --git a/template/nix/pre-commit.nix b/template/nix/pre-commit.nix
@@ -87,7 +87,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;