From 115499426fd898bce8b14b68446b07ed1e714597 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 22 Oct 2022 14:54:47 -0400
Subject: [PATCH] Move plainmacs to its own role.

---
 ansible/roles/emacs/meta/main.yaml            |  2 +-
 ansible/roles/emacs/tasks/common.yaml         | 11 -------
 .../{emacs => plainmacs}/files/plainmacs      |  0
 ansible/roles/plainmacs/tasks/common.yaml     | 31 +++++++++++++++++++
 ansible/roles/plainmacs/tasks/freebsd.yaml    |  5 +++
 ansible/roles/plainmacs/tasks/linux.yaml      |  6 ++++
 ansible/roles/plainmacs/tasks/main.yaml       |  1 +
 ansible/roles/plainmacs/tasks/peruser.yaml    | 29 +++++++++++++++++
 .../plainmacs/tasks/peruser_freebsd.yaml      |  0
 .../roles/plainmacs/tasks/peruser_linux.yaml  |  0
 10 files changed, 73 insertions(+), 12 deletions(-)
 rename ansible/roles/{emacs => plainmacs}/files/plainmacs (100%)
 create mode 100644 ansible/roles/plainmacs/tasks/common.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/freebsd.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/linux.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/main.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/peruser.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/peruser_freebsd.yaml
 create mode 100644 ansible/roles/plainmacs/tasks/peruser_linux.yaml

diff --git a/ansible/roles/emacs/meta/main.yaml b/ansible/roles/emacs/meta/main.yaml
index d5a22e5..be46a20 100644
--- a/ansible/roles/emacs/meta/main.yaml
+++ b/ansible/roles/emacs/meta/main.yaml
@@ -2,4 +2,4 @@ dependencies:
   - users
   - fonts
   - rust
-  # - plainmacs
+  - plainmacs
diff --git a/ansible/roles/emacs/tasks/common.yaml b/ansible/roles/emacs/tasks/common.yaml
index bdb96ee..d7c1735 100644
--- a/ansible/roles/emacs/tasks/common.yaml
+++ b/ansible/roles/emacs/tasks/common.yaml
@@ -1,14 +1,3 @@
-- name: Install scripts
-  copy:
-    src: "files/{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: 0755
-    owner: root
-    group: wheel
-  loop:
-    - src: plainmacs
-      dest: /usr/local/bin/plainmacs
-
 - import_tasks: tasks/freebsd.yaml
   when: 'os_flavor == "freebsd"'
 
diff --git a/ansible/roles/emacs/files/plainmacs b/ansible/roles/plainmacs/files/plainmacs
similarity index 100%
rename from ansible/roles/emacs/files/plainmacs
rename to ansible/roles/plainmacs/files/plainmacs
diff --git a/ansible/roles/plainmacs/tasks/common.yaml b/ansible/roles/plainmacs/tasks/common.yaml
new file mode 100644
index 0000000..1824b45
--- /dev/null
+++ b/ansible/roles/plainmacs/tasks/common.yaml
@@ -0,0 +1,31 @@
+- name: Install packages
+  package:
+    name:
+      - emacs
+    state: present
+
+- name: Install scripts
+  copy:
+    src: "files/{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: 0755
+    owner: root
+    group: wheel
+  loop:
+    - src: plainmacs
+      dest: /usr/local/bin/plainmacs
+
+- import_tasks: tasks/freebsd.yaml
+  when: 'os_flavor == "freebsd"'
+
+- import_tasks: tasks/linux.yaml
+  when: 'os_flavor == "linux"'
+
+- include_tasks:
+    file: tasks/peruser.yaml
+    apply:
+      become: yes
+      become_user: "{{ initialize_user }}"
+  loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}"
+  loop_control:
+    loop_var: initialize_user
diff --git a/ansible/roles/plainmacs/tasks/freebsd.yaml b/ansible/roles/plainmacs/tasks/freebsd.yaml
new file mode 100644
index 0000000..b417174
--- /dev/null
+++ b/ansible/roles/plainmacs/tasks/freebsd.yaml
@@ -0,0 +1,5 @@
+# - name: Install packages
+#   package:
+#     name:
+#       - foo
+#     state: present
diff --git a/ansible/roles/plainmacs/tasks/linux.yaml b/ansible/roles/plainmacs/tasks/linux.yaml
new file mode 100644
index 0000000..e1835f0
--- /dev/null
+++ b/ansible/roles/plainmacs/tasks/linux.yaml
@@ -0,0 +1,6 @@
+# - name: Install packages
+#   pacman:
+#     name:
+#       - foo
+#     state: present
+#     update_cache: true
diff --git a/ansible/roles/plainmacs/tasks/main.yaml b/ansible/roles/plainmacs/tasks/main.yaml
new file mode 100644
index 0000000..5c1df6c
--- /dev/null
+++ b/ansible/roles/plainmacs/tasks/main.yaml
@@ -0,0 +1 @@
+- import_tasks: tasks/common.yaml
diff --git a/ansible/roles/plainmacs/tasks/peruser.yaml b/ansible/roles/plainmacs/tasks/peruser.yaml
new file mode 100644
index 0000000..111e886
--- /dev/null
+++ b/ansible/roles/plainmacs/tasks/peruser.yaml
@@ -0,0 +1,29 @@
+- include_role:
+    name: per_user
+
+# - name: Create directories
+#   file:
+#     name: "{{ account_homedir.stdout }}/{{ item }}"
+#     state: directory
+#     mode: 0700
+#     owner: "{{ account_name.stdout }}"
+#     group: "{{ group_name.stdout }}"
+#   loop:
+#     - ".config/foo"
+
+# - name: Copy files
+#   copy:
+#     src: "files/{{ item.src }}"
+#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
+#     mode: 0600
+#     owner: "{{ account_name.stdout }}"
+#     group: "{{ group_name.stdout }}"
+#   loop:
+#     - src: foo.conf
+#       dest: .config/foo/foo.conf
+
+- import_tasks: tasks/peruser_freebsd.yaml
+  when: 'os_flavor == "freebsd"'
+
+- import_tasks: tasks/peruser_linux.yaml
+  when: 'os_flavor == "linux"'
diff --git a/ansible/roles/plainmacs/tasks/peruser_freebsd.yaml b/ansible/roles/plainmacs/tasks/peruser_freebsd.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/ansible/roles/plainmacs/tasks/peruser_linux.yaml b/ansible/roles/plainmacs/tasks/peruser_linux.yaml
new file mode 100644
index 0000000..e69de29