- Adding the usage of the group grain

- Fixing the fish configuration

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 }}

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

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