93 files changed, 65 insertions, 66 deletions

diff --git a/bootstrap/01_activate b/bootstrap/01_activate.sh
index 82e45761..82e45761 100755
--- a/bootstrap/01_activate
+++ b/bootstrap/01_activate.sh
diff --git a/bootstrap/01_install b/bootstrap/01_install.sh
index e4581b6d..e4581b6d 100755
--- a/bootstrap/01_install
+++ b/bootstrap/01_install.sh
diff --git a/bootstrap/02_setup b/bootstrap/02_setup.sh
index 44368f69..44368f69 100755
--- a/bootstrap/02_setup
+++ b/bootstrap/02_setup.sh
diff --git a/bootstrap/03_config_setup b/bootstrap/03_config_setup.sh
index dc2726d0..dc2726d0 100755
--- a/bootstrap/03_config_setup
+++ b/bootstrap/03_config_setup.sh
diff --git a/bootstrap/99_ensure_config_variables b/bootstrap/99_ensure_config_variables.sh
index ce8ffa0f..ce8ffa0f 100755
--- a/bootstrap/99_ensure_config_variables
+++ b/bootstrap/99_ensure_config_variables.sh
diff --git a/bootstrap/default.nix b/bootstrap/default.nix
index 859434e1..b3e44380 100644
--- a/bootstrap/default.nix
+++ b/bootstrap/default.nix
@@ -8,31 +8,31 @@
   activate = sysLib.writeShellScript {
     dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;} ++ ensure_config_variables_dependencies;
     name = "activate";
-    src = ./01_activate;
+    src = ./01_activate.sh;
     inherit replacementStrings;
   };
   install = sysLib.writeShellScript {
     dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;} ++ ensure_config_variables_dependencies;
     name = "install";
-    src = ./01_install;
+    src = ./01_install.sh;
     inherit replacementStrings;
   };
   setup = sysLib.writeShellScript {
     dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;} ++ ensure_config_variables_dependencies;
     name = "setup";
-    src = ./02_setup;
+    src = ./02_setup.sh;
     inherit replacementStrings;
   };
   config_setup = sysLib.writeShellScript {
     dependencies = builtins.attrValues {inherit (pkgs) git neovim;} ++ ensure_config_variables_dependencies;
     name = "config_setup";
-    src = ./03_config_setup;
+    src = ./03_config_setup.sh;
     keepPath = true;
     inherit replacementStrings;
   };
   ensure_config_variables = sysLib.writeShellScript {
     name = "ensure_config_variables";
-    src = ./99_ensure_config_variables;
+    src = ./99_ensure_config_variables.sh;
     wrap = false;
   };
   output = {inherit activate install setup config_setup ensure_config_variables;};
diff --git a/hm/soispha/conf/firefox/scripts/update_extensions b/hm/soispha/conf/firefox/scripts/update_extensions.sh
index f8ed3a9a..f8ed3a9a 100755
--- a/hm/soispha/conf/firefox/scripts/update_extensions
+++ b/hm/soispha/conf/firefox/scripts/update_extensions.sh
diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix
index 098f38f5..d7b78fec 100644
--- a/hm/soispha/conf/git/default.nix
+++ b/hm/soispha/conf/git/default.nix
@@ -10,7 +10,7 @@
   gitTemplateFile = ./git_template.git;
   commit = sysLib.writeShellScript {
     name = "commit";
-    src = ./scripts/commit;
+    src = ./scripts/commit.sh;
     keepPath = true;
     dependencies = with pkgs; [
       git
diff --git a/hm/soispha/conf/git/scripts/commit b/hm/soispha/conf/git/scripts/commit.sh
index 9baf93bb..9baf93bb 100755
--- a/hm/soispha/conf/git/scripts/commit
+++ b/hm/soispha/conf/git/scripts/commit.sh
diff --git a/hm/soispha/conf/gpg/agent-program b/hm/soispha/conf/gpg/agent-program.sh
index e6917db0..e6917db0 100755
--- a/hm/soispha/conf/gpg/agent-program
+++ b/hm/soispha/conf/gpg/agent-program.sh
diff --git a/hm/soispha/conf/gpg/default.nix b/hm/soispha/conf/gpg/default.nix
index ab1440c5..d0cc33a2 100644
--- a/hm/soispha/conf/gpg/default.nix
+++ b/hm/soispha/conf/gpg/default.nix
@@ -7,7 +7,7 @@
 }: let
   agent-program = sysLib.writeShellScript {
     name = "onlykey-gpg-agent";
-    src = ./agent-program;
+    src = ./agent-program.sh;
     dependencies = with pkgs; [
       python3
       onlykey-agent
diff --git a/hm/soispha/conf/lf/commands/default.nix b/hm/soispha/conf/lf/commands/default.nix
index 14a160c6..1cb6996a 100644
--- a/hm/soispha/conf/lf/commands/default.nix
+++ b/hm/soispha/conf/lf/commands/default.nix
@@ -3,67 +3,66 @@
   sysLib,
   shell_library,
   system,
-  lf_rename,
   ...
 }: let
   functionCall = {
-    file,
+    name,
     dependencies,
     replacementStrings,
     ...
   }:
     sysLib.writeShellScript {
-      name = "${builtins.baseNameOf file}";
-      src = file;
+      inherit name;
+      src = ./scripts/${name}.sh;
       keepPath = true;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash coreutils;});
       inherit replacementStrings;
     }
-    + "/bin/${builtins.baseNameOf file}";
+    + "/bin/${name}.sh";
 
   shell = {
-    file,
+    name,
     dependencies,
     replacementStrings ? null,
     ...
   }: ''
     ''${{
-      ${functionCall {inherit file dependencies replacementStrings;}}
+      ${functionCall {inherit name dependencies replacementStrings;}}
     }}
   ''; # closes the lf tui
   pipe = {
-    file,
+    name,
     dependencies,
     replacementStrings ? null,
     ...
   }: ''
     %{{
-      ${functionCall {inherit file dependencies replacementStrings;}}
+      ${functionCall {inherit name dependencies replacementStrings;}}
     }}
   ''; # runs the command in the ui/term bar
   async = {
-    file,
+    name,
     dependencies,
     replacementStrings ? null,
     ...
   }: ''
     &{{
-      ${functionCall {inherit file dependencies replacementStrings;}}
+      ${functionCall {inherit name dependencies replacementStrings;}}
     }}
   ''; # runs the command in the background
   wait = {
-    file,
+    name,
     dependencies,
     replacementStrings ? null,
     ...
   }: ''
     !{{
-      ${functionCall {inherit file dependencies replacementStrings;}}
+      ${functionCall {inherit name dependencies replacementStrings;}}
     }}
   ''; # adds a prompt after the command has run
 in {
   archive = shell {
-    file = ./scripts/archive;
+    name = "archive";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -76,17 +75,17 @@ in {
     };
   };
   broot_jump = shell {
-    file = ./scripts/broot_jump;
+    name = "broot_jump";
     dependencies = builtins.attrValues {
       inherit (pkgs) broot;
     };
   };
   chmod = pipe {
-    file = ./scripts/chmod;
+    name = "chmod";
     dependencies = [];
   };
   clear_trash = shell {
-    file = ./scripts/clear_trash;
+    name = "clear_trash";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -96,7 +95,7 @@ in {
     };
   };
   dl_file = pipe {
-    file = ./scripts/dl_file;
+    name = "dl_file";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -106,7 +105,7 @@ in {
     };
   };
   dragon = pipe {
-    file = ./scripts/dragon;
+    name = "dragon";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -115,7 +114,7 @@ in {
     };
   };
   dragon_individual = pipe {
-    file = ./scripts/dragon_individual;
+    name = "dragon_individual";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -124,7 +123,7 @@ in {
     };
   };
   dragon_stay = pipe {
-    file = ./scripts/dragon_stay;
+    name = "dragon_stay";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -133,36 +132,36 @@ in {
     };
   };
   fzf_jump = shell {
-    file = ./scripts/fzf_jump;
+    name = "fzf_jump";
     dependencies = builtins.attrValues {
       inherit (pkgs) fzf lf gnused;
     };
   };
   mk_dir = pipe {
-    file = ./scripts/mk_dir;
+    name = "mk_dir";
     dependencies = [];
   };
   mk_file = shell {
-    file = ./scripts/mk_file;
+    name = "mk_file";
     dependencies = [];
   };
   mk_file_and_edit = shell {
-    file = ./scripts/mk_file_and_edit;
+    name = "mk_file_and_edit";
     dependencies = [];
   };
   mk_ln = pipe {
-    file = ./scripts/mk_ln;
+    name = "mk_ln";
     dependencies = [];
   };
   mk_scr_default = shell {
-    file = ./scripts/mk_scr_default;
+    name = "mk_scr_default";
     dependencies = builtins.attrValues {};
     replacementStrings = {
       SHELL_LIBRARY_TEMPLATE = "${shell_library.rawTemplate."${system}"}";
     };
   };
   mk_scr_temp = shell {
-    file = ./scripts/mk_scr_temp;
+    name = "mk_scr_temp";
     dependencies = builtins.attrValues {};
     replacementStrings = {
       SHELL_LIBRARY_TEMPLATE = "${shell_library.rawTemplate."${system}"}";
@@ -170,15 +169,15 @@ in {
     };
   };
   open = shell {
-    file = ./scripts/open;
+    name = "open";
     dependencies = builtins.attrValues {inherit (pkgs) file xdg-utils;};
   };
   go_project_base_directory = async {
-    file = ./scripts/go_project_root;
+    name = "go_project_root";
     dependencies = [];
   };
   open_config = shell {
-    file = ./scripts/open_config;
+    name = "open_config";
     dependencies = builtins.attrValues {
       #inherit
       #(pkgs)
@@ -189,7 +188,7 @@ in {
     };
   };
   restore_trash = shell {
-    file = ./scripts/restore_trash;
+    name = "restore_trash";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -199,7 +198,7 @@ in {
     };
   };
   set_wall_paper = pipe {
-    file = ./scripts/set_wall_paper;
+    name = "set_wall_paper";
     dependencies = [];
   };
   /*
@@ -212,11 +211,11 @@ in {
   '';
   */
   stripspace = pipe {
-    file = ./scripts/stripspace;
+    name = "stripspace";
     dependencies = [];
   };
   trash = pipe {
-    file = ./scripts/trash;
+    name = "trash";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
@@ -227,14 +226,14 @@ in {
     };
   };
   unarchive = pipe {
-    file = ./scripts/unarchive;
+    name = "unarchive";
     dependencies = builtins.attrValues {
       inherit
         (pkgs)
         gnutar
         unzip
         # TODO: this is unfree! unrar
-        
+
         p7zip
         ;
     };
diff --git a/hm/soispha/conf/lf/commands/scripts/archive b/hm/soispha/conf/lf/commands/scripts/archive.sh
index 5f4e3792..5f4e3792 100755
--- a/hm/soispha/conf/lf/commands/scripts/archive
+++ b/hm/soispha/conf/lf/commands/scripts/archive.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/broot_jump b/hm/soispha/conf/lf/commands/scripts/broot_jump.sh
index 0feb5daf..0feb5daf 100755
--- a/hm/soispha/conf/lf/commands/scripts/broot_jump
+++ b/hm/soispha/conf/lf/commands/scripts/broot_jump.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/chmod b/hm/soispha/conf/lf/commands/scripts/chmod.sh
index f2cc0dc8..f2cc0dc8 100755
--- a/hm/soispha/conf/lf/commands/scripts/chmod
+++ b/hm/soispha/conf/lf/commands/scripts/chmod.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/clear_trash b/hm/soispha/conf/lf/commands/scripts/clear_trash.sh
index f2ec5c5e..f2ec5c5e 100755
--- a/hm/soispha/conf/lf/commands/scripts/clear_trash
+++ b/hm/soispha/conf/lf/commands/scripts/clear_trash.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/cow_cp b/hm/soispha/conf/lf/commands/scripts/cow_cp.sh
index 85fd3431..85fd3431 100755
--- a/hm/soispha/conf/lf/commands/scripts/cow_cp
+++ b/hm/soispha/conf/lf/commands/scripts/cow_cp.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/dl_file b/hm/soispha/conf/lf/commands/scripts/dl_file.sh
index 5092174f..5092174f 100755
--- a/hm/soispha/conf/lf/commands/scripts/dl_file
+++ b/hm/soispha/conf/lf/commands/scripts/dl_file.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/dragon b/hm/soispha/conf/lf/commands/scripts/dragon.sh
index 59a50920..59a50920 100755
--- a/hm/soispha/conf/lf/commands/scripts/dragon
+++ b/hm/soispha/conf/lf/commands/scripts/dragon.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_individual b/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh
index 051537f9..051537f9 100755
--- a/hm/soispha/conf/lf/commands/scripts/dragon_individual
+++ b/hm/soispha/conf/lf/commands/scripts/dragon_individual.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/dragon_stay b/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh
index 8f880848..8f880848 100755
--- a/hm/soispha/conf/lf/commands/scripts/dragon_stay
+++ b/hm/soispha/conf/lf/commands/scripts/dragon_stay.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/fzf_jump b/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh
index 172c44d3..172c44d3 100755
--- a/hm/soispha/conf/lf/commands/scripts/fzf_jump
+++ b/hm/soispha/conf/lf/commands/scripts/fzf_jump.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/go_project_root b/hm/soispha/conf/lf/commands/scripts/go_project_root.sh
index 9ed9f7ad..9ed9f7ad 100755
--- a/hm/soispha/conf/lf/commands/scripts/go_project_root
+++ b/hm/soispha/conf/lf/commands/scripts/go_project_root.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_dir b/hm/soispha/conf/lf/commands/scripts/mk_dir.sh
index adf60d99..adf60d99 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_dir
+++ b/hm/soispha/conf/lf/commands/scripts/mk_dir.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file b/hm/soispha/conf/lf/commands/scripts/mk_file.sh
index cdef38a0..cdef38a0 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_file
+++ b/hm/soispha/conf/lf/commands/scripts/mk_file.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh
index 662b29ac..662b29ac 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit
+++ b/hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_ln b/hm/soispha/conf/lf/commands/scripts/mk_ln.sh
index f5dcd395..f5dcd395 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_ln
+++ b/hm/soispha/conf/lf/commands/scripts/mk_ln.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_default b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh
index 6e69fc4f..6e69fc4f 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_scr_default
+++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh
index 612ff19d..612ff19d 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_scr_temp
+++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/open b/hm/soispha/conf/lf/commands/scripts/open.sh
index 3dd8f485..3dd8f485 100755
--- a/hm/soispha/conf/lf/commands/scripts/open
+++ b/hm/soispha/conf/lf/commands/scripts/open.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/open_config b/hm/soispha/conf/lf/commands/scripts/open_config.sh
index 4054abdd..4054abdd 100755
--- a/hm/soispha/conf/lf/commands/scripts/open_config
+++ b/hm/soispha/conf/lf/commands/scripts/open_config.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/restore_trash b/hm/soispha/conf/lf/commands/scripts/restore_trash.sh
index 94d26a26..94d26a26 100755
--- a/hm/soispha/conf/lf/commands/scripts/restore_trash
+++ b/hm/soispha/conf/lf/commands/scripts/restore_trash.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/set_wall_paper b/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh
index f7714880..f7714880 100755
--- a/hm/soispha/conf/lf/commands/scripts/set_wall_paper
+++ b/hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/stripspace b/hm/soispha/conf/lf/commands/scripts/stripspace.sh
index c8781a60..c8781a60 100755
--- a/hm/soispha/conf/lf/commands/scripts/stripspace
+++ b/hm/soispha/conf/lf/commands/scripts/stripspace.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/trash b/hm/soispha/conf/lf/commands/scripts/trash.sh
index 4da188e5..4da188e5 100755
--- a/hm/soispha/conf/lf/commands/scripts/trash
+++ b/hm/soispha/conf/lf/commands/scripts/trash.sh
diff --git a/hm/soispha/conf/lf/commands/scripts/unarchive b/hm/soispha/conf/lf/commands/scripts/unarchive.sh
index 1ecc702b..1ecc702b 100755
--- a/hm/soispha/conf/lf/commands/scripts/unarchive
+++ b/hm/soispha/conf/lf/commands/scripts/unarchive.sh
diff --git a/hm/soispha/conf/xdg/default.nix b/hm/soispha/conf/xdg/default.nix
index be85f330..8327ea6e 100644
--- a/hm/soispha/conf/xdg/default.nix
+++ b/hm/soispha/conf/xdg/default.nix
@@ -6,7 +6,7 @@
 }: let
   url_handler = sysLib.writeShellScript {
     name = "url_handler";
-    src = ./url_handler;
+    src = ./url_handler.sh;
     keepPath = true;
     # Naming dependencies for this will be difficult, as it depend on overridden packages.
     dependencies = with pkgs; [
diff --git a/hm/soispha/conf/xdg/url_handler b/hm/soispha/conf/xdg/url_handler.sh
index 9cca2fc0..9cca2fc0 100755
--- a/hm/soispha/conf/xdg/url_handler
+++ b/hm/soispha/conf/xdg/url_handler.sh
diff --git a/hm/soispha/conf/yambar/default.nix b/hm/soispha/conf/yambar/default.nix
index abc0c85e..f732e1d8 100644
--- a/hm/soispha/conf/yambar/default.nix
+++ b/hm/soispha/conf/yambar/default.nix
@@ -8,16 +8,16 @@
   ...
 }: let
   makeScript = {
-    file,
+    name,
     dependencies,
     ...
   }:
     sysLib.writeShellScript {
-      name = "${builtins.baseNameOf file}";
-      src = file;
+      inherit name;
+      src = ./scripts/${name}.sh;
       dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;});
     }
-    + "/bin/${builtins.baseNameOf file}";
+    + "/bin/${name}";
 in {
   xdg.configFile."yambar/config.yml".source = pkgs.substituteAll {
     src =
@@ -32,12 +32,12 @@ in {
 
     mpd_song_name_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) mpc-cli;};
-      file = ./scripts/mpd_song_name;
+      name = "mpd_song_name";
     };
 
     volume_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) pulseaudio gawk coreutils;};
-      file = ./scripts/sound-volume;
+      name = "sound-volume";
     };
 
     # grade_average_script = makeScript {
@@ -46,7 +46,7 @@ in {
     #       grades.outputs.packages.${system}.default
     #     ]
     #     ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
-    #   file = ./scripts/grades-average;
+    #   name = "grades-average";
     # };
 
     cpu_script = yambar_cpu.app.${system}.default.program;
@@ -55,7 +55,7 @@ in {
 
     disk_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) gawk btrfs-progs coreutils;};
-      file = ./scripts/disk;
+      name = "disk";
     };
   };
 }
diff --git a/hm/soispha/conf/yambar/scripts/disk b/hm/soispha/conf/yambar/scripts/disk.sh
index 003455ab..003455ab 100755
--- a/hm/soispha/conf/yambar/scripts/disk
+++ b/hm/soispha/conf/yambar/scripts/disk.sh
diff --git a/hm/soispha/conf/yambar/scripts/grades-average b/hm/soispha/conf/yambar/scripts/grades-average.sh
index 8c1900cf..8c1900cf 100755
--- a/hm/soispha/conf/yambar/scripts/grades-average
+++ b/hm/soispha/conf/yambar/scripts/grades-average.sh
diff --git a/hm/soispha/conf/yambar/scripts/mpd_song_name b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh
index b778afbc..b778afbc 100755
--- a/hm/soispha/conf/yambar/scripts/mpd_song_name
+++ b/hm/soispha/conf/yambar/scripts/mpd_song_name.sh
diff --git a/hm/soispha/conf/yambar/scripts/network b/hm/soispha/conf/yambar/scripts/network.sh
index 717ea6be..717ea6be 100755
--- a/hm/soispha/conf/yambar/scripts/network
+++ b/hm/soispha/conf/yambar/scripts/network.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/amixer-monitor b/hm/soispha/conf/yambar/scripts/old/amixer-monitor.sh
index 9e75acfa..9e75acfa 100755
--- a/hm/soispha/conf/yambar/scripts/old/amixer-monitor
+++ b/hm/soispha/conf/yambar/scripts/old/amixer-monitor.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/cpu b/hm/soispha/conf/yambar/scripts/old/cpu.sh
index bae820d0..bae820d0 100755
--- a/hm/soispha/conf/yambar/scripts/old/cpu
+++ b/hm/soispha/conf/yambar/scripts/old/cpu.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/dfspace b/hm/soispha/conf/yambar/scripts/old/dfspace.sh
index 0b262481..0b262481 100755
--- a/hm/soispha/conf/yambar/scripts/old/dfspace
+++ b/hm/soispha/conf/yambar/scripts/old/dfspace.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/grades-average b/hm/soispha/conf/yambar/scripts/old/grades-average.sh
index a04b958c..a04b958c 100755
--- a/hm/soispha/conf/yambar/scripts/old/grades-average
+++ b/hm/soispha/conf/yambar/scripts/old/grades-average.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/meminfo b/hm/soispha/conf/yambar/scripts/old/meminfo.sh
index 0156e94c..0156e94c 100755
--- a/hm/soispha/conf/yambar/scripts/old/meminfo
+++ b/hm/soispha/conf/yambar/scripts/old/meminfo.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/nmclitest b/hm/soispha/conf/yambar/scripts/old/nmclitest.sh
index 3e8bc73a..3e8bc73a 100755
--- a/hm/soispha/conf/yambar/scripts/old/nmclitest
+++ b/hm/soispha/conf/yambar/scripts/old/nmclitest.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/pingtest b/hm/soispha/conf/yambar/scripts/old/pingtest.sh
index 2b5f9998..2b5f9998 100755
--- a/hm/soispha/conf/yambar/scripts/old/pingtest
+++ b/hm/soispha/conf/yambar/scripts/old/pingtest.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/yambar-tray-width b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width.sh
index 00544e70..00544e70 100755
--- a/hm/soispha/conf/yambar/scripts/old/yambar-tray-width
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray-width.sh
diff --git a/hm/soispha/conf/yambar/scripts/old/yambar-tray b/hm/soispha/conf/yambar/scripts/old/yambar-tray.sh
index 1704c6dd..1704c6dd 100755
--- a/hm/soispha/conf/yambar/scripts/old/yambar-tray
+++ b/hm/soispha/conf/yambar/scripts/old/yambar-tray.sh
diff --git a/hm/soispha/conf/yambar/scripts/sound-volume b/hm/soispha/conf/yambar/scripts/sound-volume.sh
index 721d51bf..721d51bf 100755
--- a/hm/soispha/conf/yambar/scripts/sound-volume
+++ b/hm/soispha/conf/yambar/scripts/sound-volume.sh
diff --git a/hm/soispha/conf/zsh/default.nix b/hm/soispha/conf/zsh/default.nix
index 715c0f87..f7493e5e 100644
--- a/hm/soispha/conf/zsh/default.nix
+++ b/hm/soispha/conf/zsh/default.nix
@@ -66,10 +66,10 @@
       ];
 
     initExtraFirst =
-      builtins.readFile ./config/zsh-init.sh
+      builtins.readFile ./config/zsh-init.zsh
       # + builtins.readFile ./config/zsh-prompt.sh
-      + builtins.readFile ./config/command_not_found_insult.zsh
-      + builtins.readFile ./config/custom_cursor.sh
+      + builtins.readFile ./config/command_not_found_insult.sh
+      + builtins.readFile ./config/custom_cursor.zsh
       + builtins.readFile "${pkgs.fzf}/share/fzf/key-bindings.zsh"
       + ''SHELL_LIBRARY_VERSION="2.0.13" source ${shell_library.rawLib.${system}}'';
 
diff --git a/hm/soispha/pkgs/scripts.nix b/hm/soispha/pkgs/scripts.nix
index 57aff326..a1603656 100644
--- a/hm/soispha/pkgs/scripts.nix
+++ b/hm/soispha/pkgs/scripts.nix
@@ -14,7 +14,7 @@
   }:
     sysLib.writeShellScript {
       inherit name keepPath;
-      src = ./scripts/${path}/${name};
+      src = ./scripts/${path}/${name}.sh;
       dependencies = dependencies ++ [pkgs.dash];
       generateCompletions = completions;
     };
@@ -25,7 +25,7 @@
     dependencies_python ? _: [],
     keepPath ? false,
   }: let
-    src = ./scripts/${path}/${name};
+    src = ./scripts/${path}/${name}.py;
     dependencies =
       [(pkgs.python3.withPackages dependencies_python)]
       ++ dependencies_system;
@@ -53,7 +53,7 @@
 
   con2pdf-scr = sysLib.writeShellScript {
     name = "con2pdf";
-    src = ./scripts/apps/con2pdf;
+    src = ./scripts/apps/con2pdf.sh;
     dependencies = builtins.attrValues {inherit (pkgs) sane-backends imagemagick coreutils fd;};
     generateCompletions = true;
     replacementStrings = {
@@ -113,7 +113,7 @@
 
   ll-scr = sysLib.writeShellScript {
     name = "ll";
-    src = ./scripts/wrappers/ll;
+    src = ./scripts/wrappers/ll.sh;
     wrap = false;
   };
 
diff --git a/hm/soispha/pkgs/scripts/apps/aumo b/hm/soispha/pkgs/scripts/apps/aumo.sh
index b5840fc3..b5840fc3 100755
--- a/hm/soispha/pkgs/scripts/apps/aumo
+++ b/hm/soispha/pkgs/scripts/apps/aumo.sh
diff --git a/hm/soispha/pkgs/scripts/apps/con2pdf b/hm/soispha/pkgs/scripts/apps/con2pdf.sh
index be8810bb..be8810bb 100644..100755
--- a/hm/soispha/pkgs/scripts/apps/con2pdf
+++ b/hm/soispha/pkgs/scripts/apps/con2pdf.sh
diff --git a/hm/soispha/pkgs/scripts/apps/fupdate b/hm/soispha/pkgs/scripts/apps/fupdate.sh
index 7722c070..7722c070 100644..100755
--- a/hm/soispha/pkgs/scripts/apps/fupdate
+++ b/hm/soispha/pkgs/scripts/apps/fupdate.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/nato b/hm/soispha/pkgs/scripts/small_functions/nato.py
index e9d15f56..e9d15f56 100755
--- a/hm/soispha/pkgs/scripts/small_functions/nato
+++ b/hm/soispha/pkgs/scripts/small_functions/nato.py
diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent b/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent.sh
index 9e73bed3..9e73bed3 100755
--- a/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent
+++ b/hm/soispha/pkgs/scripts/small_functions/screenshot_persistent.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary b/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary.sh
index e411340d..e411340d 100755
--- a/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary
+++ b/hm/soispha/pkgs/scripts/small_functions/screenshot_temporary.sh
diff --git a/hm/soispha/pkgs/scripts/small_functions/update-sys b/hm/soispha/pkgs/scripts/small_functions/update-sys.sh
index 20e38841..20e38841 100755
--- a/hm/soispha/pkgs/scripts/small_functions/update-sys
+++ b/hm/soispha/pkgs/scripts/small_functions/update-sys.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add.sh
index bd700775..bd700775 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/add.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context.sh
index b9ae4463..b9ae4463 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/context.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu.sh
index 36133004..36133004 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/dmenu.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start.sh
index c75986a7..c75986a7 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_start.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop.sh
index d60cb46f..d60cb46f 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/f_stop.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list.sh
index 10659457..10659457 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/list.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project.sh
index 8def0930..8def0930 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/project.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils.sh
index 91da811a..91da811a 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/utils.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace.sh
index d5eb2fca..d5eb2fca 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/functions/workspace.sh
diff --git a/hm/soispha/pkgs/scripts/specific/neorg/sh/main b/hm/soispha/pkgs/scripts/specific/neorg/sh/main.sh
index 25b434fc..25b434fc 100755
--- a/hm/soispha/pkgs/scripts/specific/neorg/sh/main
+++ b/hm/soispha/pkgs/scripts/specific/neorg/sh/main.sh
diff --git a/hm/soispha/pkgs/scripts/specific/ytcc/description b/hm/soispha/pkgs/scripts/specific/ytcc/description.sh
index e2a1afaa..e2a1afaa 100755
--- a/hm/soispha/pkgs/scripts/specific/ytcc/description
+++ b/hm/soispha/pkgs/scripts/specific/ytcc/description.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/hibernate b/hm/soispha/pkgs/scripts/wrappers/hibernate.sh
index 96170bcb..96170bcb 100755
--- a/hm/soispha/pkgs/scripts/wrappers/hibernate
+++ b/hm/soispha/pkgs/scripts/wrappers/hibernate.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/ll b/hm/soispha/pkgs/scripts/wrappers/ll.sh
index 2a65d0a6..2a65d0a6 100755
--- a/hm/soispha/pkgs/scripts/wrappers/ll
+++ b/hm/soispha/pkgs/scripts/wrappers/ll.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/lock b/hm/soispha/pkgs/scripts/wrappers/lock.sh
index 376773c6..376773c6 100755
--- a/hm/soispha/pkgs/scripts/wrappers/lock
+++ b/hm/soispha/pkgs/scripts/wrappers/lock.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/lyrics b/hm/soispha/pkgs/scripts/wrappers/lyrics.sh
index 83a01083..83a01083 100755
--- a/hm/soispha/pkgs/scripts/wrappers/lyrics
+++ b/hm/soispha/pkgs/scripts/wrappers/lyrics.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc-fav b/hm/soispha/pkgs/scripts/wrappers/mpc-fav.sh
index f9107ff6..f9107ff6 100755
--- a/hm/soispha/pkgs/scripts/wrappers/mpc-fav
+++ b/hm/soispha/pkgs/scripts/wrappers/mpc-fav.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/mpc-rm b/hm/soispha/pkgs/scripts/wrappers/mpc-rm.sh
index cc01c322..cc01c322 100755
--- a/hm/soispha/pkgs/scripts/wrappers/mpc-rm
+++ b/hm/soispha/pkgs/scripts/wrappers/mpc-rm.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/show b/hm/soispha/pkgs/scripts/wrappers/show.sh
index 95afb16c..95afb16c 100755
--- a/hm/soispha/pkgs/scripts/wrappers/show
+++ b/hm/soispha/pkgs/scripts/wrappers/show.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/sort_song b/hm/soispha/pkgs/scripts/wrappers/sort_song.sh
index f539cf15..f539cf15 100755
--- a/hm/soispha/pkgs/scripts/wrappers/sort_song
+++ b/hm/soispha/pkgs/scripts/wrappers/sort_song.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/spodi b/hm/soispha/pkgs/scripts/wrappers/spodi.sh
index f8bc5337..f8bc5337 100755
--- a/hm/soispha/pkgs/scripts/wrappers/spodi
+++ b/hm/soispha/pkgs/scripts/wrappers/spodi.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/virsh-del b/hm/soispha/pkgs/scripts/wrappers/virsh-del.sh
index 96a9404d..96a9404d 100755
--- a/hm/soispha/pkgs/scripts/wrappers/virsh-del
+++ b/hm/soispha/pkgs/scripts/wrappers/virsh-del.sh
diff --git a/hm/soispha/pkgs/scripts/wrappers/yti b/hm/soispha/pkgs/scripts/wrappers/yti.sh
index c07f6665..c07f6665 100755
--- a/hm/soispha/pkgs/scripts/wrappers/yti
+++ b/hm/soispha/pkgs/scripts/wrappers/yti.sh
diff --git a/hm/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix
index 3abe3753..36a9ca74 100644
--- a/hm/soispha/wms/river/default.nix
+++ b/hm/soispha/wms/river/default.nix
@@ -37,7 +37,7 @@
     else builtins.throw "Host not covered in river screen setup";
   env_vars = "XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river";
   init_scr = pkgs.substituteAll {
-    src = ./init;
+    src = ./init.sh;
     inherit mappings screen_setup env_vars;
   };
 in {
diff --git a/hm/soispha/wms/river/init b/hm/soispha/wms/river/init.sh
index 7286318e..07b30732 100755
--- a/hm/soispha/wms/river/init
+++ b/hm/soispha/wms/river/init.sh
@@ -7,7 +7,7 @@ err_fail() {
     if ! "$@";then
         warning "\"$*\" failed!\n" >> ~/river_log
         # msg "Executing the safe init!"
-        # exec ~/.config/river/res/safe_init
+        # exec ~/.config/river/res/safe_init.sh
     fi
 }
 err_fail rm ~/river_log
diff --git a/hm/soispha/wms/river/res/safe_init b/hm/soispha/wms/river/res/safe_init.sh
index 8e80026a..8e80026a 100755
--- a/hm/soispha/wms/river/res/safe_init
+++ b/hm/soispha/wms/river/res/safe_init.sh
diff --git a/sys/nixpkgs/pkgs/snap-sync-forked/default.nix b/sys/nixpkgs/pkgs/snap-sync-forked/default.nix
index 964a277a..5b086a5a 100644
--- a/sys/nixpkgs/pkgs/snap-sync-forked/default.nix
+++ b/sys/nixpkgs/pkgs/snap-sync-forked/default.nix
@@ -2,7 +2,7 @@
   (final: prev: {
     snap-sync-forked = sysLib.writeShellScript {
       name = "snap-sync-forked";
-      src = ./snap-sync-forked;
+      src = ./snap-sync-forked.sh;
       dependencies = with prev; [
         bash
         btrfs-progs
diff --git a/sys/nixpkgs/pkgs/snap-sync-forked/snap-sync-forked b/sys/nixpkgs/pkgs/snap-sync-forked/snap-sync-forked.sh
index a66f31ae..a66f31ae 100755
--- a/sys/nixpkgs/pkgs/snap-sync-forked/snap-sync-forked
+++ b/sys/nixpkgs/pkgs/snap-sync-forked/snap-sync-forked.sh
diff --git a/sys/nixpkgs/pkgs/update_pkgs b/sys/nixpkgs/pkgs/update_pkgs.sh
index 8392fb1c..8392fb1c 100755
--- a/sys/nixpkgs/pkgs/update_pkgs
+++ b/sys/nixpkgs/pkgs/update_pkgs.sh
diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix
index 513e7a65..3229b97c 100644
--- a/sys/svcs/xdg/default.nix
+++ b/sys/svcs/xdg/default.nix
@@ -14,7 +14,7 @@
           filechooser = {
             default_dir = "/tmp";
             cmd = "${sysLib.writeShellScript {
-              src = ./scripts/lf_wrapper;
+              src = ./scripts/lf_wrapper.sh;
               name = "lf_wrapper";
               keepPath = true;
               dependencies = with pkgs; [
diff --git a/sys/svcs/xdg/scripts/lf_wrapper b/sys/svcs/xdg/scripts/lf_wrapper.sh
index 7a508d39..7a508d39 100755
--- a/sys/svcs/xdg/scripts/lf_wrapper
+++ b/sys/svcs/xdg/scripts/lf_wrapper.sh
diff --git a/update.sh b/update.sh
index 6f8a65c1..ab38ea56 100755
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # shellcheck disable=SC2086
 
-./hm/soispha/conf/firefox/scripts/update_extensions
+./hm/soispha/conf/firefox/scripts/update_extensions.sh
 
-./sys/nixpkgs/pkgs/update_pkgs "$@"
+./sys/nixpkgs/pkgs/update_pkgs.sh "$@"