flake

commit 39842fab198c777dc31bb1f08dec3c2f87cbb05c
parent 517e656b1fc8a7fdae7e660125426f8b77c6d1a6
Author: Francesco Saccone <francesco@francescosaccone.com>
Date:   Wed, 19 Mar 2025 17:21:28 +0100

refactor: replace every instance on GNU coreutils with sbase

Signed-off-by: Francesco Saccone <francesco@francescosaccone.com>

Diffstat:
M
modules/home/amfora/default.nix
 | 
2
+-
M
modules/home/gpg/default.nix
 | 
2
+-
M
modules/nixos/agate/default.nix
 | 
10
+++++-----
M
modules/nixos/darkhttpd/default.nix
 | 
10
+++++-----
M
modules/nixos/darkhttpd/tls/default.nix
 | 
2
+-
M
modules/nixos/git/default.nix
 | 
14
+++++++-------

6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/modules/home/amfora/default.nix b/modules/home/amfora/default.nix
@@ -66,7 +66,7 @@
                     output = "${cacheDirectory}/amfora/keys/${host}";
                   in
                   ''
-                    ${pkgs.coreutils}/bin/mkdir -p ${builtins.dirOf output}
+                    ${pkgs.sbase}/bin/mkdir -p ${builtins.dirOf output}
 
                     ${pkgs.gnupg}/bin/gpg -r "${gpg.primaryKey.fingerprint}" \
                     -d ${gpgEncryptedKey} > ${output}
diff --git a/modules/home/gpg/default.nix b/modules/home/gpg/default.nix
@@ -45,6 +45,6 @@
       pinentryPackage = pkgs.pinentry-tty;
     };
 
-    home.file.".mkshrc".text = "export GPG_TTY=$(${pkgs.coreutils}/bin/tty)";
+    home.file.".mkshrc".text = "export GPG_TTY=$(${pkgs.sbase}/bin/tty)";
   };
 }
diff --git a/modules/nixos/agate/default.nix b/modules/nixos/agate/default.nix
@@ -67,20 +67,20 @@
           serviceConfig =
             let
               clean = pkgs.writeShellScriptBin "clean" ''
-                ${pkgs.coreutils}/bin/rm -rf \
+                ${pkgs.sbase}/bin/rm -rf \
                 ${config.modules.agate.directory}/*
 
-                ${pkgs.coreutils}/bin/mkdir -p \
+                ${pkgs.sbase}/bin/mkdir -p \
                 ${config.modules.agate.directory}/.certificates
               '';
               symlinks =
                 config.modules.agate.symlinks
                 |> builtins.mapAttrs (
                   name: target: ''
-                    ${pkgs.coreutils}/bin/mkdir -p \
+                    ${pkgs.sbase}/bin/mkdir -p \
                     ${config.modules.agate.directory}/${builtins.dirOf name}
 
-                    ${pkgs.coreutils}/bin/ln -sf ${target} \
+                    ${pkgs.sbase}/bin/ln -sf ${target} \
                     ${config.modules.agate.directory}/${name}
                   ''
                 )
@@ -88,7 +88,7 @@
                 |> builtins.concatStringsSep "\n"
                 |> pkgs.writeShellScriptBin "symlinks";
               permissions = pkgs.writeShellScriptBin "permissions" ''
-                ${pkgs.coreutils}/bin/chmod -R g+rwx \
+                ${pkgs.sbase}/bin/chmod -R g+rwx \
                 ${config.modules.agate.directory}
               '';
             in
diff --git a/modules/nixos/darkhttpd/default.nix b/modules/nixos/darkhttpd/default.nix
@@ -71,11 +71,11 @@
           serviceConfig =
             let
               permissions = pkgs.writeShellScriptBin "permissions" ''
-                ${pkgs.coreutils}/bin/chmod -R g+rwx \
+                ${pkgs.sbase}/bin/chmod -R g+rwx \
                 ${config.modules.darkhttpd.directory}
               '';
               clean = pkgs.writeShellScriptBin "clean" ''
-                ${pkgs.coreutils}/bin/rm -rf \
+                ${pkgs.sbase}/bin/rm -rf \
                 ${config.modules.darkhttpd.directory}/*
               '';
               symlinks =
@@ -86,13 +86,13 @@
                     inherit (config.modules.darkhttpd) directory;
                   in
                   ''
-                    ${pkgs.coreutils}/bin/mkdir -p \
+                    ${pkgs.sbase}/bin/mkdir -p \
                     ${directory}/${builtins.dirOf name}
 
-                    ${pkgs.coreutils}/bin/ln -sf ${target} \
+                    ${pkgs.sbase}/bin/ln -sf ${target} \
                     ${directory}/${name}
 
-                    ${pkgs.coreutils}/bin/chown -Rh darkhttpd:darkhttpd \
+                    ${pkgs.sbase}/bin/chown -Rh darkhttpd:darkhttpd \
                     ${directory}/${name}
                   ''
                 )
diff --git a/modules/nixos/darkhttpd/tls/default.nix b/modules/nixos/darkhttpd/tls/default.nix
@@ -47,7 +47,7 @@
         serviceConfig =
           let
             script = pkgs.writeShellScriptBin "script" ''
-              ${pkgs.coreutils}/bin/cat \
+              ${pkgs.sbase}/bin/cat \
               ${builtins.concatStringsSep " " tls.pemFiles} > \
                 /var/lib/hitch/full.pem
 
diff --git a/modules/nixos/git/default.nix b/modules/nixos/git/default.nix
@@ -112,24 +112,24 @@
                     ${pkgs.git}/bin/git init -q --bare -b master \
                     ${directory}/${name}
 
-                    ${pkgs.coreutils}/bin/echo "${description}" > \
+                    ${pkgs.sbase}/bin/echo "${description}" > \
                     ${directory}/${name}/description
 
-                    ${pkgs.coreutils}/bin/echo "${owner}" > \
+                    ${pkgs.sbase}/bin/echo "${owner}" > \
                     ${directory}/${name}/owner
 
-                    ${pkgs.coreutils}/bin/echo "git://${baseUrl}/${name}" > \
+                    ${pkgs.sbase}/bin/echo "git://${baseUrl}/${name}" > \
                     ${directory}/${name}/url
 
-                    ${pkgs.coreutils}/bin/mkdir -p ${directory}/${name}/hooks
+                    ${pkgs.sbase}/bin/mkdir -p ${directory}/${name}/hooks
 
-                    ${pkgs.coreutils}/bin/ln -sf ${hooks.preReceive} \
+                    ${pkgs.sbase}/bin/ln -sf ${hooks.preReceive} \
                     ${directory}/${name}/hooks/pre-receive
 
-                    ${pkgs.coreutils}/bin/ln -sf ${hooks.update} \
+                    ${pkgs.sbase}/bin/ln -sf ${hooks.update} \
                     ${directory}/${name}/hooks/update
 
-                    ${pkgs.coreutils}/bin/ln -sf ${hooks.postReceive} \
+                    ${pkgs.sbase}/bin/ln -sf ${hooks.postReceive} \
                     ${directory}/${name}/hooks/post-receive
                   ''
                 )