Merge remote-tracking branch 'origin/master'

2 files changed, 12 insertions, 7 deletions

diff --git a/.aliases b/.aliases
index 9b20fca..d629f13 100644
--- a/.aliases
+++ b/.aliases
@@ -7,8 +7,6 @@ alias nb='cd ~/journals; vim index.md; cd -'
 alias todo='cd ~/journals; vim gtd.md; cd -'
 alias vimg='vim +Git +only'
 
-[ -f /usr/bin/xdg-open ] && alias open='xdg-open'
-
 if [ -f /usr/bin/pacman ]; then
     alias S='pacman -S'
     alias Si='pacman -Si'
diff --git a/.functions b/.functions
index b34c848..33d3e0e 100644
--- a/.functions
+++ b/.functions
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 fco () {
     local tags branches target
     branches=$(
@@ -15,11 +17,6 @@ fco () {
     git checkout $(awk '{print $2}' <<<$target)
 }
 
-fjrnl () {
-    title=$(jrnl --short | fzf --tac --no-sort) \
-        && jrnl -on $(echo $title | cut -c 1-16) $1
-}
-
 fs () {
     local session
     session=$(tmux list-sessions -F "#{session_name}" \
@@ -34,3 +31,13 @@ tm() {
   fi
   session=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | fzf --exit-0) &&  tmux $change -t "$session" || echo "No sessions found."
 }
+
+open () {
+    if [ -f /usr/bin/xdg-open ]; then
+        nohup xdg-open "$*" > /dev/null 2>&1 &
+    elif [ -f /usr/bin/open ]; then
+        /usr/bin/open "$*"
+    else
+        echo "No usable program is found"
+    fi
+}