From 13d7c606c244875cf3feee6033c25a6eb1ce796f Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Tue, 20 Jun 2023 14:44:58 +0200
Subject: [PATCH 01/10] dunst: Create `dunst` config

In order to improve visibility of notifications add a custom
configuration.
---
 .config/dunst/dunstrc | 20 ++++++++++++++++++++
 .gitignore.d/sway     |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 .config/dunst/dunstrc

diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
new file mode 100644
index 0000000..c072b8c
--- /dev/null
+++ b/.config/dunst/dunstrc
@@ -0,0 +1,20 @@
+[global]
+    follow = keyboard
+    scale = 2
+    idle_threshold = 3
+    font = Monospace 12
+    history_length = 100
+    corner_radius = 5
+    ignore_dbusclose = true
+    timeout = 0
+    background = "#333333"
+    frame_color = "#009900"
+
+[urgency_low]
+    foreground = "#009900"
+
+[urgency_normal]
+    foreground = "#ffee33"
+
+[urgency_critical]
+    foreground = "#aa3333"
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index 2e0b392..79e853f 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -1,4 +1,5 @@
 *
+!/.config/dunst/dunstrc
 !/.config/i3status-rust/config.toml
 !/.config/i3status-rust/secondary.toml
 !/.config/sway/config

From 28a0adf76ca0b3e58a1750729c42d2eee612a0d3 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Fri, 23 Jun 2023 11:12:07 +0200
Subject: [PATCH 02/10] dunst: Add keybindings for dunst

In order to control dunst from the keyboard create some keybindings.
---
 .config/sway/config.d/dunst | 4 ++++
 .gitignore.d/sway           | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 .config/sway/config.d/dunst

diff --git a/.config/sway/config.d/dunst b/.config/sway/config.d/dunst
new file mode 100644
index 0000000..2803d49
--- /dev/null
+++ b/.config/sway/config.d/dunst
@@ -0,0 +1,4 @@
+# dunst control
+bindsym $mod+period exec dunstctl close
+bindsym $mod+Shift+period exec dunstctl close-all
+bindsym $mod+comma exec dunstctl history-pop
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index 79e853f..4ad37a5 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -3,5 +3,7 @@
 !/.config/i3status-rust/config.toml
 !/.config/i3status-rust/secondary.toml
 !/.config/sway/config
+!/.config/sway/config.d/dunst
+!/.gitignore.d/sway
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run

From 60760861c2f5d2d076d8faa5053e78272dff7f7d Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Fri, 29 Sep 2023 18:31:00 +0200
Subject: [PATCH 03/10] config: Fix workspaces

As the workspace keybindings were broken, fix them.
---
 .config/sway/config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index c2b4e1e..619abae 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -124,8 +124,8 @@ bindsym $mod+4 workspace number $ws4
 bindsym $mod+5 workspace number $ws5
 bindsym $mod+6 workspace number $ws6
 bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $w8
-bindsym $mod+9 workspace number $w9
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
 
 # Move focused container to workspace

From e7b0476c368031117a4978929d7e106654039724 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 14:52:00 +0200
Subject: [PATCH 04/10] media: Extract media key bindings

Extract media key bindings into own file.
---
 .config/sway/config         | 13 -------------
 .config/sway/config.d/media | 12 ++++++++++++
 .gitignore.d/sway           |  1 +
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 .config/sway/config.d/media

diff --git a/.config/sway/config b/.config/sway/config
index 619abae..628288a 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -59,19 +59,6 @@ bindsym $mod+a focus parent
 # focus the child container
 bindsym $mod+q focus child
 
-# media keys
-set $refresh_i3status killall -SIGUSR1 i3status-rs
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
-bindsym $mod+XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
-bindsym $mod+XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-bindsym XF86AudioNext exec --no-startup-id mpc next
-bindsym XF86AudioPlay exec --no-startup-id mpc toggle
-bindsym XF86AudioPrev exec --no-startup-id mpc prev
-bindsym XF86AudioStop exec --no-startup-id mpc stop
-
 # exit sway
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 
diff --git a/.config/sway/config.d/media b/.config/sway/config.d/media
new file mode 100644
index 0000000..02cd8f0
--- /dev/null
+++ b/.config/sway/config.d/media
@@ -0,0 +1,12 @@
+# media keys
+set $refresh_i3status killall -SIGUSR1 i3status-rs
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5% && $refresh_i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
+bindsym $mod+XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -1% && $refresh_i3status
+bindsym $mod+XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +1% && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+bindsym XF86AudioNext exec --no-startup-id mpc next
+bindsym XF86AudioPlay exec --no-startup-id mpc toggle
+bindsym XF86AudioPrev exec --no-startup-id mpc prev
+bindsym XF86AudioStop exec --no-startup-id mpc stop
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index 4ad37a5..b0ec692 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -4,6 +4,7 @@
 !/.config/i3status-rust/secondary.toml
 !/.config/sway/config
 !/.config/sway/config.d/dunst
+!/.config/sway/config.d/media
 !/.gitignore.d/sway
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run

From 1e5bcc0e47e3e78e21960053611b7e6399210bba Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 14:53:13 +0200
Subject: [PATCH 05/10] gitignore: Update gitignore

Recently vcsh also added the intermediate directories to the gitignore
file.
---
 .gitignore.d/sway | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index b0ec692..c6b9e9b 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -1,10 +1,18 @@
 *
+!/.config
+!/.config/dunst
 !/.config/dunst/dunstrc
+!/.config/i3status-rust
 !/.config/i3status-rust/config.toml
 !/.config/i3status-rust/secondary.toml
+!/.config/sway
 !/.config/sway/config
+!/.config/sway/config.d
 !/.config/sway/config.d/dunst
 !/.config/sway/config.d/media
+!/.gitignore.d
 !/.gitignore.d/sway
+!/.local
+!/.local/bin
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run

From 4962c99ca6525050c7d1115b1f2a33d0b12549c7 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 14:58:39 +0200
Subject: [PATCH 06/10] dunst: Improve dunst keybindings

---
 .config/sway/config.d/dunst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.config/sway/config.d/dunst b/.config/sway/config.d/dunst
index 2803d49..f95ae4d 100644
--- a/.config/sway/config.d/dunst
+++ b/.config/sway/config.d/dunst
@@ -1,4 +1,4 @@
 # dunst control
-bindsym $mod+period exec dunstctl close
-bindsym $mod+Shift+period exec dunstctl close-all
-bindsym $mod+comma exec dunstctl history-pop
+bindsym $mod+comma exec dunstctl close
+bindsym $mod+Shift+comma exec dunstctl close-all
+bindsym $mod+period exec dunstctl history-pop

From bbb97eabe3c3551fb9628d55dc68b09e9cff4e9c Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 15:00:13 +0200
Subject: [PATCH 07/10] dunst: Adapt to x13

---
 .config/dunst/dunstrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index c072b8c..f5d371f 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,8 +1,8 @@
 [global]
     follow = keyboard
-    scale = 2
+    scale = 1
     idle_threshold = 3
-    font = Monospace 12
+    font = Monospace 10
     history_length = 100
     corner_radius = 5
     ignore_dbusclose = true

From 4d9617942064912f7fef60dc033bbf56098fca1b Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 15:01:21 +0200
Subject: [PATCH 08/10] i3status-rs: Improve status of wifi

Shorten the length of the frequency.
---
 .config/i3status-rust/config.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index 6e92eba..3bd7671 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -29,7 +29,7 @@ format = "$icon $ip $graph_down $speed_down $graph_up $speed_up via $device "
 block = "net"
 device = "wlp3s0"
 inactive_format = "$icon x "
-format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency "
+format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency.eng(w:3) "
 
 [[block]]
 block = "disk_space"

From 826ebc678e7d2acf823b351f415f600e16169e5a Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 15:02:39 +0200
Subject: [PATCH 09/10] i3status-rs: Change thresholds for disk space

---
 .config/i3status-rust/config.toml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index 3bd7671..d115b80 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -34,32 +34,32 @@ format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency.eng(
 [[block]]
 block = "disk_space"
 path = "/"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/boot"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/home"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 
 [[block]]
 block = "disk_space"
 path = "/var"
-warning = 70.0
-alert = 85.0
+warning = 80.0
+alert = 90.0
 info_type = "used"
 format = "$icon $path $percentage "
 

From 23925c9f34aa3bc486d537e81bc28fc6b3e752a4 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Sat, 27 Apr 2024 15:07:05 +0200
Subject: [PATCH 10/10] screenlock: Extract screenlock config

Extract screenlock config into its own file.
---
 .config/sway/config              | 4 ----
 .config/sway/config.d/screenlock | 3 +++
 .gitignore.d/sway                | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 .config/sway/config.d/screenlock

diff --git a/.config/sway/config b/.config/sway/config
index 628288a..10e6c6d 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -9,7 +9,6 @@ set $right f
 set $term alacritty
 set $editor em
 set $menu bemenu-run -i -p "" --hf "#009900" --hb "#333333"
-set $lock fuzzy-swaylock
 set $screenshot grim
 
 # use mouse + $mod to drag floating windows to their wanted position
@@ -24,9 +23,6 @@ bindsym $mod+Shift+Return exec $editor
 # take screenshot
 bindsym $mod+Print exec $screenshot
 
-# lock screen
-bindsym $mod+l exec $lock
-
 # kill focused window
 bindsym $mod+Shift+q kill
 
diff --git a/.config/sway/config.d/screenlock b/.config/sway/config.d/screenlock
new file mode 100644
index 0000000..019985c
--- /dev/null
+++ b/.config/sway/config.d/screenlock
@@ -0,0 +1,3 @@
+# screenlock
+set $lock fuzzy-swaylock 37c3
+bindsym $mod+Shift+l exec $lock
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index c6b9e9b..e4ec63a 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -10,6 +10,7 @@
 !/.config/sway/config.d
 !/.config/sway/config.d/dunst
 !/.config/sway/config.d/media
+!/.config/sway/config.d/screenlock
 !/.gitignore.d
 !/.gitignore.d/sway
 !/.local