From 79ac8a98bbc1d227a4fc4ea9372961310266174d Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <account@voronind.com>
Date: Thu, 28 Mar 2024 14:41:32 +0300
Subject: [PATCH] Foot : Start tmux with user name.

---
 module/sway/module/10-Bluetooth  |  5 -----
 module/sway/module/10-Network    |  5 -----
 module/sway/module/20-Keybind    |  8 +++++++-
 module/sway/module/20-ScratchPad | 17 +++++++++++++++++
 module/sway/module/99-Firefox    |  4 ----
 5 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 100644 module/sway/module/10-Bluetooth
 delete mode 100644 module/sway/module/10-Network
 delete mode 100644 module/sway/module/99-Firefox

diff --git a/module/sway/module/10-Bluetooth b/module/sway/module/10-Bluetooth
deleted file mode 100644
index c0092f2..0000000
--- a/module/sway/module/10-Bluetooth
+++ /dev/null
@@ -1,5 +0,0 @@
-for_window [app_id=".blueman-manager-wrapped"] {
-	move scratchpad
-	scratchpad show
-}
-bindsym $mod+b exec 'blueman-manager'
diff --git a/module/sway/module/10-Network b/module/sway/module/10-Network
deleted file mode 100644
index cff9ac4..0000000
--- a/module/sway/module/10-Network
+++ /dev/null
@@ -1,5 +0,0 @@
-for_window [app_id="nm-connection-editor"] {
-	move scratchpad
-	scratchpad show
-}
-bindsym $mod+n exec 'nm-connection-editor'
diff --git a/module/sway/module/20-Keybind b/module/sway/module/20-Keybind
index 80e6b8c..c017790 100644
--- a/module/sway/module/20-Keybind
+++ b/module/sway/module/20-Keybind
@@ -1,5 +1,5 @@
 # Start a terminal.
-bindsym $mod+Escape exec $term -e bash -c 'tmux new-session -A -s main; bash'
+bindsym $mod+Escape exec $term -e bash -c "tmux new-session -A -s $USER; bash"
 
 # Kill focused window.
 bindsym $mod+x kill
@@ -23,3 +23,9 @@ bindsym $mod+Shift+z exec swaynag -t warning -m 'You pressed the exit shortcut.
 # Show last notification.
 bindsym $mod+m exec makoctl restore
 bindsym $mod+shift+m exec makoctl dismiss --all
+
+# Bluetooth.
+bindsym $mod+b exec 'blueman-manager'
+
+# NetworkManager.
+bindsym $mod+n exec 'nm-connection-editor'
diff --git a/module/sway/module/20-ScratchPad b/module/sway/module/20-ScratchPad
index d6276a5..c37141a 100644
--- a/module/sway/module/20-ScratchPad
+++ b/module/sway/module/20-ScratchPad
@@ -7,3 +7,20 @@ bindsym $mod+shift+return move scratchpad
 # Show the next scratchpad window or hide the focused scratchpad window.
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+return scratchpad show
+
+# Fix for a goddamn Firefox WebRTC indicator.
+for_window [app_id="firefox" title="Firefox — Sharing Indicator"] {
+	kill
+}
+
+# NetworkManager.
+for_window [app_id="nm-connection-editor"] {
+	move scratchpad
+	scratchpad show
+}
+
+# Bluetooth.
+for_window [app_id=".blueman-manager-wrapped"] {
+	move scratchpad
+	scratchpad show
+}
diff --git a/module/sway/module/99-Firefox b/module/sway/module/99-Firefox
deleted file mode 100644
index e956ab0..0000000
--- a/module/sway/module/99-Firefox
+++ /dev/null
@@ -1,4 +0,0 @@
-# Fix for a goddamn Firefox WebRTC indicator.
-for_window [app_id="firefox" title="Firefox — Sharing Indicator"] {
-	kill
-}