From 06c722a9caa5a5c75e5dc44584d110bf54ebd010 Mon Sep 17 00:00:00 2001
From: Lilian Roller <lilian.roller@wingcon.com>
Date: Wed, 24 Apr 2019 09:53:29 +0200
Subject: [PATCH] Improve layout for ansible galaxy

---
 defaults/main.yml |  2 +-
 meta/main.yml     |  1 -
 tasks/main.yml    | 11 +++++------
 vars/RedHat.yml   |  1 -
 vars/main.yml     |  2 --
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 32a28b4..337ac87 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -37,4 +37,4 @@ i3_desktop_env:
 i3_packages_extra:
   - ranger
 
-iw3m_user: "{{ user }}"
+i3wm_user: "{{ ansible_user_id }}"
diff --git a/meta/main.yml b/meta/main.yml
index ef53cb3..d341093 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,7 +13,6 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - bionic
-        - disco
     - name: Fedora
       versions:
         - 28
diff --git a/tasks/main.yml b/tasks/main.yml
index 9141e8a..34d0899 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,4 @@
 ---
-
 - name: register variables
   import_tasks: variables.yml
 
@@ -18,17 +17,17 @@
 # create i3 config file
 - name: Creates directory
   file: 
-    path: '/home/{{ iw3m_user }}/.config'
+    path: '/home/{{ i3wm_user }}/.config'
     state: directory
     mode: 0750
-    owner: "{{ iw3m_user }}"
+    owner: "{{ i3wm_user }}"
 
 - name: create i3 config folder
   file:
-    path: '/home/{{ iw3m_user }}/.config/i3/'
+    path: '/home/{{ i3wm_user }}/.config/i3/'
     state: directory
     mode: 0755
-    owner: "{{ iw3m_user }}"
+    owner: "{{ i3wm_user }}"
 
 - name: register i3 config file
   action: stat path="~/.config/i3/config"
@@ -46,7 +45,7 @@
     - name: create i3 config file
       template:
         src: config.j2
-        dest: "/home/{{ iw3m_user }}/.config/i3/config"
+        dest: "/home/{{ i3wm_user }}/.config/i3/config"
 
     - name: check i3 config file
       command: i3 -C
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 0d633dd..bf06435 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -7,4 +7,3 @@ __i3_packages:
   - terminator
   - i3lock
   - dmenu
-
diff --git a/vars/main.yml b/vars/main.yml
index 51a9f13..1918562 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -30,5 +30,3 @@ __i3_workspaces:
   - workspace:
     id: 0
     name: " 0 "
-
-