From 8edd7fe224ed431ff6f3c5ccc21994cb3ec50a66 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 10 Sep 2018 20:08:35 +0100
Subject: [PATCH] Add shell tasks

---
 dotfiles.yml                                  |  1 +
 .../shell/files => files}/bin/json_format     |  0
 .../shell/files => files}/global-environment  |  0
 {modules/shell/files => files}/tmux.conf      |  0
 {modules/shell/files => files/zshrc}/.zshrc   |  7 ++++
 .../files => files/zshrc}/applications.sh     |  0
 {modules/shell/files => files/zshrc}/base.sh  |  0
 .../shell/files => files/zshrc}/catfish.sh    |  0
 .../files => files/zshrc}/environment.sh      |  0
 .../shell/files => files/zshrc}/javascript.sh |  0
 tasks/shell.yml                               | 34 +++++++++++++++++++
 11 files changed, 42 insertions(+)
 rename {modules/shell/files => files}/bin/json_format (100%)
 rename {modules/shell/files => files}/global-environment (100%)
 rename {modules/shell/files => files}/tmux.conf (100%)
 rename {modules/shell/files => files/zshrc}/.zshrc (82%)
 rename {modules/shell/files => files/zshrc}/applications.sh (100%)
 rename {modules/shell/files => files/zshrc}/base.sh (100%)
 rename {modules/shell/files => files/zshrc}/catfish.sh (100%)
 rename {modules/shell/files => files/zshrc}/environment.sh (100%)
 rename {modules/shell/files => files/zshrc}/javascript.sh (100%)
 create mode 100644 tasks/shell.yml

diff --git a/dotfiles.yml b/dotfiles.yml
index fad6368..da4e40a 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -12,3 +12,4 @@
     - import_tasks: tasks/gnome.yml
     - import_tasks: tasks/i3.yml
     - import_tasks: tasks/services.yml
+    - import_tasks: tasks/shell.yml
diff --git a/modules/shell/files/bin/json_format b/files/bin/json_format
similarity index 100%
rename from modules/shell/files/bin/json_format
rename to files/bin/json_format
diff --git a/modules/shell/files/global-environment b/files/global-environment
similarity index 100%
rename from modules/shell/files/global-environment
rename to files/global-environment
diff --git a/modules/shell/files/tmux.conf b/files/tmux.conf
similarity index 100%
rename from modules/shell/files/tmux.conf
rename to files/tmux.conf
diff --git a/modules/shell/files/.zshrc b/files/zshrc/.zshrc
similarity index 82%
rename from modules/shell/files/.zshrc
rename to files/zshrc/.zshrc
index fb94bda..4fcc127 100644
--- a/modules/shell/files/.zshrc
+++ b/files/zshrc/.zshrc
@@ -29,3 +29,10 @@ export PROMPT="${ret_status} %{$fg_bold[green]%}%n@%m%{$reset_color%}:%{$fg_bold
 COMPLETION_WAITING_DOTS="true"
 
 alias src="source $HOME/.zshrc"
+
+
+{% include "base.sh" %}
+{% include "environment.sh" %}
+{% include "applications.sh" %}
+{% include "catfish.sh" %}
+{% include "javascript.sh" %}
diff --git a/modules/shell/files/applications.sh b/files/zshrc/applications.sh
similarity index 100%
rename from modules/shell/files/applications.sh
rename to files/zshrc/applications.sh
diff --git a/modules/shell/files/base.sh b/files/zshrc/base.sh
similarity index 100%
rename from modules/shell/files/base.sh
rename to files/zshrc/base.sh
diff --git a/modules/shell/files/catfish.sh b/files/zshrc/catfish.sh
similarity index 100%
rename from modules/shell/files/catfish.sh
rename to files/zshrc/catfish.sh
diff --git a/modules/shell/files/environment.sh b/files/zshrc/environment.sh
similarity index 100%
rename from modules/shell/files/environment.sh
rename to files/zshrc/environment.sh
diff --git a/modules/shell/files/javascript.sh b/files/zshrc/javascript.sh
similarity index 100%
rename from modules/shell/files/javascript.sh
rename to files/zshrc/javascript.sh
diff --git a/tasks/shell.yml b/tasks/shell.yml
new file mode 100644
index 0000000..26910c5
--- /dev/null
+++ b/tasks/shell.yml
@@ -0,0 +1,34 @@
+- template:
+    src: ./files/zshrc/.zshrc
+    dest: /home/jake/.zshrc
+    mode: 0644
+    owner: jake
+
+- copy:
+    src: /usr/share/nvm/init-nvm.sh
+    dest: /home/jake/.nvm/nvm.sh
+    mode: 0755
+    owner: jake
+    group: users
+
+- copy:
+    src: ./files/bin
+    dest: /home/jake/.bin
+    mode: 0755
+    owner: jake
+    group: users
+    directory_mode: true
+
+- copy:
+    src: ./files/global-environment
+    dest: /etc/environment
+    mode: 0644
+    owner: root
+    group: root
+
+- copy:
+    src: ./files/tmux.conf
+    dest: /home/jake/.tmux.conf
+    mode: 0755
+    owner: jake
+    group: users