From e70c306ca98451726f67949a289f9f770789da09 Mon Sep 17 00:00:00 2001
From: eoli3n <jonathan.kirszling@runbox.com>
Date: Sat, 10 Dec 2022 17:22:24 +0100
Subject: [PATCH] powermenu swaylock

---
 roles/sway/files/swaylock.fish       |  4 ++++
 roles/sway/tasks/main.yml            | 15 +++++----------
 roles/sway/templates/config.j2       |  1 +
 roles/wofi/templates/powermenu.sh.j2 |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 roles/sway/files/swaylock.fish

diff --git a/roles/sway/files/swaylock.fish b/roles/sway/files/swaylock.fish
new file mode 100644
index 0000000..8f800f2
--- /dev/null
+++ b/roles/sway/files/swaylock.fish
@@ -0,0 +1,4 @@
+# Defined in - @ line 1
+function swaylock --description 'alias swaylock'
+    swaylock-fancy --font "JetBrains-Mono-Light";
+end
diff --git a/roles/sway/tasks/main.yml b/roles/sway/tasks/main.yml
index 7ed9245..f3025e5 100644
--- a/roles/sway/tasks/main.yml
+++ b/roles/sway/tasks/main.yml
@@ -15,16 +15,6 @@
     src: sway.fish.j2
     dest: ~/.config/fish/conf.d/sway.fish
 
-- name: create swaylock dir config
-  file:
-    path: ~/.config/swaylock/
-    state: directory
-
-- name: copy swaylock config
-  copy:
-    src: swaylock.config
-    dest: ~/.config/swaylock/config
-
 - name: copy gsettings importer
   copy:
     src: import-gsettings
@@ -46,3 +36,8 @@
     src: "kanshi/by_host/{{ ansible_hostname }}/config"
     dest: ~/.config/kanshi/
   failed_when: false
+
+- name: fish swaylock-fancy
+  copy:
+    src: swaylock.fish
+    dest: ~/.config/fish/functions
diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2
index 0134c5e..fde1d42 100644
--- a/roles/sway/templates/config.j2
+++ b/roles/sway/templates/config.j2
@@ -132,6 +132,7 @@ bindsym $mod+less exec variety --next
 bindsym $mod+Control+z exec zim
 bindsym $mod+Control+t exec nemo
 bindsym $mod+Control+p exec pavucontrol
+bindsym $mod+Control+b exec blueman-manager
 
 # bindsym spotify
 bindsym $mod+Control+left exec playerctl -p spotify previous
diff --git a/roles/wofi/templates/powermenu.sh.j2 b/roles/wofi/templates/powermenu.sh.j2
index 74e4b4b..1230756 100755
--- a/roles/wofi/templates/powermenu.sh.j2
+++ b/roles/wofi/templates/powermenu.sh.j2
@@ -4,15 +4,15 @@ action=$(echo -e "suspend\nlock\nlogout\nshutdown\nreboot" | wofi -d -p "power:"
 
 if [[ "$action" == "lock" ]]
 then
-    swaylock-fancy
+    swaylock
 fi
 
 if [[ "$action" == "suspend" ]]
 then
 {% if ansible_distribution_release == "void" %}
-    sudo zzz
+    swaylock && sudo zzz
 {% else %}
-    swaylock-fancy && systemctl suspend && echo '*/reconnect' >~/.weechat/weechat_fifo
+    swaylock && systemctl suspend
 {% endif %}
 fi