51 files changed, 406 insertions, 372 deletions
diff --git a/flake.lock b/flake.lock
index 6dce546b..ef3a4b18 100644
--- a/flake.lock
+++ b/flake.lock
@@ -172,15 +172,12 @@
     "flake_version_update": {
       "inputs": {
         "flake-utils": [
-          "shell_library",
           "flake-utils"
         ],
         "nixpkgs": [
-          "shell_library",
           "nixpkgs"
         ],
         "systems": [
-          "shell_library",
           "systems"
         ]
       },
@@ -638,6 +635,7 @@
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
+        "flake_version_update": "flake_version_update",
         "generate_firefox_extensions": "generate_firefox_extensions",
         "gitignore": "gitignore",
         "haumea": "haumea",
@@ -673,11 +671,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1708654230,
-        "narHash": "sha256-f8B3nm0DIsWBmaLHvFvjJnqvFsEEoHxTjE9or5w4nIo=",
+        "lastModified": 1708740535,
+        "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "67853eda5dfe64922b9deb0ebc246a846fe177c7",
+        "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af",
         "type": "github"
       },
       "original": {
@@ -726,7 +724,9 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "flake_version_update": "flake_version_update",
+        "flake_version_update": [
+          "flake_version_update"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -735,11 +735,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705180069,
-        "narHash": "sha256-kEdWgKIL2wGY7jBYX9Z+YX67bQc+oKLkgnxBkHjji+M=",
+        "lastModified": 1708780295,
+        "narHash": "sha256-ZL4lwJeKNjmvm/mg3KRy3+OyUYxZTl1eJNRmEqHzNhQ=",
         "ref": "refs/heads/prime",
-        "rev": "d2bc174f248de40ab76068e6ad502a785be0b074",
-        "revCount": 168,
+        "rev": "3faa1f33598be74ca1bdad621c5b66d153be0e3d",
+        "revCount": 175,
         "type": "git",
         "url": "https://codeberg.org/soispha/shell_library.git"
       },
diff --git a/flake.nix b/flake.nix
index fed79c78..9a504a4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -250,6 +250,8 @@
     pkgs = import nixpkgs (import ./sys/nixpkgs {
       inherit (nixpkgs) lib;
       inherit system sysLib;
+      # FIXME: Don't unconditionally use tiamat here <2024-02-24>
+      config = self.nixosConfigurations.tiamat.config.home-manager.users.soispha;
       overlays = [];
     });
     # FIXME: this `nixpkgs` misses the configs applied to the other one
diff --git a/flake/default.nix b/flake/default.nix
index bbf9044e..185286eb 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -140,7 +140,7 @@
       };
     }
   );
-in {
+
   nixosConfigurations = import ./nixosConfigurations {
     inherit
       system
@@ -152,7 +152,8 @@ in {
       defaultSpecialArgs
       ;
   };
-  inherit pkgs;
+in {
+  inherit pkgs nixosConfigurations;
   checks."${system}" = {
     inherit
       (self.packages."${system}")
diff --git a/hm/soispha/pkgs/default.nix b/hm/soispha/pkgs/default.nix
index 4aa5a48c..1c1df7a8 100644
--- a/hm/soispha/pkgs/default.nix
+++ b/hm/soispha/pkgs/default.nix
@@ -1,8 +1,6 @@
 {
   pkgs,
   lib,
-  sysLib,
-  config,
   ...
 }:
 with pkgs; let
@@ -13,8 +11,6 @@ with pkgs; let
     '';
   mpc-cli-man = onlyShare mpc-cli;
 
-  shell-scripts = (import ./scripts.nix) {inherit pkgs lib sysLib config;};
-
   Gui = {
     Terminals = [
       # foot # wayland native terminal
@@ -48,6 +44,32 @@ with pkgs; let
   };
 
   TuiCli = {
+    ShellScripts = [
+      aumo
+      battery
+      con2pdf
+      description
+      fupdate
+      git-edit-index
+      hibernate
+      ll
+      lock
+      lyrics
+      mpc-fav
+      mpc-rm
+      mpc
+      nato
+      neorg
+      screenshot_persistent
+      screenshot_temporary
+      show
+      sort_song
+      spodi
+      update-sys
+      virsh-del
+      yti
+    ];
+
     EyeCandy = [
       #banner # Print large banners to ASCII terminals
       cmatrix # A curses-based scrolling 'Matrix'-like screen
@@ -147,7 +169,6 @@ with pkgs; let
 in {
   home.packages =
     []
-    ++ shell-scripts
     ++ (with builtins;
       concatLists
       (concatLists [
diff --git a/hm/soispha/pkgs/scripts.nix b/hm/soispha/pkgs/scripts.nix
deleted file mode 100644
index 9fb2d2be..00000000
--- a/hm/soispha/pkgs/scripts.nix
+++ /dev/null
@@ -1,347 +0,0 @@
-{
-  pkgs,
-  lib,
-  sysLib,
-  config,
-  ...
-}: let
-  write_shell = {
-    name,
-    path,
-    dependencies ? [],
-    keepPath ? false,
-    completions ? false,
-  }:
-    sysLib.writeShellScript {
-      inherit name keepPath;
-      src = ./scripts/${path}/${name}.sh;
-      dependencies = dependencies ++ [pkgs.dash];
-      generateCompletions = completions;
-    };
-  write_python = {
-    name,
-    path,
-    dependencies_system ? [],
-    dependencies_python ? _: [],
-    keepPath ? false,
-  }: let
-    src = ./scripts/${path}/${name}.py;
-    dependencies =
-      [(pkgs.python3.withPackages dependencies_python)]
-      ++ dependencies_system;
-    path_setting =
-      if keepPath
-      then "--prefix PATH :"
-      else "--set PATH";
-  in
-    pkgs.runCommandLocal name {
-      nativeBuildInputs = [pkgs.makeWrapper] ++ dependencies;
-    }
-    ''
-      install -m755 ${src} -D "$out/bin/${name}"
-      patchShebangs "$out/bin/${name}"
-      wrapProgram "$out/bin/${name}" ${path_setting} ${pkgs.lib.makeBinPath dependencies};
-    '';
-
-  ## Begin of shell scripts
-
-  aumo-scr = write_shell {
-    name = "aumo";
-    path = "apps";
-    dependencies = builtins.attrValues {inherit (pkgs) udisks gawk gnused gnugrep sudo;};
-  };
-
-  battery-scr = write_shell {
-    name = "battery";
-    path = "wrappers";
-    dependencies = [];
-  };
-
-  con2pdf-scr = sysLib.writeShellScript {
-    name = "con2pdf";
-    src = ./scripts/apps/con2pdf.sh;
-    dependencies = builtins.attrValues {inherit (pkgs) sane-backends imagemagick coreutils fd;};
-    generateCompletions = true;
-    replacementStrings = {
-      DEVICE_FUNCTION =
-        # This is here, because escaping the whole function, to use it in the shell script
-        # directly just isn't possible
-        pkgs.writeText "DEVICE_FUNCTION"
-        /*
-        bash
-        */
-        ''
-          scanimage -L | awk 'BEGIN { FS = "`" } { gsub(/'.*/, "", $2); print $2 }'
-        '';
-    };
-  };
-
-  description-scr = write_shell {
-    name = "description";
-    path = "specific/ytcc";
-    dependencies = builtins.attrValues {
-      inherit (pkgs) jq fmt less locale;
-    };
-  };
-
-  fupdate-scr = write_shell {
-    name = "fupdate";
-    path = "apps";
-    keepPath = true;
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        dash
-        nix
-        gnugrep
-        fd
-        coreutils
-        bat # used by batgrep
-        gnused # required by batgrep
-        git # needed to fetch through git
-        git-crypt # needed to unlock git-crypted repos
-        ;
-      inherit (pkgs.bat-extras) batgrep;
-    };
-  };
-
-  git-edit-index-scr = write_shell {
-    name = "git-edit-index";
-    path = "apps";
-    completions = true;
-    # This starts neovim, wich might want to shell out
-    keepPath = true;
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        git
-        gnused
-        # $EDITOR
-        
-        ;
-    };
-  };
-
-  hibernate-scr = write_shell {
-    name = "hibernate";
-    path = "wrappers";
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        systemd
-        taskwarrior
-        ;
-    };
-  };
-
-  ll-scr = sysLib.writeShellScript {
-    name = "ll";
-    src = ./scripts/wrappers/ll.sh;
-    wrap = false;
-  };
-
-  # TODO: this need to be replaced with a wayland alternative
-  #  llp-scr = write_shell {
-  #     name = "llp";
-  #     path = "wrappers";
-  #     dependencies = builtins.attrValues {inherit (pkgs) lf ueberzug;};
-  #   };
-
-  lock-scr = write_shell {
-    name = "lock";
-    path = "wrappers";
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        taskwarrior
-        swaylock
-        ;
-    };
-  };
-
-  lyrics-scr = write_shell {
-    name = "lyrics";
-    path = "wrappers";
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        exiftool
-        mpc-cli
-        jq
-        less
-        locale # dependency of less
-        ;
-    };
-  };
-
-  mpc-fav-scr = write_shell {
-    name = "mpc-fav";
-    path = "wrappers";
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        mpc-cli
-        ;
-    };
-  };
-
-  mpc-rm-scr = write_shell {
-    name = "mpc-rm";
-    path = "wrappers";
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        mpc-cli
-        trash-cli
-        ;
-    };
-  };
-
-  mpc-scr = write_shell {
-    name = "mpc";
-    path = "wrappers";
-    dependencies = [
-      mpc-fav-scr
-      mpc-rm-scr
-      pkgs.mpc-cli
-    ];
-  };
-
-  nato-scr = write_python {
-    name = "nato";
-    path = "small_functions";
-    dependencies_python = ps: [];
-  };
-
-  neorg-scr = sysLib.writeShellScriptMultiPart {
-    name = "neorg";
-    keepPath = true;
-    src = ./scripts/specific/neorg/sh;
-    baseName = "main.sh";
-    cmdPrefix = "functions";
-    cmdNames = [
-      "add.sh"
-      "context.sh"
-      "dmenu.sh"
-      "f_start.sh"
-      "f_stop.sh"
-      "list.sh"
-      "project.sh"
-      "utils.sh"
-      "workspace.sh"
-    ];
-    dependencies = with pkgs; [
-      cocogitto
-      git-crypt
-      rofi
-      libnotify
-    ];
-    generateCompletions = true;
-    replacementStrings = {
-      DEFAULT_NEORG_PROJECT_DIR =
-        config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects;
-      HOME_TASKRC = "${config.xdg.configHome}/task/home-manager-taskrc";
-      ALL_PROJECTS_NEWLINE = "${config.soispha.taskwarrior.projects.projects_newline}";
-      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.writeShellScript {
-        name = "neorg_id_function";
-        src = ./scripts/specific/neorg/neorg_id_function.sh;
-        dependencies = with pkgs; [
-          taskwarrior
-          gawk
-          findutils # xargs
-        ];
-      }}/bin/neorg_id_function";
-
-      # TODO: Replace the hard-coded path here with some reference <2023-10-20>
-      TASK_PROJECT_FILE = "/home/soispha/repos/nix/nixos-config/hm/soispha/conf/taskwarrior/projects/default.nix";
-    };
-  };
-
-  screenshot_persistent-scr = write_shell {
-    name = "screenshot_persistent";
-    path = "small_functions";
-    keepPath = true;
-    dependencies = builtins.attrValues {
-      inherit
-        (pkgs)
-        grim
-        slurp
-        alacritty
-        rofi
-        libnotify
-        lf # TODO: add llp
-        ;
-    };
-  };
-
-  screenshot_temporary-scr = write_shell {
-    name = "screenshot_temporary";
-    path = "small_functions";
-    dependencies = builtins.attrValues {inherit (pkgs) grim slurp wl-clipboard;};
-  };
-
-  show-scr = write_shell {
-    name = "show";
-    path = "wrappers";
-    keepPath = true; # I might want to use nvim in less (and shell escapes)
-    dependencies = builtins.attrValues {inherit (pkgs) less locale;};
-  };
-
-  sort_song-src = write_shell {
-    name = "sort_song";
-    path = "wrappers";
-    dependencies = builtins.attrValues {inherit (pkgs) mediainfo jq gawk;};
-  };
-
-  spodi-scr = write_shell {
-    name = "spodi";
-    path = "wrappers";
-    dependencies = builtins.attrValues {inherit (pkgs) gawk expect spotdl fd coreutils;};
-  };
-
-  update-sys-scr = write_shell {
-    name = "update-sys";
-    path = "small_functions";
-    dependencies = builtins.attrValues {inherit (pkgs) git git-crypt nixos-rebuild sudo openssh coreutils mktemp gnugrep gnused;};
-  };
-
-  virsh-del-scr = write_shell {
-    name = "virsh-del";
-    path = "wrappers";
-    dependencies = builtins.attrValues {inherit (pkgs) libvirt;};
-  };
-
-  yti-scr = write_shell {
-    name = "yti";
-    path = "wrappers";
-    dependencies = builtins.attrValues {inherit (pkgs) gawk expect yt-dlp;};
-  };
-in [
-  # llp-scr # TODO: see above
-  aumo-scr
-  battery-scr
-  con2pdf-scr
-  description-scr
-  fupdate-scr
-  git-edit-index-scr
-  hibernate-scr
-  ll-scr
-  lock-scr
-  lyrics-scr
-  mpc-fav-scr
-  mpc-rm-scr
-  mpc-scr
-  nato-scr
-  neorg-scr
-  screenshot_persistent-scr
-  screenshot_temporary-scr
-  show-scr
-  sort_song-src
-  spodi-scr
-  update-sys-scr
-  virsh-del-scr
-  yti-scr
-]
diff --git a/sys/nixpkgs/default.nix b/sys/nixpkgs/default.nix
index 85fccbce..7862faa2 100644
--- a/sys/nixpkgs/default.nix
+++ b/sys/nixpkgs/default.nix
@@ -3,8 +3,9 @@
   system,
   overlays ? [],
   sysLib,
+  config,
 }: let
-  additionalPackages = (import ./pkgs) {inherit sysLib;};
+  additionalPackages = (import ./pkgs) {inherit config sysLib;};
   complete_overlays = overlays ++ additionalPackages;
 in {
   # TODO: inheriting system here is discouraged, localSystem or hostSystem should be inspected
diff --git a/sys/nixpkgs/pkgs/default.nix b/sys/nixpkgs/pkgs/default.nix
index 25bb746a..c5959bb4 100644
--- a/sys/nixpkgs/pkgs/default.nix
+++ b/sys/nixpkgs/pkgs/default.nix
@@ -1,16 +1,22 @@
-{sysLib}: let
-  snap-sync-forked = (import ./snap-sync-forked) {inherit sysLib;};
+{
+  config,
+  sysLib,
+}: let
+  comments = import ./comments;
   nvim_plugs = import ./plgs-pkgs;
+  scripts = import ./scripts {inherit sysLib config;};
+  snap-sync-forked = (import ./snap-sync-forked) {inherit sysLib;};
   update_vim_plugins = import ./update_vim_plugins;
   yt = import ./yt;
-  comments = import ./comments;
   yts-grammar = import ./tree-sitter-yts;
+
   overlays =
-    snap-sync-forked
+    comments
     ++ nvim_plugs
+    ++ scripts
+    ++ snap-sync-forked
     ++ update_vim_plugins
     ++ yt
-    ++ yts-grammar
-    ++ comments;
+    ++ yts-grammar;
 in
   overlays
diff --git a/sys/nixpkgs/pkgs/scripts/default.nix b/sys/nixpkgs/pkgs/scripts/default.nix
new file mode 100644
index 00000000..faa546c7
--- /dev/null
+++ b/sys/nixpkgs/pkgs/scripts/default.nix
@@ -0,0 +1,350 @@
+{
+  sysLib,
+  config,
+}: [
+  (
+    final: prev: let
+      inherit (prev) lib;
+
+      write_shell = {
+        name,
+        path,
+        dependencies ? [],
+        keepPath ? false,
+        completions ? false,
+      }:
+        sysLib.writeShellScript {
+          inherit name keepPath;
+          src = ./source/${path}/${name}.sh;
+          dependencies = dependencies ++ [prev.dash];
+          generateCompletions = completions;
+        };
+      write_python = {
+        name,
+        path,
+        dependencies_system ? [],
+        dependencies_python ? _: [],
+        keepPath ? false,
+      }: let
+        src = ./source/${path}/${name}.py;
+        dependencies =
+          [(prev.python3.withPackages dependencies_python)]
+          ++ dependencies_system;
+        path_setting =
+          if keepPath
+          then "--prefix PATH :"
+          else "--set PATH";
+      in
+        prev.runCommandLocal name {
+          nativeBuildInputs = [prev.makeWrapper] ++ dependencies;
+        }
+        ''
+          install -m755 ${src} -D "$out/bin/${name}"
+          patchShebangs "$out/bin/${name}"
+          wrapProgram "$out/bin/${name}" ${path_setting} ${prev.lib.makeBinPath dependencies};
+        '';
+
+      ## Begin of shell scripts
+
+      aumo-scr = write_shell {
+        name = "aumo";
+        path = "apps";
+        dependencies = builtins.attrValues {inherit (prev) udisks gawk gnused gnugrep sudo;};
+      };
+
+      battery-scr = write_shell {
+        name = "battery";
+        path = "wrappers";
+        dependencies = [];
+      };
+
+      con2pdf-scr = sysLib.writeShellScript {
+        name = "con2pdf";
+        src = ./source/apps/con2pdf.sh;
+        dependencies = builtins.attrValues {inherit (prev) sane-backends imagemagick coreutils fd;};
+        generateCompletions = true;
+        replacementStrings = {
+          DEVICE_FUNCTION =
+            # This is here, because escaping the whole function, to use it in the shell script
+            # directly just isn't possible
+            prev.writeText "DEVICE_FUNCTION"
+            /*
+            bash
+            */
+            ''
+              scanimage -L | awk 'BEGIN { FS = "`" } { gsub(/'.*/, "", $2); print $2 }'
+            '';
+        };
+      };
+
+      description-scr = write_shell {
+        name = "description";
+        path = "specific/ytcc";
+        dependencies = builtins.attrValues {
+          inherit (prev) jq fmt less locale;
+        };
+      };
+
+      fupdate-scr = write_shell {
+        name = "fupdate";
+        path = "apps";
+        keepPath = true;
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            dash
+            nix
+            gnugrep
+            fd
+            coreutils
+            bat # used by batgrep
+            gnused # required by batgrep
+            git # needed to fetch through git
+            git-crypt # needed to unlock git-crypted repos
+            ;
+          inherit (prev.bat-extras) batgrep;
+        };
+      };
+
+      git-edit-index-scr = write_shell {
+        name = "git-edit-index";
+        path = "apps";
+        completions = true;
+        # This starts neovim, wich might want to shell out
+        keepPath = true;
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            git
+            gnused
+            # $EDITOR
+            
+            ;
+        };
+      };
+
+      hibernate-scr = write_shell {
+        name = "hibernate";
+        path = "wrappers";
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            systemd
+            taskwarrior
+            ;
+        };
+      };
+
+      ll-scr = sysLib.writeShellScript {
+        name = "ll";
+        src = ./source/wrappers/ll.sh;
+        wrap = false;
+      };
+
+      # TODO: this need to be replaced with a wayland alternative
+      #  llp-scr = write_shell {
+      #     name = "llp";
+      #     path = "wrappers";
+      #     dependencies = builtins.attrValues {inherit (prev) lf ueberzug;};
+      #   };
+
+      lock-scr = write_shell {
+        name = "lock";
+        path = "wrappers";
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            taskwarrior
+            swaylock
+            ;
+        };
+      };
+
+      lyrics-scr = write_shell {
+        name = "lyrics";
+        path = "wrappers";
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            exiftool
+            mpc-cli
+            jq
+            less
+            locale # dependency of less
+            ;
+        };
+      };
+
+      mpc-fav-scr = write_shell {
+        name = "mpc-fav";
+        path = "wrappers";
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            mpc-cli
+            ;
+        };
+      };
+
+      mpc-rm-scr = write_shell {
+        name = "mpc-rm";
+        path = "wrappers";
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            mpc-cli
+            trash-cli
+            ;
+        };
+      };
+
+      mpc-scr = write_shell {
+        name = "mpc";
+        path = "wrappers";
+        dependencies = [
+          mpc-fav-scr
+          mpc-rm-scr
+          prev.mpc-cli
+        ];
+      };
+
+      nato-scr = write_python {
+        name = "nato";
+        path = "small_functions";
+        dependencies_python = ps: [];
+      };
+
+      neorg-scr = sysLib.writeShellScriptMultiPart {
+        name = "neorg";
+        keepPath = true;
+        src = ./source/specific/neorg/sh;
+        baseName = "main.sh";
+        cmdPrefix = "functions";
+        cmdNames = [
+          "add.sh"
+          "context.sh"
+          "dmenu.sh"
+          "f_start.sh"
+          "f_stop.sh"
+          "list.sh"
+          "project.sh"
+          "utils.sh"
+          "workspace.sh"
+        ];
+        dependencies = with prev; [
+          cocogitto
+          git-crypt
+          rofi
+          libnotify
+        ];
+        generateCompletions = true;
+        replacementStrings = {
+          DEFAULT_NEORG_PROJECT_DIR =
+            config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects;
+          HOME_TASKRC = "${config.xdg.configHome}/task/home-manager-taskrc";
+          ALL_PROJECTS_NEWLINE = "${config.soispha.taskwarrior.projects.projects_newline}";
+          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.writeShellScript {
+            name = "neorg_id_function";
+            src = ./source/specific/neorg/neorg_id_function.sh;
+            dependencies = with prev; [
+              taskwarrior
+              gawk
+              findutils # xargs
+            ];
+          }}/bin/neorg_id_function";
+
+          # TODO: Replace the hard-coded path here with some reference <2023-10-20>
+          TASK_PROJECT_FILE = "/home/soispha/repos/nix/nixos-config/hm/soispha/conf/taskwarrior/projects/default.nix";
+        };
+      };
+
+      screenshot_persistent-scr = write_shell {
+        name = "screenshot_persistent";
+        path = "small_functions";
+        keepPath = true;
+        dependencies = builtins.attrValues {
+          inherit
+            (prev)
+            grim
+            slurp
+            alacritty
+            rofi
+            libnotify
+            lf # TODO: add llp
+            ;
+        };
+      };
+
+      screenshot_temporary-scr = write_shell {
+        name = "screenshot_temporary";
+        path = "small_functions";
+        dependencies = builtins.attrValues {inherit (prev) grim slurp wl-clipboard;};
+      };
+
+      show-scr = write_shell {
+        name = "show";
+        path = "wrappers";
+        keepPath = true; # I might want to use nvim in less (and shell escapes)
+        dependencies = builtins.attrValues {inherit (prev) less locale;};
+      };
+
+      sort_song-scr = write_shell {
+        name = "sort_song";
+        path = "wrappers";
+        dependencies = builtins.attrValues {inherit (prev) mediainfo jq gawk;};
+      };
+
+      spodi-scr = write_shell {
+        name = "spodi";
+        path = "wrappers";
+        dependencies = builtins.attrValues {inherit (prev) gawk expect spotdl fd coreutils;};
+      };
+
+      update-sys-scr = write_shell {
+        name = "update-sys";
+        path = "small_functions";
+        dependencies = builtins.attrValues {inherit (prev) git git-crypt nixos-rebuild sudo openssh coreutils mktemp gnugrep gnused;};
+      };
+
+      virsh-del-scr = write_shell {
+        name = "virsh-del";
+        path = "wrappers";
+        dependencies = builtins.attrValues {inherit (prev) libvirt;};
+      };
+
+      yti-scr = write_shell {
+        name = "yti";
+        path = "wrappers";
+        dependencies = builtins.attrValues {inherit (prev) gawk expect yt-dlp;};
+      };
+    in {
+      # llp = llp-scr; # TODO: see above
+      aumo = aumo-scr;
+      battery = battery-scr;
+      con2pdf = con2pdf-scr;
+      description = description-scr;
+      fupdate = fupdate-scr;
+      git-edit-index = git-edit-index-scr;
+      hibernate = hibernate-scr;
+      ll = ll-scr;
+      lock = lock-scr;
+      lyrics = lyrics-scr;
+      mpc-fav = mpc-fav-scr;
+      mpc-rm = mpc-rm-scr;
+      mpc = mpc-scr;
+      nato = nato-scr;
+      neorg = neorg-scr;
+      screenshot_persistent = screenshot_persistent-scr;
+      screenshot_temporary = screenshot_temporary-scr;
+      show = show-scr;
+      sort_song = sort_song-scr;
+      spodi = spodi-scr;
+      update-sys = update-sys-scr;
+      virsh-del = virsh-del-scr;
+      yti = yti-scr;
+    }
+  )
+]
diff --git a/hm/soispha/pkgs/scripts/apps/aumo.sh b/sys/nixpkgs/pkgs/scripts/source/apps/aumo.sh
index 7426115a..7426115a 100755
--- a/hm/soispha/pkgs/scripts/apps/aumo.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/apps/aumo.sh
diff --git a/hm/soispha/pkgs/scripts/apps/con2pdf.sh b/sys/nixpkgs/pkgs/scripts/source/apps/con2pdf.sh
index 620a299a..620a299a 100755
--- a/hm/soispha/pkgs/scripts/apps/con2pdf.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/apps/con2pdf.sh
diff --git a/hm/soispha/pkgs/scripts/apps/fupdate.1.md b/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.1.md
index 710e8fb7..710e8fb7 100644
--- a/hm/soispha/pkgs/scripts/apps/fupdate.1.md
+++ b/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.1.md
diff --git a/hm/soispha/pkgs/scripts/apps/fupdate.sh b/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.sh
index 0032be4b..0032be4b 100755
--- a/hm/soispha/pkgs/scripts/apps/fupdate.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.sh
diff --git a/hm/soispha/pkgs/scripts/apps/git-edit-index.sh b/sys/nixpkgs/pkgs/scripts/source/apps/git-edit-index.sh
index 0010718b..0010718b 100755
--- a/hm/soispha/pkgs/scripts/apps/git-edit-index.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/apps/git-edit-index.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/nato.py b/sys/nixpkgs/pkgs/scripts/source/small_functions/nato.py
index e9d15f56..e9d15f56 100755
--- a/hm/soispha/pkgs/scripts/small_functions/nato.py
+++ b/sys/nixpkgs/pkgs/scripts/source/small_functions/nato.py
diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent.sh b/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_persistent.sh
index 5992e02f..5992e02f 100755
--- a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_persistent.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary.sh b/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_temporary.sh
index e411340d..e411340d 100755
--- a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_temporary.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/update-sys.sh b/sys/nixpkgs/pkgs/scripts/source/small_functions/update-sys.sh
index 68fb342d..68fb342d 100755
--- a/hm/soispha/pkgs/scripts/small_functions/update-sys.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/small_functions/update-sys.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/neorg_id_function.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/neorg_id_function.sh
index 7c3fb2a3..7c3fb2a3 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/neorg_id_function.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/neorg_id_function.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/add.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/add.nu
index 8cf9666c..8cf9666c 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/add.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/add.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/dmenu.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/dmenu.nu
index 177e7483..177e7483 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/dmenu.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/dmenu.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/fstart.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/fstart.nu
index f77cd3f6..f77cd3f6 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/fstart.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/fstart.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/fstop.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/fstop.nu
index bcaac944..bcaac944 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/fstop.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/fstop.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/list.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/list.nu
index 68a130f9..68a130f9 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/list.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/list.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/neorg.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/neorg.nu
index 92af49cc..92af49cc 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/neorg.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/neorg.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/project.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/project.nu
index 530eab9b..530eab9b 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/project.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/project.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/task.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/task.nu
index 41d1d6e5..41d1d6e5 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/task.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/task.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/nu/workspace.nu b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/workspace.nu
index dfa79f29..dfa79f29 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/nu/workspace.nu
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/nu/workspace.nu
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/add.sh
index 5a830a10..5a830a10 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/add.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/context.sh
index 7095847d..7095847d 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/context.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/dmenu.sh
index 73e9460a..73e9460a 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/dmenu.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_start.sh
index 2423dd44..2423dd44 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_start.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_stop.sh
index e4ff0b94..e4ff0b94 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_stop.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/list.sh
index 10659457..10659457 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/list.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/project.sh
index 64591850..64591850 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/project.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/utils.sh
index c3843e8e..c3843e8e 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/utils.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/workspace.sh
index d5eb2fca..d5eb2fca 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/workspace.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/main.sh b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/main.sh
index 5087c391..5087c391 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/main.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/main.sh
diff --git a/hm/soispha/pkgs/scripts/specific/ytcc/description.sh b/sys/nixpkgs/pkgs/scripts/source/specific/ytcc/description.sh
index e2a1afaa..e2a1afaa 100755
--- a/hm/soispha/pkgs/scripts/specific/ytcc/description.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/specific/ytcc/description.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/battery.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/battery.sh
index 65485dff..65485dff 100755
--- a/hm/soispha/pkgs/scripts/wrappers/battery.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/battery.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/hibernate.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/hibernate.sh
index f3e74732..f3e74732 100755
--- a/hm/soispha/pkgs/scripts/wrappers/hibernate.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/hibernate.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/ll.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/ll.sh
index 2a65d0a6..2a65d0a6 100755
--- a/hm/soispha/pkgs/scripts/wrappers/ll.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/ll.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/lock.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/lock.sh
index f1c5c711..f1c5c711 100755
--- a/hm/soispha/pkgs/scripts/wrappers/lock.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/lock.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/lyrics.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/lyrics.sh
index 83a01083..83a01083 100755
--- a/hm/soispha/pkgs/scripts/wrappers/lyrics.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/lyrics.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc-fav.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-fav.sh
index 7385ce43..7385ce43 100755
--- a/hm/soispha/pkgs/scripts/wrappers/mpc-fav.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-fav.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc-rm.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-rm.sh
index 03673dbe..03673dbe 100755
--- a/hm/soispha/pkgs/scripts/wrappers/mpc-rm.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-rm.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc.sh
index b870150b..b870150b 100755
--- a/hm/soispha/pkgs/scripts/wrappers/mpc.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/show.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/show.sh
index 95afb16c..95afb16c 100755
--- a/hm/soispha/pkgs/scripts/wrappers/show.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/show.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/sort_song.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/sort_song.sh
index 8195cfcf..8195cfcf 100755
--- a/hm/soispha/pkgs/scripts/wrappers/sort_song.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/sort_song.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/spodi.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/spodi.sh
index 8b4188b0..8b4188b0 100755
--- a/hm/soispha/pkgs/scripts/wrappers/spodi.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/spodi.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/virsh-del.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/virsh-del.sh
index 96a9404d..96a9404d 100755
--- a/hm/soispha/pkgs/scripts/wrappers/virsh-del.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/virsh-del.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/yti.sh b/sys/nixpkgs/pkgs/scripts/source/wrappers/yti.sh
index caa5f443..caa5f443 100755
--- a/hm/soispha/pkgs/scripts/wrappers/yti.sh
+++ b/sys/nixpkgs/pkgs/scripts/source/wrappers/yti.sh