Split zsh custom cfg into diff files.

Author: bashfulrobot

files/dotfiles/zsh/aliases.zsh

@@ -0,0 +1,7 @@
+# You can put files here to add functionality separated per file, which
+# will be ignored by git.
+# Files on the custom/ directory will be automatically loaded by the init
+# script, in alphabetical order.
+
+alias pcp='rsync -aP'
+alias pmv='rsync -aP --remove-source-files'

files/dotfiles/zsh/zshrc-custom.zsh renamed to files/dotfiles/zsh/general.zsh

@@ -1,6 +1,7 @@
-# This file overrides any settings in the main ~/.zshrc file.
-# - may want to split into different files for plugins,
-#   aliases, ecports, etc.
+# You can put files here to add functionality separated per file, which
+# will be ignored by git.
+# Files on the custom/ directory will be automatically loaded by the init
+# script, in alphabetical order.
 
 # Set Shell Theme
 # - Note this is a custom theme
@@ -9,28 +10,6 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Support additional terminal 
 export TERM=xterm-256color
 
-# My zsh plugins
-plugins=(
-  git
-  ansible
-  aws
-  colored-man-pages
-  colorize
-  common-aliases
-  docker
-  docker-compose
-  github
-  rsync
-  systemd
-  themes
-  tmux
-  ubuntu
-  ufw
-  vscode
-  zsh-syntax-highlighting
-  zsh-autosuggestions
-)
-
 # Daily updates - default is every 2 weeks
 UPDATE_ZSH_DAYS=1
 

files/dotfiles/zsh/plugins.zsh

@@ -0,0 +1,26 @@
+# You can put files here to add functionality separated per file, which
+# will be ignored by git.
+# Files on the custom/ directory will be automatically loaded by the init
+# script, in alphabetical order.
+
+# My zsh plugins
+plugins=(
+  git
+  ansible
+  aws
+  colored-man-pages
+  colorize
+  common-aliases
+  docker
+  docker-compose
+  github
+  rsync
+  systemd
+  themes
+  tmux
+  ubuntu
+  ufw
+  vscode
+  zsh-syntax-highlighting
+  zsh-autosuggestions
+)

local.deploy.test.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+ANSIBLE=$(which ansible-playbook)
+GIT=$(which git)
+MYLOCBASE="$HOME/tmp"
+MYREPO="$MYLOCBASE/bashfulrobot-ansible"
+MYREPORMT="https://github.com/bashfulrobot/bashfulrobot-ansible.git"
+MYPPA="ansible"
+
+$GIT config user.name bashfulrobot
+$GIT config user.email [email protected]
+$GIT config user.editor micro
+
+if [ ! -f "$ANSIBLE" ]; then
+    echo "Ansible not found; beginning install..."
+    echo
+
+    # Bootstrap Ansible
+    sudo apt-get install software-properties-common
+    sudo apt-get update
+    sudo apt-get install git ansible -y
+fi
+
+if [ ! -f $HOME/.ansible.cfg ]; then
+    touch $HOME/.ansible.cfg
+    echo '[defaults]' > $HOME/.ansible.cfg
+    echo 'remote_tmp     = /tmp/$USER/ansible' >> $HOME/.ansible.cfg
+fi
+
+# Get the repo
+
+if [ ! -f $MYREPO/local-test.yml ]; then
+
+mkdir -p $MYLOCBASE
+cd $MYLOCBASE
+$GIT clone $MYREPORMT
+fi
+
+cd $MYREPO
+
+# Get the latest version.
+$GIT pull
+
+# Run ansible-pull no matter what (local dev iteration)
+sudo $ANSIBLE $MYREPO/local-test.yml --connection=local
+
+#sudo rm -rf $HOME/.ansible/

tasks/user/shell.yml

@@ -61,9 +61,23 @@
   become: no
   register: created_zshrc
 
-- name: Placing zshrc-custom.zsh CFG
+- name: Placing general.zsh CFG
   copy:
-    src: files/dotfiles/zsh/zshrc-custom.zsh
-    dest: "/home/{{ myusername }}/.oh-my-zsh/custom/zshrc-custom.zsh"
+    src: files/dotfiles/zsh/general.zsh
+    dest: "/home/{{ myusername }}/.oh-my-zsh/custom/general.zsh"
+    owner: "{{ myusername }}"
+    group: "{{ myusername }}"
+
+- name: Placing plugins.zsh CFG
+  copy:
+    src: files/dotfiles/zsh/plugins.zsh
+    dest: "/home/{{ myusername }}/.oh-my-zsh/custom/plugins.zsh"
+    owner: "{{ myusername }}"
+    group: "{{ myusername }}"
+
+- name: Placing aliases.zsh CFG
+  copy:
+    src: files/dotfiles/zsh/aliases.zsh
+    dest: "/home/{{ myusername }}/.oh-my-zsh/custom/aliases.zsh"
     owner: "{{ myusername }}"
     group: "{{ myusername }}"