From a51d75b8881871954aca514234f03fc0d00b2e27 Mon Sep 17 00:00:00 2001
From: Ivan Reshetnikov <admin@comfycamp.space>
Date: Fri, 26 Apr 2024 23:36:23 +0500
Subject: [PATCH] refactor: create a separate role for sway

---
 desktop.yml                                           | 1 +
 roles/desktop/tasks/main.yml                          | 4 ----
 roles/{desktop => sway}/files/sway.conf               | 0
 roles/{desktop => sway}/files/sway.d/appearance.conf  | 0
 roles/{desktop => sway}/files/sway.d/bar.conf         | 0
 roles/{desktop => sway}/files/sway.d/inputs.conf      | 0
 roles/{desktop => sway}/files/sway.d/keybindings.conf | 0
 roles/{desktop => sway}/files/sway.d/lock.conf        | 0
 roles/{desktop => sway}/files/sway.d/resize.conf      | 0
 roles/{desktop => sway}/files/swaylock                | 0
 roles/sway/tasks/main.yml                             | 4 ++++
 roles/{desktop => sway}/tasks/sway.yml                | 0
 roles/{desktop => sway}/tasks/swaylock.yml            | 0
 13 files changed, 5 insertions(+), 4 deletions(-)
 rename roles/{desktop => sway}/files/sway.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/appearance.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/bar.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/inputs.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/keybindings.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/lock.conf (100%)
 rename roles/{desktop => sway}/files/sway.d/resize.conf (100%)
 rename roles/{desktop => sway}/files/swaylock (100%)
 create mode 100644 roles/sway/tasks/main.yml
 rename roles/{desktop => sway}/tasks/sway.yml (100%)
 rename roles/{desktop => sway}/tasks/swaylock.yml (100%)

diff --git a/desktop.yml b/desktop.yml
index 117b9b4..1a1ec8e 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -2,3 +2,4 @@
   hosts: odhosts
   roles:
     - desktop
+    - sway
diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml
index 73b108b..2fcade0 100644
--- a/roles/desktop/tasks/main.yml
+++ b/roles/desktop/tasks/main.yml
@@ -1,12 +1,8 @@
-- name: Sway
-  import_tasks: sway.yml
 - name: Waybar
   import_tasks: waybar.yml
 - name: Wofi
   import_tasks: wofi.yml
 - name: Dunst
   import_tasks: dunst.yml
-- name: Swaylock
-  import_tasks: swaylock.yml
 - name: Configure XDG
   import_tasks: xdg.yml
diff --git a/roles/desktop/files/sway.conf b/roles/sway/files/sway.conf
similarity index 100%
rename from roles/desktop/files/sway.conf
rename to roles/sway/files/sway.conf
diff --git a/roles/desktop/files/sway.d/appearance.conf b/roles/sway/files/sway.d/appearance.conf
similarity index 100%
rename from roles/desktop/files/sway.d/appearance.conf
rename to roles/sway/files/sway.d/appearance.conf
diff --git a/roles/desktop/files/sway.d/bar.conf b/roles/sway/files/sway.d/bar.conf
similarity index 100%
rename from roles/desktop/files/sway.d/bar.conf
rename to roles/sway/files/sway.d/bar.conf
diff --git a/roles/desktop/files/sway.d/inputs.conf b/roles/sway/files/sway.d/inputs.conf
similarity index 100%
rename from roles/desktop/files/sway.d/inputs.conf
rename to roles/sway/files/sway.d/inputs.conf
diff --git a/roles/desktop/files/sway.d/keybindings.conf b/roles/sway/files/sway.d/keybindings.conf
similarity index 100%
rename from roles/desktop/files/sway.d/keybindings.conf
rename to roles/sway/files/sway.d/keybindings.conf
diff --git a/roles/desktop/files/sway.d/lock.conf b/roles/sway/files/sway.d/lock.conf
similarity index 100%
rename from roles/desktop/files/sway.d/lock.conf
rename to roles/sway/files/sway.d/lock.conf
diff --git a/roles/desktop/files/sway.d/resize.conf b/roles/sway/files/sway.d/resize.conf
similarity index 100%
rename from roles/desktop/files/sway.d/resize.conf
rename to roles/sway/files/sway.d/resize.conf
diff --git a/roles/desktop/files/swaylock b/roles/sway/files/swaylock
similarity index 100%
rename from roles/desktop/files/swaylock
rename to roles/sway/files/swaylock
diff --git a/roles/sway/tasks/main.yml b/roles/sway/tasks/main.yml
new file mode 100644
index 0000000..5e70796
--- /dev/null
+++ b/roles/sway/tasks/main.yml
@@ -0,0 +1,4 @@
+- name: Sway
+  import_tasks: sway.yml
+- name: Swaylock
+  import_tasks: swaylock.yml
diff --git a/roles/desktop/tasks/sway.yml b/roles/sway/tasks/sway.yml
similarity index 100%
rename from roles/desktop/tasks/sway.yml
rename to roles/sway/tasks/sway.yml
diff --git a/roles/desktop/tasks/swaylock.yml b/roles/sway/tasks/swaylock.yml
similarity index 100%
rename from roles/desktop/tasks/swaylock.yml
rename to roles/sway/tasks/swaylock.yml