From 0187e53508c41b9f0f36ab8a45223b181eafd7ee Mon Sep 17 00:00:00 2001 From: tiyn Date: Sat, 11 Nov 2023 16:26:05 +0100 Subject: [PATCH 1/7] tools: updated paths --- .local/bin/etc/sxhkd/audio/mic_toggle | 4 ++-- .local/bin/etc/sxhkd/audio/sound_toggle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.local/bin/etc/sxhkd/audio/mic_toggle b/.local/bin/etc/sxhkd/audio/mic_toggle index 4ceed5b..24f11a5 100755 --- a/.local/bin/etc/sxhkd/audio/mic_toggle +++ b/.local/bin/etc/sxhkd/audio/mic_toggle @@ -1,10 +1,10 @@ #!/bin/sh if amixer get Capture | tail -2 | grep -q '\[on\]'; then - paplay ~/.local/bin/tools/audio/mic_muted.wav + paplay ~/.local/bin/etc/sxhkd/audio/mic_muted.wav lmc mute lmc undeaf else lmc unmute lmc undeaf - paplay ~/.local/bin/tools/audio/mic_activated.wav + paplay ~/.local/bin/etc/sxhkd/audio/mic_activated.wav fi diff --git a/.local/bin/etc/sxhkd/audio/sound_toggle b/.local/bin/etc/sxhkd/audio/sound_toggle index 6f2f5d1..7b8c057 100755 --- a/.local/bin/etc/sxhkd/audio/sound_toggle +++ b/.local/bin/etc/sxhkd/audio/sound_toggle @@ -6,5 +6,5 @@ if amixer get Master | tail -2 | grep -q '\[on\]'; then else lmc mute lmc undeaf - paplay ~/.local/bin/tools/audio/sound_resumed.wav + paplay ~/.local/bin/etc/sxhkd/audio/sound_resumed.wav fi From ee25f731346472f67f298ad8075519f8cf2d8699 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 06:07:58 +0100 Subject: [PATCH 2/7] zsh:fix typo --- .config/zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 5df591f..99c1f02 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,7 +1,7 @@ # Disable ctrl-s and ctrl-q. stty -ixon -setopt autocd autopushd \ +setopt autocd autopushd # Enable autosuggestions source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh From 17bc342b1f2a828758fdbb08bb89da0801f573cd Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 14:43:27 +0100 Subject: [PATCH 3/7] vifm: added extraction --- .config/vifm/vifmrc | 3 +++ .local/bin/etc/vifm/extract | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100755 .local/bin/etc/vifm/extract diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 85d1085..630d0fb 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -477,6 +477,9 @@ nnoremap I cw nnoremap cc cw nnoremap A cw +" Mapping for extraction +nnoremap x :!extract %f + " Open console in current directory nnoremap ,t :!xterm & diff --git a/.local/bin/etc/vifm/extract b/.local/bin/etc/vifm/extract new file mode 100755 index 0000000..29e2889 --- /dev/null +++ b/.local/bin/etc/vifm/extract @@ -0,0 +1,21 @@ +#!/bin/sh + +if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xvjf $1 ;; + *.tar.gz) tar xvzf $1 ;; + *.tar.xz) tar xf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xvf $1 ;; + *.tbz2) tar xvjf $1 ;; + *.tgz) tar xvzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *) echo "don't know how to extract '$1'..." ;; + esac +else + echo "'$1' is not a valid file!" +fi From 158e080d53717ad54381941cd85ed1f95b7f38f1 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 14:51:19 +0100 Subject: [PATCH 4/7] tools: added script for compression --- .local/bin/tools/compress | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 .local/bin/tools/compress diff --git a/.local/bin/tools/compress b/.local/bin/tools/compress new file mode 100755 index 0000000..94d9d93 --- /dev/null +++ b/.local/bin/tools/compress @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -e $1 ] ; then + case $2 in + 7z) 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $1.7z ;; + *) echo "don't know how to compress '$1' in '$2'..." ;; + esac +else + echo "'$1' is not a valid file or directory!" +fi From 56ab3588da6b741ffcdb2194d9ac883d495a2275 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 14:58:03 +0100 Subject: [PATCH 5/7] tools/etc: clearer file structure --- .config/vifm/vifmrc | 2 +- .local/bin/etc/vifm/vifm_extract | 1 + .local/bin/{etc/vifm => tools}/extract | 0 3 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 .local/bin/etc/vifm/vifm_extract rename .local/bin/{etc/vifm => tools}/extract (100%) diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 630d0fb..3a90df1 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -478,7 +478,7 @@ nnoremap cc cw nnoremap A cw " Mapping for extraction -nnoremap x :!extract %f +nnoremap x :!vifm_extract %f " Open console in current directory nnoremap ,t :!xterm & diff --git a/.local/bin/etc/vifm/vifm_extract b/.local/bin/etc/vifm/vifm_extract new file mode 120000 index 0000000..d389097 --- /dev/null +++ b/.local/bin/etc/vifm/vifm_extract @@ -0,0 +1 @@ +../../tools/extract \ No newline at end of file diff --git a/.local/bin/etc/vifm/extract b/.local/bin/tools/extract similarity index 100% rename from .local/bin/etc/vifm/extract rename to .local/bin/tools/extract From a6402bc0b63c6240544a9e651ea2910a3c1d8b74 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 15:07:47 +0100 Subject: [PATCH 6/7] vifm: cleaned up vifmrc remaps --- .config/vifm/vifmrc | 54 +++++---------------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 3a90df1..80d7377 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -444,60 +444,16 @@ nnoremap S :sort nnoremap w :view vnoremap w :viewgv -" Open file in existing instance of gvim -nnoremap o :!gvim --remote-tab-silent %f -" Open file in new instance of gvim -nnoremap O :!gvim %f - -" Open file in the background using its default program -nnoremap gb :file &l - -" Interaction with system clipboard -if has('win') - " Yank current directory path to Windows clipboard with forward slashes - nnoremap yp :!echo %"d:gs!\!/! %i | clip - " Yank path to current file to Windows clipboard with forward slashes - nnoremap yf :!echo %"c:gs!\!/! %i | clip -elseif executable('xclip') - " Yank current directory path into the clipboard - nnoremap yd :!echo %d | xclip %i - " Yank current file path into the clipboard - nnoremap yf :!echo %c:p | xclip %i -elseif executable('xsel') - " Yank current directory path into primary and selection clipboards - nnoremap yd :!echo -n %d | xsel --input --primary %i && - \ echo -n %d | xsel --clipboard --input %i - " Yank current file path into into primary and selection clipboards - nnoremap yf :!echo -n %c:p | xsel --input --primary %i && - \ echo -n %c:p | xsel --clipboard --input %i -endif +" Open file in existing instance of vim +nnoremap o :!$EDITOR %f " Mappings for faster renaming nnoremap I cw nnoremap cc cw -nnoremap A cw - -" Mapping for extraction -nnoremap x :!vifm_extract %f - -" Open console in current directory -nnoremap ,t :!xterm & - -" Open editor to edit vifmrc and apply settings after returning to vifm -nnoremap ,c :write | edit $MYVIFMRC | restart -" Open gvim to edit vifmrc -nnoremap ,C :!gvim --remote-tab-silent $MYVIFMRC & - -" Toggle wrap setting on ,w key -nnoremap ,w :set wrap! -" Example of standard two-panel file managers mappings -nnoremap :!less %f -nnoremap :edit -nnoremap :copy -nnoremap :move -nnoremap :mkdir -nnoremap :delete +" Mapping for extraction and compression +nnoremap xx :!vifm_extract %f +nnoremap aa :!vifm_compress %f 7z " ------------------------------------------------------------------------------ From 46649c2ac8b07e1b850d5c44b8b45bbcac9bc0a4 Mon Sep 17 00:00:00 2001 From: tiyn Date: Sun, 12 Nov 2023 15:11:42 +0100 Subject: [PATCH 7/7] vifm: fixed compress script and added it to vifm --- .local/bin/etc/vifm/vifm_compress | 1 + .local/bin/tools/compress | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 .local/bin/etc/vifm/vifm_compress diff --git a/.local/bin/etc/vifm/vifm_compress b/.local/bin/etc/vifm/vifm_compress new file mode 120000 index 0000000..39b99a7 --- /dev/null +++ b/.local/bin/etc/vifm/vifm_compress @@ -0,0 +1 @@ +../../tools/compress \ No newline at end of file diff --git a/.local/bin/tools/compress b/.local/bin/tools/compress index 94d9d93..466a238 100755 --- a/.local/bin/tools/compress +++ b/.local/bin/tools/compress @@ -2,7 +2,7 @@ if [ -e $1 ] ; then case $2 in - 7z) 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $1.7z ;; + 7z) 7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on $1.7z $1 ;; *) echo "don't know how to compress '$1' in '$2'..." ;; esac else