From c370e820c62c7d0ae23541c68291ca5f2809ca73 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 20 Sep 2019 10:19:39 +0100
Subject: [PATCH] Ensure additional optional deps are installed on arch

---
 states/bash/arch.sls    | 3 +++
 states/bash/gentoo.sls  | 4 ++++
 states/bash/init.sls    | 6 +-----
 states/firefox/arch.sls | 3 ++-
 states/pass/arch.sls    | 5 ++++-
 states/setup-arch.sls   | 7 +++++++
 states/sway/arch.sls    | 1 +
 states/vim/arch.sls     | 2 ++
 8 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 states/bash/arch.sls
 create mode 100644 states/bash/gentoo.sls

diff --git a/states/bash/arch.sls b/states/bash/arch.sls
new file mode 100644
index 0000000..a5451b5
--- /dev/null
+++ b/states/bash/arch.sls
@@ -0,0 +1,3 @@
+bash installed:
+  pkg.installed:
+    - name: bash
diff --git a/states/bash/gentoo.sls b/states/bash/gentoo.sls
new file mode 100644
index 0000000..55ca520
--- /dev/null
+++ b/states/bash/gentoo.sls
@@ -0,0 +1,4 @@
+bash installed:
+  pkg.installed:
+    - name: app-shells/bash
+    - refresh: False
diff --git a/states/bash/init.sls b/states/bash/init.sls
index 9d7c2eb..9729404 100644
--- a/states/bash/init.sls
+++ b/states/bash/init.sls
@@ -1,9 +1,5 @@
-bash installed:
-  pkg.installed:
-    - name: app-shells/bash
-    - refresh: False
-
 include: 
+  - bash.{{ grains['os'] | lower }}
   - user.max
   - aliases
   - dircolors
diff --git a/states/firefox/arch.sls b/states/firefox/arch.sls
index 8074266..e391192 100644
--- a/states/firefox/arch.sls
+++ b/states/firefox/arch.sls
@@ -1,3 +1,4 @@
 install firefox:
   pkg.installed:
-    - name: firefox
+    - pkgs:
+      - firefox
diff --git a/states/pass/arch.sls b/states/pass/arch.sls
index 26dce04..820f05a 100644
--- a/states/pass/arch.sls
+++ b/states/pass/arch.sls
@@ -1,5 +1,8 @@
 install pass:
   pkg.installed:
     - pkgs:
-      - pass
+      - pass-git
       - pass-otp
+      - browserpass-firefox
+      - browserpass-chromium
+      - ccid
diff --git a/states/setup-arch.sls b/states/setup-arch.sls
index e69de29..3df286b 100644
--- a/states/setup-arch.sls
+++ b/states/setup-arch.sls
@@ -0,0 +1,7 @@
+install pulseaudio:
+  pkg.installed:
+    - pkgs:
+      - pavucontrol
+      - paprefs
+      - pamixer
+      - pulseaudio
diff --git a/states/sway/arch.sls b/states/sway/arch.sls
index e8d2445..b46cd25 100644
--- a/states/sway/arch.sls
+++ b/states/sway/arch.sls
@@ -4,3 +4,4 @@ install sway:
       - sway 
       - swaylock
       - swayidle
+      - bemenu
diff --git a/states/vim/arch.sls b/states/vim/arch.sls
index c780618..407febd 100644
--- a/states/vim/arch.sls
+++ b/states/vim/arch.sls
@@ -3,3 +3,5 @@ install vim:
     - pkgs:
       - vim
       - vim-molokai
+      - powerline
+      - powerline-fonts
-- 
2.46.2