diff options
author | Soispha <soispha@vhack.eu> | 2024-02-20 16:35:15 +0100 |
---|---|---|
committer | Soispha <soispha@vhack.eu> | 2024-02-20 16:35:15 +0100 |
commit | cc09b607330385d6d81b9c47cf64a2442432e93f (patch) | |
tree | dc7e4503a3341b8936576c6339a70df4adaa2512 /hm/soispha/conf | |
parent | refactor(hm/conf/zsh/config): Rework old config scripts (diff) | |
download | nixos-config-cc09b607330385d6d81b9c47cf64a2442432e93f.zip |
refactor(treewide): Add a `.sh` extension to shell scripts
Diffstat (limited to 'hm/soispha/conf')
-rwxr-xr-x | hm/soispha/conf/firefox/scripts/update_extensions.sh (renamed from hm/soispha/conf/firefox/scripts/update_extensions) | 0 | ||||
-rw-r--r-- | hm/soispha/conf/git/default.nix | 2 | ||||
-rwxr-xr-x | hm/soispha/conf/git/scripts/commit.sh (renamed from hm/soispha/conf/git/scripts/commit) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/gpg/agent-program.sh (renamed from hm/soispha/conf/gpg/agent-program) | 0 | ||||
-rw-r--r-- | hm/soispha/conf/gpg/default.nix | 2 | ||||
-rw-r--r-- | hm/soispha/conf/lf/commands/default.nix | 73 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/archive.sh (renamed from hm/soispha/conf/lf/commands/scripts/archive) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/broot_jump.sh (renamed from hm/soispha/conf/lf/commands/scripts/broot_jump) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/chmod.sh (renamed from hm/soispha/conf/lf/commands/scripts/chmod) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/clear_trash.sh (renamed from hm/soispha/conf/lf/commands/scripts/clear_trash) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/cow_cp.sh (renamed from hm/soispha/conf/lf/commands/scripts/cow_cp) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/dl_file.sh (renamed from hm/soispha/conf/lf/commands/scripts/dl_file) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/dragon.sh (renamed from hm/soispha/conf/lf/commands/scripts/dragon) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/dragon_individual.sh (renamed from hm/soispha/conf/lf/commands/scripts/dragon_individual) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/dragon_stay.sh (renamed from hm/soispha/conf/lf/commands/scripts/dragon_stay) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/fzf_jump.sh (renamed from hm/soispha/conf/lf/commands/scripts/fzf_jump) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/go_project_root.sh (renamed from hm/soispha/conf/lf/commands/scripts/go_project_root) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_dir.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_dir) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_file.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_file) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_file_and_edit.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_file_and_edit) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_ln.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_ln) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_scr_default) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/mk_scr_temp.sh (renamed from hm/soispha/conf/lf/commands/scripts/mk_scr_temp) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/open.sh (renamed from hm/soispha/conf/lf/commands/scripts/open) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/open_config.sh (renamed from hm/soispha/conf/lf/commands/scripts/open_config) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/restore_trash.sh (renamed from hm/soispha/conf/lf/commands/scripts/restore_trash) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/set_wall_paper.sh (renamed from hm/soispha/conf/lf/commands/scripts/set_wall_paper) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/stripspace.sh (renamed from hm/soispha/conf/lf/commands/scripts/stripspace) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/trash.sh (renamed from hm/soispha/conf/lf/commands/scripts/trash) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/lf/commands/scripts/unarchive.sh (renamed from hm/soispha/conf/lf/commands/scripts/unarchive) | 0 | ||||
-rw-r--r-- | hm/soispha/conf/xdg/default.nix | 2 | ||||
-rwxr-xr-x | hm/soispha/conf/xdg/url_handler.sh (renamed from hm/soispha/conf/xdg/url_handler) | 0 | ||||
-rw-r--r-- | hm/soispha/conf/yambar/default.nix | 16 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/disk.sh (renamed from hm/soispha/conf/yambar/scripts/disk) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/grades-average.sh (renamed from hm/soispha/conf/yambar/scripts/grades-average) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/mpd_song_name.sh (renamed from hm/soispha/conf/yambar/scripts/mpd_song_name) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/network.sh (renamed from hm/soispha/conf/yambar/scripts/network) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/amixer-monitor.sh (renamed from hm/soispha/conf/yambar/scripts/old/amixer-monitor) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/cpu.sh (renamed from hm/soispha/conf/yambar/scripts/old/cpu) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/dfspace.sh (renamed from hm/soispha/conf/yambar/scripts/old/dfspace) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/grades-average.sh (renamed from hm/soispha/conf/yambar/scripts/old/grades-average) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/meminfo.sh (renamed from hm/soispha/conf/yambar/scripts/old/meminfo) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/nmclitest.sh (renamed from hm/soispha/conf/yambar/scripts/old/nmclitest) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/pingtest.sh (renamed from hm/soispha/conf/yambar/scripts/old/pingtest) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/yambar-tray-width.sh (renamed from hm/soispha/conf/yambar/scripts/old/yambar-tray-width) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/old/yambar-tray.sh (renamed from hm/soispha/conf/yambar/scripts/old/yambar-tray) | 0 | ||||
-rwxr-xr-x | hm/soispha/conf/yambar/scripts/sound-volume.sh (renamed from hm/soispha/conf/yambar/scripts/sound-volume) | 0 | ||||
-rw-r--r-- | hm/soispha/conf/zsh/default.nix | 6 |
48 files changed, 50 insertions, 51 deletions
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}}''; |