From cc6f194920d0337b8f4f373ad978ca42e61a5517 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 1 Dec 2018 11:04:34 -0500 Subject: bookmarks moved once again! --- .bmdirs | 11 +++++++++++ .bmfiles | 22 ++++++++++++++++++++++ .config/ranger/luke_ranger_readme.md | 6 ++++-- .key_directories | 11 ----------- .key_files | 22 ---------------------- .scripts/tools/shortcuts | 23 +++++++++++------------ 6 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 .bmdirs create mode 100644 .bmfiles delete mode 100644 .key_directories delete mode 100644 .key_files diff --git a/.bmdirs b/.bmdirs new file mode 100644 index 0000000..3f5c73f --- /dev/null +++ b/.bmdirs @@ -0,0 +1,11 @@ +# You can add comments to these files with # +h ~/ +d ~/Documents +D ~/Downloads +m ~/Music +pp ~/Pictures +vv ~/Videos +cf ~/.config +sc ~/.scripts +mn /mnt +e /etc diff --git a/.bmfiles b/.bmfiles new file mode 100644 index 0000000..d71325b --- /dev/null +++ b/.bmfiles @@ -0,0 +1,22 @@ +bf ~/.key_files +bd ~/.key_directories +cfb ~/.bashrc +cfz ~/.zshrc +cfv ~/.vimrc +cfr ~/.config/ranger/rc.conf +cfi ~/.config/i3/config +cfq ~/.config/qutebrowser/config.py +cfm ~/.config/mutt/muttrc +cft ~/.config/termite/config +eb ~/Documents/LaTeX/uni.bib +cv ~/Documents/LaTeX/cv.tex +cfp ~/.config/polybar/config +cfd ~/.Xdefaults +cfu ~/.config/newsboat/urls +cfn ~/.config/newsboat/config +cfA ~/.asoundrc +cfmb ~/.config/ncmpcpp/bindings +cfmc ~/.config/ncmpcpp/config +cfmpd ~/.config/mpd/mpd.conf +cfM ~/.config/mpd/mpd.conf +er ~/.referbib diff --git a/.config/ranger/luke_ranger_readme.md b/.config/ranger/luke_ranger_readme.md index c118444..51c5dd1 100644 --- a/.config/ranger/luke_ranger_readme.md +++ b/.config/ranger/luke_ranger_readme.md @@ -19,7 +19,9 @@ These are the basic key binds in ranger, even outside of my configs. Note that t ## Shortcuts -I've added many folder-specific shortcuts; refer to rc.conf for the specifics, but here's the idea. There are for "verbs:" +As I say in the main readme, there are shortcut commands generated for ranger +based on what bookmarked directories and files you give it. For directory +shortcuts, here are the "verbs": + g -- "go or cd" + t -- "new tab" @@ -31,7 +33,7 @@ These "verbs" take "nouns" or "arguments," like these: + d -- "~/Documents" + D -- "~/Downloads" + cf -- "~/.config" -+ And many others, including those you add! ++ And many others, including those you add to `~/.bmdirs`. Press any "verb" followed by any "argument" to perform a folder operation. "gd" will cd to ~/Documents, for example. "mD" will move the selected file(s) to ~/Downloads. "tcf" will create a new tab in ~/.config, etc. etc. diff --git a/.key_directories b/.key_directories deleted file mode 100644 index 3f5c73f..0000000 --- a/.key_directories +++ /dev/null @@ -1,11 +0,0 @@ -# You can add comments to these files with # -h ~/ -d ~/Documents -D ~/Downloads -m ~/Music -pp ~/Pictures -vv ~/Videos -cf ~/.config -sc ~/.scripts -mn /mnt -e /etc diff --git a/.key_files b/.key_files deleted file mode 100644 index d71325b..0000000 --- a/.key_files +++ /dev/null @@ -1,22 +0,0 @@ -bf ~/.key_files -bd ~/.key_directories -cfb ~/.bashrc -cfz ~/.zshrc -cfv ~/.vimrc -cfr ~/.config/ranger/rc.conf -cfi ~/.config/i3/config -cfq ~/.config/qutebrowser/config.py -cfm ~/.config/mutt/muttrc -cft ~/.config/termite/config -eb ~/Documents/LaTeX/uni.bib -cv ~/Documents/LaTeX/cv.tex -cfp ~/.config/polybar/config -cfd ~/.Xdefaults -cfu ~/.config/newsboat/urls -cfn ~/.config/newsboat/config -cfA ~/.asoundrc -cfmb ~/.config/ncmpcpp/bindings -cfmc ~/.config/ncmpcpp/config -cfmpd ~/.config/mpd/mpd.conf -cfM ~/.config/mpd/mpd.conf -er ~/.referbib diff --git a/.scripts/tools/shortcuts b/.scripts/tools/shortcuts index 5c5f3eb..93b1433 100755 --- a/.scripts/tools/shortcuts +++ b/.scripts/tools/shortcuts @@ -3,20 +3,19 @@ # Shell rc file (i.e. bash vs. zsh, etc.) shellrc="$HOME/.bashrc" -# Config locations -folders="$HOME/.key_directories" -configs="$HOME/.key_files" +# Bookmark file locations +bmdirs="$HOME/.bmdirs" +bmfiles="$HOME/.bmfiles" -# Output locations +# Output locations. Unactivated progs should go to /dev/null. shell_shortcuts="$HOME/.shortcuts" ranger_shortcuts="$HOME/.config/ranger/shortcuts.conf" -#qute_shortcuts="$HOME/.config/qutebrowser/shortcuts.py" qute_shortcuts="/dev/null" -fish_shortcuts="$HOME/.config/fish/shortcuts.fish" +fish_shortcuts="/dev/null" -# Remove +# Remove, prepare files rm -f "$ranger_shortcuts" "$qute_shortcuts" 2>/dev/null -echo "abbr \\" > "$fish_shortcuts" +#echo "abbr \\" > "$fish_shortcuts" echo "alias \\" > "$shell_shortcuts" # Ensure text of argument 1 exists in the file argument 2 @@ -25,15 +24,15 @@ ensure() { (grep "$1" "$2")>/dev/null 2>&1 || echo "$1" >> "$2" ;} ensure "source $shell_shortcuts" "$shellrc" ensure "source $HOME/.config/ranger/shortcuts.conf" "$HOME/.config/ranger/rc.conf" #ensure "config.source('shortcuts.py')" "$HOME/.config/qutebrowser/config.py" -ensure "source $HOME/.config/fish/shortcuts.fish" "$HOME/.config/fish/config.fish" +#ensure "source $HOME/.config/fish/shortcuts.fish" "$HOME/.config/fish/config.fish" -# Format the `folders` file in the correct syntax and sent it to all three configs. -sed "s/#.*$//;/^$/d" "$folders" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ +# Format the `bmdirs` file in the correct syntax and sent it to all three configs. +sed "s/#.*$//;/^$/d" "$bmdirs" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \ >(awk '{print $1, "\"cd " $2 " ; ls -a\" \\"}' >> "$fish_shortcuts") \ >(awk '{print "config.bind(\";"$1"\", \"set downloads.location.directory "$2" ;; hint links download\")"}' >> "$qute_shortcuts") \ | awk '{print "map g"$1" cd "$2"\nmap t"$1" tab_new "$2"\nmap m"$1" shell mv -v %s "$2"\nmap Y"$1" shell cp -rv %s "$2}' >> "$ranger_shortcuts" # Format the `configs` file in the correct syntax and sent it to both configs. -sed "s/#.*$//;/^$/d" "$configs" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ +sed "s/#.*$//;/^$/d" "$bmfiles" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \ >(awk '{print $1, "\"$EDITOR "$2"\" \\"}' >> "$fish_shortcuts") \ | awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts" -- cgit v1.3.1