build(treewide): Update flake and shell library

1 files changed, 13 insertions, 20 deletions

diff --git a/hm/soispha/pkgs/scripts.nix b/hm/soispha/pkgs/scripts.nix
index c425e9df..944787c7 100644
--- a/hm/soispha/pkgs/scripts.nix
+++ b/hm/soispha/pkgs/scripts.nix
@@ -12,21 +12,12 @@
     keep_path ? false,
     completions ? false,
   }:
-    if keep_path
-    then
-      sysLib.writeShellScriptWithLibraryAndKeepPath {
-        inherit name;
-        src = ./scripts/${path}/${name};
-        dependencies = dependencies ++ [pkgs.dash];
-        generateCompletions = completions;
-      }
-    else
-      sysLib.writeShellScriptWithLibrary {
-        inherit name;
-        src = ./scripts/${path}/${name};
-        dependencies = dependencies ++ [pkgs.dash];
-        generateCompletions = completions;
-      };
+    sysLib.writeShellScript {
+      inherit name keep_path;
+      src = ./scripts/${path}/${name};
+      dependencies = dependencies ++ [pkgs.dash];
+      generateCompletions = completions;
+    };
   write_python = {
     name,
     path,
@@ -57,7 +48,7 @@
     path = "apps";
     dependencies = builtins.attrValues {inherit (pkgs) udisks gawk gnused gnugrep sudo;};
   };
-  con2pdf-scr = sysLib.writeShellScriptWithLibrary {
+  con2pdf-scr = sysLib.writeShellScript {
     name = "con2pdf";
     src = ./scripts/apps/con2pdf;
     dependencies = builtins.attrValues {inherit (pkgs) sane-backends imagemagick coreutils fd;};
@@ -82,7 +73,7 @@
       inherit (pkgs) jq fmt less locale;
     };
   };
-  filter-comments-scr = sysLib.writeShellScriptWithLibrary {
+  filter-comments-scr = sysLib.writeShellScript {
     name = "comments";
     src = ./scripts/specific/ytcc/filter_comments.sh;
     dependencies = with pkgs; [jq fmt less locale] ++ [nest_comments-scr];
@@ -111,9 +102,10 @@
     path = "small_functions";
     dependencies = builtins.attrValues {inherit (pkgs) grim slurp wl-clipboard;};
   };
-  neorg-scr = sysLib.writeShellScriptWithLibraryAndKeepPath {
+  neorg-scr = sysLib.writeShellScript {
     name = "neorg";
     src = ./scripts/specific/neorg/neorg;
+    keep_path = true;
     dependencies = with pkgs; [
       cocogitto
       git-crypt
@@ -129,7 +121,7 @@
       ALL_PROJECTS_COMMA = "${config.soispha.taskwarrior.projects.projects_comma}";
       ALL_PROJECTS_PIPE = "${config.soispha.taskwarrior.projects.projects_pipe}";
       ALL_WORKSPACES = "${lib.strings.concatStringsSep "|" (builtins.attrNames config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces)}";
-      ID_GENERATION_FUNCTION = "${sysLib.writeShellScriptWithLibrary {
+      ID_GENERATION_FUNCTION = "${sysLib.writeShellScript {
         name = "neorg_id_function";
         src = ./scripts/specific/neorg/neorg_id_function.sh;
         dependencies = with pkgs; [
@@ -184,9 +176,10 @@
         ;
     };
   };
-  ll-scr = sysLib.writeShellScriptWithLibraryUnwrapped {
+  ll-scr = sysLib.writeShellScript {
     name = "ll";
     src = ./scripts/wrappers/ll;
+    wrap = false;
   };
   # TODO: this need to be replaced with a wayland alternative
   #  llp-scr = write_shell {