From e711e1f91052aa40386c47e6935182b6b84a9ec2 Mon Sep 17 00:00:00 2001
From: Elijah Lazkani <EliaElLazkani@Gmail.com>
Date: Wed, 1 Mar 2017 23:37:37 -0500
Subject: [PATCH] - Adding the usage of the group grain - Fixing the fish
 configuration

---
 salty/base/fish/init.sls | 20 ++++++++++++++++++--
 salty/base/git/init.sls  |  2 +-
 salty/base/zsh/init.sls  |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/salty/base/fish/init.sls b/salty/base/fish/init.sls
index 2d85be5..2b2ef42 100644
--- a/salty/base/fish/init.sls
+++ b/salty/base/fish/init.sls
@@ -19,7 +19,23 @@ install-oh-my-fish:
     - runas: {{ grains.user }}
     - unless: test -d {{ grains.homedir }}/.local/share/omf
 
-install-bobthefish:
+oh-my-fish-config:
+  file.managed:
+    - name: {{ grains.homedir }}/.config/omf/bundle
+    - source: salt:///fish/files/bundle
+    - user: {{ grains.user }}
+    - group: {{ grains.group }}
+    - force: True
+
+fish-set-theme:
+  file.managed:
+    - name: {{ grains.homedir }}/.config/omf/theme
+    - source: salt:///fish/files/theme
+    - user: {{ grains.user }}
+    - group: {{ grains.group }}
+    - force: True
+
+install-omf-packages:
   cmd.run:
-    - name: fish -c "omf install bobthefish"
+    - name: fish -c "omf install"
     - runas: {{ grains.user }}
diff --git a/salty/base/git/init.sls b/salty/base/git/init.sls
index a642e51..2f501a2 100644
--- a/salty/base/git/init.sls
+++ b/salty/base/git/init.sls
@@ -6,5 +6,5 @@ gitconfig:
     - name: {{ grains.homedir }}/.gitconfig
     - source: salt:///git/files/gitconfig
     - user: {{ grains.user }}
-    - group: {{ grains.user }}
+    - group: {{ grains.group }}
     - force: True
diff --git a/salty/base/zsh/init.sls b/salty/base/zsh/init.sls
index 597b9ea..c1394d8 100644
--- a/salty/base/zsh/init.sls
+++ b/salty/base/zsh/init.sls
@@ -31,7 +31,7 @@ zsh-config:
     - name: {{ grains.homedir }}/.zshrc
     - source: salt:///zsh/files/zshconfig
     - user: {{ grains.user }}
-    - group: {{ grains.user }}
+    - group: {{ grains.group }}
     - template: jinja
     - force: True
 
@@ -40,6 +40,6 @@ bash-config:
     - name: {{ grains.homedir }}/.bashrc
     - source: salt:///zsh/files/bashconfig
     - user: {{ grains.user }}
-    - group: {{ grains.user }}
+    - group: {{ grains.group }}
     - template: jinja
     - force: True