From 7f7c6175af494b0ae155b5649468cf8dee8b246d Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Wed, 20 Nov 2019 10:26:13 +0000
Subject: [PATCH] Switch to FVWM with stalonetray

---
 roles/freebsd/tasks/packages-gui.yml  | 7 ++++++-
 roles/home-gui/files/stalonetrayrc    | 3 +++
 roles/home-gui/files/xsession-freebsd | 4 +++-
 roles/home-gui/tasks/dotfiles.yml     | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 roles/home-gui/files/stalonetrayrc

diff --git a/roles/freebsd/tasks/packages-gui.yml b/roles/freebsd/tasks/packages-gui.yml
index 3cd11b9..1bb349e 100644
--- a/roles/freebsd/tasks/packages-gui.yml
+++ b/roles/freebsd/tasks/packages-gui.yml
@@ -2,7 +2,7 @@
 - name: Install core GUI packages
   become: true
   pkgng:
-    name: drm-kmod mate xdm xorg xterm
+    name: drm-kmod xdm xorg xterm
     state: present
 - name: Install additional GUI packages
   become: true
@@ -11,15 +11,20 @@
     state: present
   vars:
     packages:
+      - adwaita-icon-theme
+      - atril
       - dbus
       - emacs
       - en_GB-libreoffice
       - firefox-esr
+      - fvwm
       - galculator
       - git-gui
       - iosevka
+      - liberation-fonts-ttf
       - libreoffice
       - luit
+      - mate-terminal
       - mpv
       - nextcloudclient
       - redshift
diff --git a/roles/home-gui/files/stalonetrayrc b/roles/home-gui/files/stalonetrayrc
new file mode 100644
index 0000000..e4a93ff
--- /dev/null
+++ b/roles/home-gui/files/stalonetrayrc
@@ -0,0 +1,3 @@
+icon_gravity NE
+grow_gravity NE
+geometry 1x1-0+0
diff --git a/roles/home-gui/files/xsession-freebsd b/roles/home-gui/files/xsession-freebsd
index 35b8837..4122887 100644
--- a/roles/home-gui/files/xsession-freebsd
+++ b/roles/home-gui/files/xsession-freebsd
@@ -1,4 +1,6 @@
 PATH=/usr/bin:/bin:/usr/local/bin
 xrdb -merge ~/.Xresources
 xset b off
-exec ck-launch-session mate-session
+stalonetray &
+redshift &
+exec ssh-agent fvwm
diff --git a/roles/home-gui/tasks/dotfiles.yml b/roles/home-gui/tasks/dotfiles.yml
index 753b0b1..487f6b7 100644
--- a/roles/home-gui/tasks/dotfiles.yml
+++ b/roles/home-gui/tasks/dotfiles.yml
@@ -27,6 +27,10 @@
   copy:
     src: xclock.desktop
     dest: "{{ ansible_env.HOME }}/.config/autostart/xclock.desktop"
+- name: Create stalonetrayrc
+  copy:
+    src: stalonetrayrc
+    dest: "{{ ansible_env.HOME }}/.stalonetrayrc"
 - name: Create FreeBSD xsession file
   copy:
     src: xsession-freebsd