shortcut sourcing now non-automatic
This commit is contained in:
parent
0a2e30e54f
commit
e397b40ce7
4 changed files with 9 additions and 24 deletions
8
.bashrc
8
.bashrc
|
@ -9,11 +9,9 @@ stty -ixon # Disable ctrl-s and ctrl-q.
|
||||||
shopt -s autocd #Allows you to cd into directory merely by typing the directory name.
|
shopt -s autocd #Allows you to cd into directory merely by typing the directory name.
|
||||||
HISTSIZE= HISTFILESIZE= # Infinite history.
|
HISTSIZE= HISTFILESIZE= # Infinite history.
|
||||||
|
|
||||||
# Setting Bash prompt. Capitalizes username and host if root user (my root user uses this same config file).
|
export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
|
||||||
if [ "$EUID" -ne 0 ]
|
|
||||||
then export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
|
[ -f "$HOME/.shortcuts" ] && source "$HOME/.shortcuts" # Load shortcut aliases
|
||||||
else export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]ROOT\[$(tput setaf 2)\]@\[$(tput setaf 4)\]$(hostname | awk '{print toupper($0)}') \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
|
|
||||||
fi
|
|
||||||
|
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
|
|
|
@ -515,3 +515,6 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po
|
||||||
#Downloading
|
#Downloading
|
||||||
map ytv console shell youtube-dl -ic%space
|
map ytv console shell youtube-dl -ic%space
|
||||||
map yta console shell youtube-dl -xic%space
|
map yta console shell youtube-dl -xic%space
|
||||||
|
|
||||||
|
# Source shortcuts
|
||||||
|
source ~/.config/ranger/shortcuts.conf
|
||||||
|
|
0
.config/ranger/shortcuts.conf
Normal file
0
.config/ranger/shortcuts.conf
Normal file
|
@ -1,12 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Shell rc file (i.e. bash vs. zsh, etc.)
|
|
||||||
shellrc="$HOME/.bashrc"
|
|
||||||
|
|
||||||
# Bookmark file locations
|
|
||||||
bmdirs="$HOME/.bmdirs"
|
|
||||||
bmfiles="$HOME/.bmfiles"
|
|
||||||
|
|
||||||
# Output locations. Unactivated progs should go to /dev/null.
|
# Output locations. Unactivated progs should go to /dev/null.
|
||||||
shell_shortcuts="$HOME/.shortcuts"
|
shell_shortcuts="$HOME/.shortcuts"
|
||||||
ranger_shortcuts="$HOME/.config/ranger/shortcuts.conf"
|
ranger_shortcuts="$HOME/.config/ranger/shortcuts.conf"
|
||||||
|
@ -15,24 +7,16 @@ fish_shortcuts="/dev/null"
|
||||||
|
|
||||||
# Remove, prepare files
|
# Remove, prepare files
|
||||||
rm -f "$ranger_shortcuts" "$qute_shortcuts" 2>/dev/null
|
rm -f "$ranger_shortcuts" "$qute_shortcuts" 2>/dev/null
|
||||||
#echo "abbr \\" > "$fish_shortcuts"
|
echo "abbr \\" > "$fish_shortcuts"
|
||||||
echo "alias \\" > "$shell_shortcuts"
|
echo "alias \\" > "$shell_shortcuts"
|
||||||
|
|
||||||
# Ensure text of argument 1 exists in the file argument 2
|
|
||||||
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"
|
|
||||||
|
|
||||||
# Format the `bmdirs` file in the correct syntax and sent it to all three configs.
|
# 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") \
|
sed "s/\s*#.*$//;/^\s*$/d" "$HOME/.bmdirs" | tee >(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$shell_shortcuts") \
|
||||||
>(awk '{print $1, "\"cd " $2 "; and ls -a\" \\"}' >> "$fish_shortcuts") \
|
>(awk '{print $1, "\"cd " $2 "; and ls -a\" \\"}' >> "$fish_shortcuts") \
|
||||||
>(awk '{print "config.bind(\";"$1"\", \"set downloads.location.directory "$2" ;; hint links download\")"}' >> "$qute_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"
|
| 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.
|
# Format the `configs` file in the correct syntax and sent it to both configs.
|
||||||
sed "s/#.*$//;/^$/d" "$bmfiles" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \
|
sed "s/\s*#.*$//;/^$\s*/d" "$HOME/.bmfiles" | tee >(awk '{print $1"=\"$EDITOR "$2"\" \\"}' >> "$shell_shortcuts") \
|
||||||
>(awk '{print $1, "\"$EDITOR "$2"\" \\"}' >> "$fish_shortcuts") \
|
>(awk '{print $1, "\"$EDITOR "$2"\" \\"}' >> "$fish_shortcuts") \
|
||||||
| awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts"
|
| awk '{print "map "$1" shell $EDITOR "$2}' >> "$ranger_shortcuts"
|
||||||
|
|
Loading…
Reference in a new issue