From deb4469e270687494807a41eb46a0078746b19a4 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Mon, 10 Sep 2018 13:58:30 +0100
Subject: [PATCH] Add i3 and services tasks

---
 dotfiles.yml                                  |  2 ++
 {modules/i3/files => files}/compton.conf      |  0
 {modules/i3/files => files}/dunst.conf        |  0
 {modules/i3/files => files}/i3.conf           |  0
 .../i3status-rust.toml                        |  4 +--
 {modules/i3/files => files}/i3status.conf     |  0
 {modules/i3/files => files}/powertop.service  |  0
 tasks/i3.yml                                  | 34 +++++++++++++++++++
 tasks/services.yml                            |  6 ++++
 9 files changed, 44 insertions(+), 2 deletions(-)
 rename {modules/i3/files => files}/compton.conf (100%)
 rename {modules/i3/files => files}/dunst.conf (100%)
 rename {modules/i3/files => files}/i3.conf (100%)
 rename modules/i3/templates/i3status-rust.toml.erb => files/i3status-rust.toml (89%)
 rename {modules/i3/files => files}/i3status.conf (100%)
 rename {modules/i3/files => files}/powertop.service (100%)
 create mode 100644 tasks/i3.yml
 create mode 100644 tasks/services.yml

diff --git a/dotfiles.yml b/dotfiles.yml
index 051bc24..fad6368 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -10,3 +10,5 @@
     - import_tasks: tasks/private.yml
     - import_tasks: tasks/vscode.yml
     - import_tasks: tasks/gnome.yml
+    - import_tasks: tasks/i3.yml
+    - import_tasks: tasks/services.yml
diff --git a/modules/i3/files/compton.conf b/files/compton.conf
similarity index 100%
rename from modules/i3/files/compton.conf
rename to files/compton.conf
diff --git a/modules/i3/files/dunst.conf b/files/dunst.conf
similarity index 100%
rename from modules/i3/files/dunst.conf
rename to files/dunst.conf
diff --git a/modules/i3/files/i3.conf b/files/i3.conf
similarity index 100%
rename from modules/i3/files/i3.conf
rename to files/i3.conf
diff --git a/modules/i3/templates/i3status-rust.toml.erb b/files/i3status-rust.toml
similarity index 89%
rename from modules/i3/templates/i3status-rust.toml.erb
rename to files/i3status-rust.toml
index 3d17923..7ef694c 100644
--- a/modules/i3/templates/i3status-rust.toml.erb
+++ b/files/i3status-rust.toml
@@ -31,11 +31,11 @@ block = "sound"
 interval = 1
 step_width = 2
 
-<% if @trusted['hostname'] == 'too-laptop' -%>
+{% if ansible_fqdn == "TOO-Laptop" %}
 [[block]]
 block = "battery"
 interval = 5
-<% end -%>
+{% endif %}
 
 [[block]]
 block = "time"
diff --git a/modules/i3/files/i3status.conf b/files/i3status.conf
similarity index 100%
rename from modules/i3/files/i3status.conf
rename to files/i3status.conf
diff --git a/modules/i3/files/powertop.service b/files/powertop.service
similarity index 100%
rename from modules/i3/files/powertop.service
rename to files/powertop.service
diff --git a/tasks/i3.yml b/tasks/i3.yml
new file mode 100644
index 0000000..8e18043
--- /dev/null
+++ b/tasks/i3.yml
@@ -0,0 +1,34 @@
+- copy:
+    src: ./files/i3.conf
+    dest: /home/jake/.config/i3/config
+    mode: 0644
+    owner: jake
+    group: users
+
+- copy:
+    src: ./files/i3status.conf
+    dest: /home/jake/.config/i3status/config
+    mode: 0644
+    owner: jake
+    group: users
+
+- copy:
+    src: ./files/compton.conf
+    dest: /home/jake/.config/compton.conf
+    mode: 0644
+    owner: jake
+    group: users
+
+- copy:
+    src: ./files/dunst.conf
+    dest: /home/jake/.config/dunst/dunstrc
+    mode: 0644
+    owner: jake
+    group: users
+
+- template:
+    src: ./files/i3status-rust.toml
+    dest: /home/jake/.config/i3/status.toml
+    mode: 0644
+    owner: jake
+    group: users
diff --git a/tasks/services.yml b/tasks/services.yml
new file mode 100644
index 0000000..ad81ff8
--- /dev/null
+++ b/tasks/services.yml
@@ -0,0 +1,6 @@
+- copy:
+    src: ./files/powertop.service
+    dest: /etc/systemd/system/powertop.service
+    mode: 0644
+    owner: root
+    directory_mode: true