fix(treewide): Comply with the shell library's new argument names

8 files changed, 20 insertions, 21 deletions

diff --git a/bootstrap/default.nix b/bootstrap/default.nix
index 1cbff9ea..859434e1 100644
--- a/bootstrap/default.nix
+++ b/bootstrap/default.nix
@@ -27,7 +27,7 @@
     dependencies = builtins.attrValues {inherit (pkgs) git neovim;} ++ ensure_config_variables_dependencies;
     name = "config_setup";
     src = ./03_config_setup;
-    keep_path = true;
+    keepPath = true;
     inherit replacementStrings;
   };
   ensure_config_variables = sysLib.writeShellScript {
diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix
index 828b7058..098f38f5 100644
--- a/hm/soispha/conf/git/default.nix
+++ b/hm/soispha/conf/git/default.nix
@@ -11,7 +11,7 @@
   commit = sysLib.writeShellScript {
     name = "commit";
     src = ./scripts/commit;
-    keep_path = true;
+    keepPath = true;
     dependencies = with pkgs; [
       git
       gnused
diff --git a/hm/soispha/conf/lf/commands/default.nix b/hm/soispha/conf/lf/commands/default.nix
index 5d7fa3ce..14a160c6 100644
--- a/hm/soispha/conf/lf/commands/default.nix
+++ b/hm/soispha/conf/lf/commands/default.nix
@@ -15,7 +15,7 @@
     sysLib.writeShellScript {
       name = "${builtins.baseNameOf file}";
       src = file;
-      keep_path = true;
+      keepPath = true;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash coreutils;});
       inherit replacementStrings;
     }
diff --git a/hm/soispha/conf/xdg/default.nix b/hm/soispha/conf/xdg/default.nix
index 93f75887..be85f330 100644
--- a/hm/soispha/conf/xdg/default.nix
+++ b/hm/soispha/conf/xdg/default.nix
@@ -7,7 +7,7 @@
   url_handler = sysLib.writeShellScript {
     name = "url_handler";
     src = ./url_handler;
-    keep_path = true;
+    keepPath = true;
     # Naming dependencies for this will be difficult, as it depend on overridden packages.
     dependencies = with pkgs; [
       rofi
diff --git a/hm/soispha/pkgs/scripts.nix b/hm/soispha/pkgs/scripts.nix
index 5b240eae..a1eaabbd 100644
--- a/hm/soispha/pkgs/scripts.nix
+++ b/hm/soispha/pkgs/scripts.nix
@@ -9,11 +9,11 @@
     name,
     path,
     dependencies ? [],
-    keep_path ? false,
+    keepPath ? false,
     completions ? false,
   }:
     sysLib.writeShellScript {
-      inherit name keep_path;
+      inherit name keepPath;
       src = ./scripts/${path}/${name};
       dependencies = dependencies ++ [pkgs.dash];
       generateCompletions = completions;
@@ -23,14 +23,14 @@
     path,
     dependencies_system ? [],
     dependencies_python ? _: [],
-    keep_path ? false,
+    keepPath ? false,
   }: let
     src = ./scripts/${path}/${name};
     dependencies =
       [(pkgs.python3.withPackages (ps: dependencies_python ps))]
       ++ dependencies_system;
     path_setting =
-      if keep_path
+      if keepPath
       then "--prefix PATH :"
       else "--set PATH";
   in
@@ -84,7 +84,7 @@
   screenshot_persistent-scr = write_shell {
     name = "screenshot_persistent";
     path = "small_functions";
-    keep_path = true;
+    keepPath = true;
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -105,7 +105,7 @@
   show-scr = write_shell {
     name = "show";
     path = "wrappers";
-    keep_path = true; # I might want to use nvim in less (and shell escapes)
+    keepPath = true; # I might want to use nvim in less (and shell escapes)
     dependencies = builtins.attrValues {inherit (pkgs) less locale;};
   };
   nato-scr = write_python {
@@ -113,14 +113,13 @@
     path = "small_functions";
     dependencies_python = ps: [];
   };
-  neorg-scr = sysLib.writeShellScript {
+  neorg-scr = sysLib.writeShellScriptMultiPart {
     name = "neorg";
-    keep_path = true;
+    keepPath = true;
     src = ./scripts/specific/neorg/sh;
-    multi_part_base = "main";
-    multi_part = true;
-    multi_part_prefix = "functions";
-    multi_part_names = [
+    baseName = "main";
+    cmdPrefix = "functions";
+    cmdNames = [
       "add"
       "context"
       "dmenu"
@@ -173,7 +172,7 @@
   fupdate-scr = write_shell {
     name = "fupdate";
     path = "apps";
-    keep_path = true;
+    keepPath = true;
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -266,7 +265,7 @@
   yts-scr = write_shell {
     name = "yts";
     path = "specific/ytcc";
-    keep_path = true; # We need neovim
+    keepPath = true; # We need neovim
     completions = true;
     dependencies = builtins.attrValues {
       inherit (pkgs) ytcc jq gawk ytc;
diff --git a/hm/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix
index ba0725c0..3abe3753 100644
--- a/hm/soispha/wms/river/default.nix
+++ b/hm/soispha/wms/river/default.nix
@@ -51,7 +51,7 @@ in {
     sysLib.writeShellScript {
       name = "river_init";
       src = init_scr;
-      keep_path = true;
+      keepPath = true;
       dependencies = builtins.attrValues {
         river_init_lesser = river_init_lesser.packages.${system}.default;
         inherit
diff --git a/sys/svcs/nix/default.nix b/sys/svcs/nix/default.nix
index 7e5c8388..21524812 100644
--- a/sys/svcs/nix/default.nix
+++ b/sys/svcs/nix/default.nix
@@ -45,7 +45,7 @@ in {
       pure-eval = true; # restrict file system and network access to hash
 
       sandbox-fallback = false; # Don't disable the sandbox, if the kernel doesn't support
-                                # it
+      # it
     };
   };
 }
diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix
index f8e8f60f..513e7a65 100644
--- a/sys/svcs/xdg/default.nix
+++ b/sys/svcs/xdg/default.nix
@@ -16,7 +16,7 @@
             cmd = "${sysLib.writeShellScript {
               src = ./scripts/lf_wrapper;
               name = "lf_wrapper";
-              keep_path = true;
+              keepPath = true;
               dependencies = with pkgs; [
                 lf
                 alacritty