modified bin/shortcuts

1 files changed, 12 insertions, 39 deletions

diff --git a/ar/.local/bin/shortcuts b/ar/.local/bin/shortcuts
index 10e2e89..2a8d3fa 100755
--- a/ar/.local/bin/shortcuts
+++ b/ar/.local/bin/shortcuts
@@ -7,14 +7,14 @@ bmfiles="${XDG_CONFIG_HOME:-${HOME}/.config}/shell/bm-files"
 shell_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/shell/shortcutrc"
 shell_env_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutenvrc"
 zsh_named_dirs="${XDG_CONFIG_HOME:-${HOME}/.config}/shell/zshnameddirrc"
-lf_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/lf/shortcutrc"
-vim_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/vim/shortcuts.vim"
-nvim_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/shortcuts.lua"
-yazi_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/keymap.toml"
-ranger_shortcuts="/dev/null"
-qute_shortcuts="/dev/null"
-fish_shortcuts="/dev/null"
-vifm_shortcuts="/dev/null"
+command -v lf && lf_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/lf/shortcutrc" || lf_shortcuts="/dev/null"
+command -v vim && vim_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/vim/shortcuts.vim" || vim_shortcuts="/dev/null"
+command -v nvim && nvim_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/nvim/shortcuts.lua" || nvim_shortcuts="/dev/null"
+command -v yazi && yazi_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/yazi/keymap.toml" || yazi_shortcuts="/dev/null"
+command -v ranger && ranger_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/ranger/shortcuts.conf" || ranger_shortcuts="/dev/null"
+command -v qutebrowser && qute_shortcuts="$HOME/.qutebrowser/shortcuts.py" || qute_shortcuts="/dev/null"
+command -v fish && fish_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/fish/shortcuts.fish" || fish_shortcuts="/dev/null"
+command -v vifm && vifm_shortcuts="${XDG_CONFIG_HOME:-${HOME}/.config}/vifm/shortcuts.rc" || vifm_shortcuts="/dev/null"
 
 # Remove, prepare files
 rm -f "$lf_shortcuts" "$ranger_shortcuts" "$qute_shortcuts" "$zsh_named_dirs" "$vim_shortcuts" "$nvim_shortcuts" "$yazi_shortcuts" 2>/dev/null
@@ -32,7 +32,7 @@ eval "echo \"$(cat "$bmdirs")\"" |
     printf(\"hash -d %s=%s \n\",\$1,\$2)                 >> \"$zsh_named_dirs\"  ;
     printf(\"abbr %s \42cd %s; and ls -A\42\n\",\$1,\$2) >> \"$fish_shortcuts\"  ;
     printf(\"map g%s :cd %s<CR>\nmap t%s <tab>:cd %s<CR><tab>\nmap M%s <tab>:cd %s<CR><tab>:mo<CR>\nmap Y%s <tab>:cd %s<CR><tab>:co<CR> \n\",\$1,\$2, \$1, \$2, \$1, \$2, \$1, \$2) >> \"$vifm_shortcuts\" ;
-    printf(\"config.bind(';%s', \42set downloads.location.directory %s ;; hint links download\42) \n\",\$1,\$2) >> \"$qute_shortcuts\" ;
+    printf(\"config.bind(',,%s', \42set downloads.location.directory %s ;; hint links download\42) \n\",\$1,\$2) >> \"$qute_shortcuts\" ;
     printf(\"map g%s cd %s\nmap t%s tab_new %s\nmap m%s shell mv -v %%s %s\nmap Y%s shell cp -rv %%s %s \n\",\$1,\$2,\$1,\$2, \$1, \$2, \$1, \$2) >> \"$ranger_shortcuts\" ;
     printf(\"map %s cd \42%s\42 \n\",\$1,\$2)           >> \"$lf_shortcuts\" ;
     printf(\"cmap ;%s %s\n\",\$1,\$2)      >> \"$vim_shortcuts\" ;
@@ -42,7 +42,7 @@ eval "echo \"$(cat "$bmdirs")\"" |
     printf(\"vim.keymap.set('n', '<localleader><leader>%s', '<cmd>Explore %s<cr>', { noremap = true, silent = true, desc = '%s' })\n\", \$1, \$2, desc_path) >> \"$nvim_shortcuts\" ;
     printf(\"vim.keymap.set('n', '<localleader><localleader>%s', function() require('mini.files').open('%s') end, { noremap = true, silent = true, desc = '%s' })\n\", \$1, \$2, desc_path) >> \"$nvim_shortcuts\" ;
     desc_path = \$2; gsub(\"^/home/$USER/\",\"~/\",desc_path);
-    key_array = \"\\\"\\\\\\\\\\\"\"; for(i=1; i<=length(\$1); i++) { key_array = key_array \", \\\"\" substr(\$1,i,1) \"\\\"\" }
+    key_array = \"\"; for(i=1; i<=length(\$1); i++) { if(i==1) key_array = \"\\\"\" substr(\$1,i,1) \"\\\"\"; else key_array = key_array \", \\\"\" substr(\$1,i,1) \"\\\"\" }
     printf(\"\\t{ on = [ %s ], run = \\\"cd %s\\\", desc = \\\"Go to %s\\\" },\\n\",key_array,\$2,desc_path) >> \"$yazi_shortcuts.tmp\"}"
 
 # Format the `files` file in the correct syntax and sent it to both configs.
@@ -65,8 +65,8 @@ eval "echo \"$(cat "$bmfiles")\"" |
     printf(\"vim.keymap.set('c', ';%s', '%s<cr>', { noremap = true, silent = true, desc = '%s' })\n\", \$1, \$2, desc_path) >> \"$nvim_shortcuts\" ;
     printf(\"vim.keymap.set('n', '<localleader><localleader>%s', '<cmd>e %s<cr>', { noremap = true, silent = true, desc = '%s' })\n\", \$1, \$2, desc_path) >> \"$nvim_shortcuts\" ;
     desc_path = \$2; gsub(\"^/home/$USER/\",\"~/\",desc_path);
-    key_array = \"\\\"\\\\\\\\\\\"\"; for(i=1; i<=length(\$1); i++) { key_array = key_array \", \\\"\" substr(\$1,i,1) \"\\\"\" }
-    printf(\"\\t{ on = [ %s ], run = \\\"open %s\\\", desc = \\\"Open %s\\\" },\\n\",key_array,\$2,desc_path) >> \"$yazi_shortcuts.tmp\"}"
+    key_array = \"\"; for(i=1; i<=length(\$1); i++) { if(i==1) key_array = \"\\\"\" substr(\$1,i,1) \"\\\"\"; else key_array = key_array \", \\\"\" substr(\$1,i,1) \"\\\"\" }
+    printf(\"\\t{ on = [ %s ], run = [ 'reveal %s', 'open' ], desc = \\\"Open %s\\\" },\\n\", key_array, \$2, desc_path) >> \"$yazi_shortcuts.tmp\" }"
 
 # Merge bookmarks into keymap-default.toml
 if [ -f "$yazi_shortcuts.tmp" ]; then
@@ -85,30 +85,3 @@ if [ -f "$yazi_shortcuts.tmp" ]; then
   mv "$yazi_shortcuts.new" "$yazi_shortcuts"
   rm -f "$yazi_shortcuts.tmp"
 fi
-
-# root
-root_shell_shortcuts="/root/.config/shell/rootshortcutrc"
-root_zsh_named_dirs="/root/.config/shell/rootzshnameddirrc"
-root_lf_shortcuts="/root/.config/lf/rootshortcutrc"
-root_vim_shortcuts="/root/.config/vim/rootshortcuts.vim"
-
-sudo rm -f "$root_zsh_named_dirs" "$root_lf_shortcuts" "$root_vim_shortcuts" 2>/dev/null
-printf "# vim: filetype=sh\\nalias " | sudo tee "$root_shell_shortcuts" 2>/dev/null
-sudo mkdir -p /root/.config/shell/ /root/.config/lf/ /root/.config/vim/
-sudo touch "$root_shell_shortcuts" "$root_zsh_named_dirs" "$root_lf_shortcuts" "$root_vim_shortcuts"
-
-eval "echo \"$(cat "$bmdirs")\"" |
-  sudo awk "!/^\s*#/ && !/^\s*\$/ && /cache|config($|\/bash|\/lf|\/shell|\/vim)|local\/(bin|share|state)$/ {gsub(\"\\\s*#.*$\",\"\"); gsub(\"home/$USER\", \"root\");
-    printf(\",%s=\42cd %s && ls -A\42 \\\\\n\",\$1,\$2)   >> \"$root_shell_shortcuts\" ;
-    printf(\"hash -d ,%s=%s \n\",\$1,\$2)                 >> \"$root_zsh_named_dirs\"  ;
-    printf(\"map ,%s cd \42%s\42 \n\",\$1,\$2)           >> \"$root_lf_shortcuts\" ;
-    printf(\"cmap ;%s %s\n\",\$1,\$2)      >> \"$root_vim_shortcuts\" ;
-    printf(\"nmap <localleader><localleader>%s :Explore %s<cr>\n\",\$1,\$2)      >> \"$root_vim_shortcuts\"}"
-
-eval "echo \"$(cat "$bmfiles")\"" |
-  sudo awk "!/^\s*#/ && !/^\s*\$/ && /config\/(bash|lf|vim)\/.*rc |inputrc|\$EDITOR / {gsub(\"\\\s*#.*$\",\"\"); gsub(\"home/$USER\", \"root\");
-    printf(\",%s=\42\$EDITOR %s\42 \\\\\n\",\$1,\$2)  >> \"$root_shell_shortcuts\" ;
-    printf(\"hash -d ,%s=%s \n\",\$1,\$2)             >> \"$root_zsh_named_dirs\"  ;
-    printf(\"map ,%s \$\$EDITOR \42%s\42 \n\",\$1,\$2)   >> \"$root_lf_shortcuts\" ;
-    printf(\"cmap ;%s %s\n\",\$1,\$2)        >> \"$root_vim_shortcuts\" ;
-    printf(\"nmap <localleader><localleader>%s :e %s<cr>\n\",\$1,\$2)        >> \"$root_vim_shortcuts\"}"