Moved packages into variables.

Also cleaned up and added some more stuff that's useful to get awesome going :)

1 files changed, 8 insertions, 4 deletions

diff --git a/deployments/workstation.json b/deployments/workstation.json
index cff9487e..433d249a 100644
--- a/deployments/workstation.json
+++ b/deployments/workstation.json
@@ -1,18 +1,22 @@
 {
     "args" : {
         "password" : "<STDIN>",
+        "_keyboard_layout" : "sv-latin1",
+        "_editor" : "nano",
         "_mediaplayer" : "lollypop gstreamer gst-plugins-good gnome-keyring",
         "_filebrowser" : "nemo gpicview-gtk3",
         "_webbrowser" : "chromium",
-        "_window_manager" : "awesome feh",
-        "_keyboard_layout" : "sv-latin1",
+        "_window_manager" : "awesome",
+        "_window_manager_dependencies" : "xorg-server xorg-xrandr xorg-xinit xterm",
+        "_window_manager_utilities" : "feh slock xscreensaver terminus-font-otb gnu-free-fonts ttf-liberation xsel",
         "_virtulization" : "qemu ovmf",
-        "_utils" : "htop pkgfile",
+        "_utils" : "openssh sshfs git htop pkgfile scrot dhclient wget smbclient cifs-utils",
+        "_audio" : "pulseaudio pulseaudio-alsa pavucontrol",
         "post" : "don't reboot"
     },
     "post" : {
         "Install workstation packages": {
-            "pacman -Syy --noconfirm openssh sshfs git {_webbrowser} {_utils} {_mediaplayer} {_window_manager} {_virtulization} {_filebrowser} dhclient gnu-free-fonts ttf-liberation xorg-server xorg-xrandr xorg-xinit xterm nano wget pulseaudio pulseaudio-alsa pavucontrol smbclient cifs-utils xscreensaver" : {"pass-args" : true}
+            "pacman -Syy --noconfirm {_webbrowser} {_utils} {_mediaplayer} {_window_manager} {_window_manager_dependencies} {_window_manager_utilities} {_virtulization} {_filebrowser} {_editor}" : {"pass-args" : true}
         },
         "Setup virtulization" : {
             "sh -c \"Description=\\\"Bridge for virtual machines\\\"\nInterface=br0\nConnection=bridge\nBindsToInterfaces=(eno1)\nIP=no\nExecUpPost=\\\"ip link set dev br0 address $(cat /sys/class/net/eno1/address); IP=dhcp; ip_set\\\"\nExecDownPre=\\\"IP=dhcp\\\"\n\n## Ignore (R)STP and immediately activate the bridge\nSkipForwardingDelay=yes\"" : null