From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 17 Jul 2019 09:17:51 +0000 (+0100)
Subject: Source aliases from generic ~/.shell_aliases
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=b3420df065a27747dd69f0f63479a245af0d79f6;p=max%2Fsaltfiles.git

Source aliases from generic ~/.shell_aliases
---

diff --git a/states/aliases/files/aliases b/states/aliases/files/aliases
new file mode 100644
index 0000000..d5cc9d5
--- /dev/null
+++ b/states/aliases/files/aliases
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    alias dir='dir --color=auto'
+    alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+function la {
+    ls_out=$(\ls -lah --color=always "$@")
+    let "allowed_lines = $(tput lines) - 3"
+    if [ $(echo "$ls_out" | wc -l) -le $allowed_lines ]; then
+	echo "$ls_out"
+    else
+	echo "$ls_out" | less -r
+    fi
+}
+alias tmux='TERM=xterm-256color tmux'
+if [ -x /usr/bin/gvim ]; then 
+  alias vim='gvim -v'
+fi
+ 
+
+function ssh_in() {
+  control_file="$TMPDIR/${1}_ssh_in"
+  if [[ -e $control_file ]]; then
+    echo "Session is already open"
+    exit
+  fi
+
+  cat ~/.tmux.conf | ssh \
+    -M \
+    -S "$control_file" \
+    -o ControlPersist=yes \
+    "${1}" \
+    'cat - > ~/.tmux_ssh.conf'
+    
+
+  i3-sensible-terminal -e \
+    sh -c \
+    "ssh \
+      -o RemoteCommand=\"/bin/sh -c 'exec tmux -f ~/.tmux_ssh.conf new -As remote'\" \
+      -S \"$control_file\" \
+      -t \
+      \"$@\"
+    ssh -O exit -S \"$control_file\" \"$1\"" 
+}
diff --git a/states/aliases/init.sls b/states/aliases/init.sls
new file mode 100644
index 0000000..96d442c
--- /dev/null
+++ b/states/aliases/init.sls
@@ -0,0 +1,7 @@
+install aliases file:
+  file.managed:
+    - name: {{ grains['homedir'] }}/.shell_aliases
+    - source: salt://aliases/files/aliases
+    - mode: 640
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
diff --git a/states/bash/files/bashrc b/states/bash/files/bashrc
index 639cca1..a71321a 100644
--- a/states/bash/files/bashrc
+++ b/states/bash/files/bashrc
@@ -17,8 +17,8 @@ HISTFILESIZE=20000
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-if [ -f ~/.bash_aliases ]; then
-  . ~/.bash_aliases
+if [ -f ~/.shell_aliases ]; then
+  . ~/.shell_aliases
 fi
 
 
diff --git a/states/bash/init.sls b/states/bash/init.sls
index f0301c5..fc81c98 100644
--- a/states/bash/init.sls
+++ b/states/bash/init.sls
@@ -5,10 +5,10 @@ bash installed:
 
 include: 
   - user.max
+  - aliases
 
 {%
   set files = [
-    'bash_aliases',
     'bash_profile',
     'bashrc',
     'dir_colors',