From c9c1faef0adf4e8ed84018af971d301fdb47a36d Mon Sep 17 00:00:00 2001
From: Jonas Forsberg <jonas.forsberg@suse.com>
Date: Sat, 1 Aug 2020 15:02:50 +0200
Subject: [PATCH] changed font state to honor username

---
 bin/initDesktop            | 2 ++
 salt/states/fonts/init.sls | 4 ++--
 salt/states/top.sls        | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/initDesktop b/bin/initDesktop
index 69a7681..350e08b 100755
--- a/bin/initDesktop
+++ b/bin/initDesktop
@@ -81,3 +81,5 @@ function do_salt_call(){
 setup_dotfiles
 do_salt_call
 gnome_key_bindings
+
+printf "\n DONE!!!!!!!\n"
diff --git a/salt/states/fonts/init.sls b/salt/states/fonts/init.sls
index 263d6ef..f0948cb 100644
--- a/salt/states/fonts/init.sls
+++ b/salt/states/fonts/init.sls
@@ -1,9 +1,9 @@
 deploy fonts:
   file.recurse:
-    - name: /home/jonas/.fonts
+    - name: {{ salt['user.info']( pillar['username'] ).home }}/.fonts
     - source: salt://fonts/files
     - makedirs: True
-    - user: jonas
+    - user: {{ pillar['username'] }}
     - group: users
     - file_mode: "0644"
     - dir_mode: "0755"
diff --git a/salt/states/top.sls b/salt/states/top.sls
index 66d333c..94dde23 100644
--- a/salt/states/top.sls
+++ b/salt/states/top.sls
@@ -4,3 +4,4 @@ base:
     - packages
     - gbt
     - fonts
+    - vim