Add bash functions

bash/.bash_aliases

@@ -0,0 +1,8 @@
+# OSX aliases
+if [ $(uname) == "Darwin" ]; then
+	alias ls="ls -FG"
+else
+	alias ls="ls -F --color=auto"
+fi
+
+alias tma="tmux attach"

bash/.bash_functions

@@ -0,0 +1,28 @@
+
+# Git pulls latest dotfiles
+function update-dotfiles() {
+    if [ -d "${HOME}/.dotfiles" ]; then
+        cd $HOME/.dotfiles
+        git pull --rebase --autostash
+    fi
+    if [ -d "${HOME}/.dotfiles-private" ]; then
+        cd $HOME/.dotfiles-private
+        git pull --rebase --autostash
+    fi
+}
+
+function add-sshkey() {
+    TIMEOUT="1h"
+    NAME=$1
+
+    if [ -z "$NAME" ]; then
+        echo "Current Keys"
+        ssh-add -L
+    else
+        if [ -f "~/.ssh/id_ed25519_${NAME}" ]; then
+            ssh-add -t $TIMEOUT "~/.ssh/id_ed25519_${NAME}"
+        else
+            echo "No key named ${NAME} found..."
+        fi
+    fi
+}

bash/.bashrc

@@ -5,18 +5,16 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+# Source functions, if it exists
+if [ -e $HOME/.bash_functions ]; then
+    source $HOME/.bash_functions
+fi
+
+# Source aliases, if it exists
+if [ -e $HOME/.bash_aliases ]; then
+    source $HOME/.bash_aliases
+fi
+
 # User specific environment
 PATH="$HOME/.local/bin:$HOME/bin:$PATH"
 export PATH
-
-# Uncomment the following line if you don't like systemctl's auto-paging feature:
-# export SYSTEMD_PAGER=
-
-# User specific aliases and functions
-
-# OSX aliases
-if [ $(uname) == "Darwin" ]; then
-	alias ls="ls -FG"
-else
-	alias ls="ls -F --color=auto"
-fi

bin/bin/add-sshkey

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-TIMEOUT="1h"
-NAME=$1
-
-if [ -z "$NAME" ]; then
-    ssh-add -L
-else
-    if [ -f "~/.ssh/id_ed25519_${NAME}" ]; then
-        ssh-add -t $TIMEOUT "~/.ssh/id_ed25519_${NAME}"
-    else
-        echo "No key named ${NAME} found..."
-    fi
-fi

bin/bin/update-dotfiles

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -d "${HOME}/.dotfiles" ]; then
-    cd $HOME/.dotfiles
-    git pull --rebase --autostash
-fi
-if [ -d "${HOME}/.dotfiles-private" ]; then
-    cd $HOME/.dotfiles-private
-    git pull --rebase --autostash
-fi