update bashrc for keiran

users/files/bashrc.jinja

@@ -37,9 +37,6 @@ fi
 alias ll='ls -alF'
 alias la='ls -A'
 alias l='ls -CF'
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
 alias vi='vim'
 
 export EDITOR='vim'
@@ -62,24 +59,15 @@ else
     PS1="[\$(awk {'print \$1'} /proc/loadavg)/\$(grep -c '^processor' /proc/cpuinfo)][\u@\h \w]$ "
 fi
 
-if which apt-get >/dev/null 2>&1; then
+PATH="${PATH}:${HOME}/.local/bin"
-    alias update="sudo apt-get update && sudo apt-get -y upgrade"
-else
-    alias update="yum clean all && yum -y update"
-fi
-
-if [ $(id -u) -gt 0 ]; then
-    alias puppet='sudo puppet'
-    alias fab='sudo fab'
-fi
-
-if test -d ~/.local/bin; then
-  PATH="${PATH}:~/.local/bin"
-fi
 
 alias random='< /dev/urandom tr -dc A-Za-z0-9 | head -c${1:-32};echo'
-
+{%- if bashrc_user is defined and bashrc_user == 'keiran' %}
-{% if bashrc_user is defined and bashrc_user == 'root' and 'restic' in pillar %}
+{#- TODO: this should be in pillar #}
+alias keirmounts=/home/keiran/Documents/scripts/mounts.sh
+alias grive=/home/keiran/Documents/scripts/grive.sh
+{%- endif %}
+{%- if bashrc_user is defined and bashrc_user == 'root' and 'restic' in pillar %}
 export RESTIC_REPOSITORY={{ salt.pillar.get('restic:repo') }}
 export RESTIC_PASSWORD={{ salt.pillar.get('restic:pass') }}
 {% endif %}

users/init.sls

@@ -65,6 +65,8 @@
     - user: {{ user }}
     - group: {{ user }}
     - mode: 0640
+    - context:
+      bashrc_user: {{ user }}
     - require:
       - user: {{ user }}_user
 {% endif %}