dotfiles

commit 47efe6d61e4806e31a07fb3afff0d4978fb73437
parent 01ed33d7364310c5ac5be06bb2fbab01a0bbae91
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Tue, 18 Dec 2018 19:24:37 +0100

Update shortcuts, make paths more general

Diffstat:
M
links/.commands.sh
 | 
1
+
M
links/.config/ranger/rc.conf
 | 
2
+-
M
links/.zshrc
 | 
1
-
M
links/bin/shortcuts
 | 
8
++++----

4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/links/.commands.sh b/links/.commands.sh
@@ -187,3 +187,4 @@ transfer() { # use transfer.sh to share files over the net
     rm -f "$tmpfile"
     echo ""
 } 
+[ -x ~/.shortcuts ] && source ~/.shortcuts
diff --git a/links/.config/ranger/rc.conf b/links/.config/ranger/rc.conf
@@ -515,4 +515,4 @@ map Tn eval fm.open_console('shell eyeD3 -n "" ' + fm.thisfile.relative_path, po
 #Downloading
 map ytv console shell youtube-dl -ic%space
 map yta console shell youtube-dl -xic%space
-source /home/ad/.config/ranger/shortcuts.conf
+source ~/.config/ranger/shortcuts.conf
diff --git a/links/.zshrc b/links/.zshrc
@@ -236,4 +236,3 @@ fi
 [ "$debug_startup" = true ] && zprof || :
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-source /home/ad/.shortcuts
diff --git a/links/bin/shortcuts b/links/bin/shortcuts
@@ -1,8 +1,8 @@
 #!/bin/bash
-# By Luke Smith, https://lukesmith.xyz
+# By Luke Smith, https://lukesmith.xyz with modifications by Anders Damsgaard
 
 # Shell rc file (i.e. bash vs. zsh, etc.)
-shellrc="$HOME/.zshrc"
+shellrc="$HOME/.commands.sh"
 
 # Bookmark file locations
 bmdirs="$HOME/.bmdirs"
@@ -22,8 +22,8 @@ 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 "[ -x ~/.shortcuts ] && source ~/.shortcuts" "$shellrc"
+ensure 'source ~/.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"