From 32bfca483395750f69fcd40e415184ad691fbf25 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Tue, 20 Jun 2023 20:11:33 +0200
Subject: [PATCH 01/15] i3status-rs: Adjust bar to new laptop

Adjust `i3status-rust` bar to new laptop.
---
 .config/i3status-rust/config.toml | 95 ++++++++++++++++---------------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index fd1e336..6e92eba 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -1,5 +1,5 @@
 [icons]
-icons = "awesome"
+icons = "awesome4"
 
 [theme]
 theme = "solarized-dark"
@@ -11,90 +11,91 @@ separator = "|"
 separator_fg = "#00cc00"
 separator_bg = "#222222"
 
-[[block]]
-block = "maildir"
-interval = 15
-inboxes = ["/home/finga/mail/onders.org/Inbox", "/home/finga/mail/chaostreff.at/Inbox"]
-display_type = "new"
-
 [[block]]
 block = "weather"
-format = "$weather $temp, $humidity, $wind m/s $direction"
+format = "$icon $weather $temp, $humidity, $wind m/s $direction "
 service = { name = "openweathermap", api_key = "8271cc3c23dbae82eda2123c55c050be", city_id = "2766824", units = "metric" }
 
 [[block]]
 block = "sound"
 
 [[block]]
-block = "music"
-format = "$combo.rot-str(30) $play"
-player = "mpd"
+block = "net"
+device = "enp2s0f0"
+inactive_format = "$icon x "
+format = "$icon $ip $graph_down $speed_down $graph_up $speed_up via $device "
 
 [[block]]
 block = "net"
-device = "enp0s31f6"
-format = "$ip $graph_down $speed_down $graph_up $speed_up"
+device = "wlp3s0"
+inactive_format = "$icon x "
+format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency "
 
-# [[block]]
-# block = "disk_space"
-# path = "/"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
-# [[block]]
-# block = "disk_space"
-# path = "/home"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/boot"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
-# [[block]]
-# block = "disk_space"
-# path = "/var"
-# info_type = "used"
-# warning = 20.0
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/home"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
-# [[block]]
-# block = "disk_space"
-# path = "/tmp"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/var"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
 [[block]]
 block = "memory"
-display_type = "memory"
-format_mem = "$mem_total_used_percents.eng(3)"
-clickable = false
+format = "$icon $mem_used_percents.eng(w:2) "
 
 [[block]]
 block = "memory"
-display_type = "swap"
-format_swap = "$swap_used_percents.eng(3)"
-clickable = false
+format = "$icon_swap $swap_used_percents.eng(w:2) "
 
 [[block]]
 block = "cpu"
 interval = 1
-format = "$barchart $utilization $frequency.eng(4)"
+format = "$icon $barchart $utilization $frequency.eng(w:4) "
 
 [[block]]
 block = "temperature"
-collapsed = false
-format = "$min min, $max max, $average avg"
-chip = "*-isa-*"
+format = "$icon $min min, $max max, $average avg "
 
 [[block]]
 block = "load"
-format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
+format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
+
+[[block]]
+block = "battery"
+format = " $icon $percentage $time"
 
 [[block]]
 block = "time"
 interval = 1
-format = "%F (%Z) %T"
+format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
 timezone = "Europe/Vienna"
 
 [[block]]
 block = "time"
 interval = 1
-format = "(%Z) %T"
+format = " $icon $timestamp.datetime(f:'(%Z) %T') "
 timezone = "Etc/UTC"

From 36822738e782e917413641e074f1b26216ccd6ba Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Tue, 20 Jun 2023 20:16:14 +0200
Subject: [PATCH 02/15] sway: Migrate to `sway`

Use `sway` as the new wm so migrate the config.
---
 .config/i3/config         | 253 --------------------------------------
 .config/sway/config       | 195 +++++++++++++++++++++++++++++
 .gitignore.d/{i3 => sway} |   3 +-
 3 files changed, 196 insertions(+), 255 deletions(-)
 delete mode 100644 .config/i3/config
 create mode 100644 .config/sway/config
 rename .gitignore.d/{i3 => sway} (76%)

diff --git a/.config/i3/config b/.config/i3/config
deleted file mode 100644
index b393390..0000000
--- a/.config/i3/config
+++ /dev/null
@@ -1,253 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-font pango:monospace 8
-
-# poweroff stuff
-set $mode_system System: (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
-mode "$mode_system" {
-     bindsym l exec --no-startup-id i3exit lock, mode "default"
-     bindsym e exec --no-startup-id i3exit logout, mode "default"
-     bindsym s exec --no-startup-id i3exit suspend, mode "default"
-     bindsym h exec --no-startup-id i3exit hibernate, mode "default"
-     bindsym r exec --no-startup-id i3exit reboot, mode "default"
-     bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default"
-
-     bindsym Return mode "default"
-     bindsym Escape mode "default"
-}
-bindsym $mod+Pause mode "$mode_system"
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# start emacs
-bindsym $mod+Shift+Return exec i3-sensible-editor
-
-# take screenshot
-bindsym $mod+Print exec scrot ~/tmp/screenshots/'%Y-%m-%d_%H:%M:%S_$wx$h.png'
-
-# lock screen
-bindsym $mod+l exec fuzzy-i3lock
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id dmenu_run
-
-# toggle i3bar
-bindsym $mod+m bar hidden_state toggle
-
-# change focus
-bindsym $mod+b focus left
-bindsym $mod+n focus down
-bindsym $mod+p focus up
-bindsym $mod+f focus right
-
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+b move left 25 px
-bindsym $mod+Shift+n move down 25 px
-bindsym $mod+Shift+p move up 25 px
-bindsym $mod+Shift+f move right 25 px
-
-bindsym $mod+Shift+Left move left 25 px
-bindsym $mod+Shift+Down move down 25 px
-bindsym $mod+Shift+Up move up 25 px
-bindsym $mod+Shift+Right move right 25 px
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+c fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-bindsym $mod+q focus child
-
-# Define names for default workspaces for which we configure key bindings later on.
-# We use variables to avoid repeating the names in multiple places.
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8
-bindsym $mod+Shift+9 move container to workspace $ws9
-bindsym $mod+Shift+0 move container to workspace $ws10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-
-# set input keyboard to us english
-bindsym $mod+Control+e exec "ibus engine xkb:us::eng"
-
-# set input keyboard to Chỡ Quố Ngữ (vietnamese)
-bindsym $mod+Control+v exec "ibus engine Unikey"
-
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-
-# 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
-
-# open login screen on another vt (virtual terminal)
-bindsym $mod+Shift+XF86HomePage exec "dm-tool switch-to-greeter"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-        bindsym Right resize shrink width 10 px or 10 ppt
-        bindsym Up resize grow height 10 px or 10 ppt
-        bindsym Down resize shrink height 10 px or 10 ppt
-        bindsym Left resize grow width 10 px or 10 ppt
-
-        bindsym $mod+f resize grow width 10 px or 10 ppt
-        bindsym $mod+n resize shrink height 10 px or 10 ppt
-        bindsym $mod+p resize grow height 10 px or 10 ppt
-        bindsym $mod+b resize shrink width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# constraining floating window size
-# floating_minimum_size 75 x 50
-floating_maximum_size -1 x -1
-
-# colors & style
-new_window normal 1
-new_float normal 1
-client.focused #000000 #009900 #ffffff #ff0000
-client.unfocused #000000 #005500 #000000 #ff0000
-
-# use variables for screens
-set $screen0 "DP-1"
-set $screen1 "HDMI-2"
-
-# Start i3bar to display a workspace bar (plus the system information
-# i3status-rust finds out, if available)
-bar {
-        status_command i3status-rs
-        font pango:DejaVu Sans Mono, forkawesome 8
-        position top
-        tray_output primary
-        workspace_buttons yes
-        mode dock
-        modifier $mod
-        output $screen0
-
-        colors {
-          statusline #00ff00
-          focused_workspace #00cc00 #00ff00 #000000
-          inactive_workspace #00cc00 #008b00 #cccccc
-	  #client.orientation #ff0000
-        }
-}
-bar {
-        status_command i3status-rs ~/.config/i3status-rust/secondary.toml
-        font pango:DejaVu Sans Mono, forkawesome 8
-        position top
-        tray_output primary
-        workspace_buttons yes
-        mode dock
-        modifier $mod
-        output $screen1
-
-        colors {
-          statusline #00ff00
-          focused_workspace #00cc00 #00ff00 #000000
-          inactive_workspace #00cc00 #008b00 #cccccc
-	  #client.orientation #ff0000
-        }
-}
-
-workspace $ws1 output $screen0
-workspace $ws2 output $screen0
-workspace $ws3 output $screen0
-workspace $ws4 output $screen0
-workspace $ws5 output $screen0
-
-workspace $ws10 output $screen1
-workspace $ws9 output $screen1
-workspace $ws8 output $screen1
-workspace $ws7 output $screen1
-workspace $ws6 output $screen1
diff --git a/.config/sway/config b/.config/sway/config
new file mode 100644
index 0000000..c2b4e1e
--- /dev/null
+++ b/.config/sway/config
@@ -0,0 +1,195 @@
+# Basic keys
+set $mod Mod4
+set $left b
+set $down n
+set $up p
+set $right f
+
+# Program variables
+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
+floating_modifier $mod normal
+
+# start a terminal
+bindsym $mod+Return exec $term
+
+# start emacs
+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
+
+# start bemenu (program launcher)
+bindsym $mod+d exec $menu
+
+# reload config
+bindsym $mod+Shift+r reload
+
+# split in horizontal orientation
+bindsym $mod+h splith
+
+# split in vertical orientation
+bindsym $mod+v splitv
+
+# toggle fullscreen mode
+bindsym $mod+c fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+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'
+
+#
+# Moving around:
+#
+# Move your focus around
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
+# Or use $mod+[up|down|left|right]
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# Move the focused window with the same, but add Shift
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+
+# Ditto, with arrow keys
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+#
+# Workspace setup
+#
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# Switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+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+0 workspace number $ws10
+
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+
+#
+# Resizing containers:
+#
+mode "resize" {
+    bindsym Right resize shrink width 10 px or 10 ppt
+    bindsym Up resize grow height 10 px or 10 ppt
+    bindsym Down resize shrink height 10 px or 10 ppt
+    bindsym Left resize grow width 10 px or 10 ppt
+
+    bindsym $mod+$right resize grow width 10 px or 10 ppt
+    bindsym $mod+$down resize shrink height 10 px or 10 ppt
+    bindsym $mod+$up resize grow height 10 px or 10 ppt
+    bindsym $mod+$left resize shrink width 10 px or 10 ppt
+
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+    bindsym $mod+r mode "default"
+}
+
+# resize container
+bindsym $mod+r mode "resize"
+
+# constraining floating window size
+floating_maximum_size -1 x -1
+
+# border style
+default_border normal 1
+
+# floating border style
+default_floating_border normal 1
+
+# colors
+client.focused #000000 #009900 #ffffff #ff0000
+client.unfocused #000000 #005500 #000000 #ff0000
+
+# titlebar style
+titlebar_padding 5 1
+
+# i3status-rust
+bar {
+        status_command i3status-rs
+        font pango:DejaVu Sans Mono, forkawesome 8
+        position top
+
+        colors {
+          statusline #00ff00
+          focused_workspace #00cc00 #00ff00 #000000
+          inactive_workspace #00cc00 #008b00 #cccccc
+        }
+}
+
+include /$HOME/.config/sway/config.d/*
+include /etc/sway/config.d/*
diff --git a/.gitignore.d/i3 b/.gitignore.d/sway
similarity index 76%
rename from .gitignore.d/i3
rename to .gitignore.d/sway
index 9cae4fa..2e0b392 100644
--- a/.gitignore.d/i3
+++ b/.gitignore.d/sway
@@ -1,7 +1,6 @@
 *
-!/.config/i3/config
 !/.config/i3status-rust/config.toml
 !/.config/i3status-rust/secondary.toml
-!/.gitignore.d/i3
+!/.config/sway/config
 !/.local/bin/fuzzy-i3lock
 !/.local/bin/i3-run

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 03/15] 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 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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

From eb5ee66f1ea4d613634f14fca7ecf564a5fe313d Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Mon, 16 Sep 2024 09:06:19 +0200
Subject: [PATCH 13/15] fuzzy-i3lock, fuzzy-swaylock: Fox fuzzy lock script

Add the overlooked fuzzy-swaylock which replaces fuzzy-i3lock.
---
 .gitignore.d/sway         |  2 +-
 .local/bin/fuzzy-i3lock   | 13 -------------
 .local/bin/fuzzy-swaylock | 20 ++++++++++++++++++++
 3 files changed, 21 insertions(+), 14 deletions(-)
 delete mode 100755 .local/bin/fuzzy-i3lock
 create mode 100755 .local/bin/fuzzy-swaylock

diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index e4ec63a..e0c3f31 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -15,5 +15,5 @@
 !/.gitignore.d/sway
 !/.local
 !/.local/bin
-!/.local/bin/fuzzy-i3lock
+!/.local/bin/fuzzy-swaylock
 !/.local/bin/i3-run
diff --git a/.local/bin/fuzzy-i3lock b/.local/bin/fuzzy-i3lock
deleted file mode 100755
index ef62c6b..0000000
--- a/.local/bin/fuzzy-i3lock
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh -e
-#
-# Show a pixelated screenshot as background image of i3lock
-#
-# See <https://faq.i3wm.org/question/83/how-to-run-i3lock-after-computer-inactivity/>
-# Copied from <https://r0tty.org/git/dotfiles/i3/tree/bin/fuzzy-i3lock>
-#
-
-screenshot="${TMPDIR:-/tmp}/fuzzy-i3lock.png"
-
-scrot -o "$screenshot"
-mogrify -scale 10% -scale 1000% "$screenshot"
-exec i3lock -i "$screenshot"
diff --git a/.local/bin/fuzzy-swaylock b/.local/bin/fuzzy-swaylock
new file mode 100755
index 0000000..358230d
--- /dev/null
+++ b/.local/bin/fuzzy-swaylock
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+#
+# Show a pixelated screenshot as background image of i3lock
+#
+# See <https://faq.i3wm.org/question/83/how-to-run-i3lock-after-computer-inactivity/>
+# Copied from <https://r0tty.org/git/dotfiles/i3/tree/bin/fuzzy-i3lock>
+#
+
+screenshot="${TMPDIR:-/tmp}/fuzzy-swaylock.png"
+
+grim "$screenshot"
+
+case $1 in
+    "37c3") mogrify -scale 10% -scale 500% -dither FloydSteinberg -colors 32 -scale 200% "$screenshot"
+            ;;
+    *) mogrify -scale 10% -scale 1000% "$screenshot"
+       ;;
+esac
+
+exec swaylock -i "$screenshot"

From 228a2d7f84c78c4ab09304b71c7d038bf6b6ffbd Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Thu, 19 Sep 2024 00:19:29 +0200
Subject: [PATCH 14/15] workspaces: Extract workspace config

Extract the configuration for workspaces so it is contained in a
specific file.
---
 .config/sway/config              | 38 --------------------------------
 .config/sway/config.d/workspaces | 37 +++++++++++++++++++++++++++++++
 .gitignore.d/sway                |  1 +
 3 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 .config/sway/config.d/workspaces

diff --git a/.config/sway/config b/.config/sway/config
index 10e6c6d..6e9ef16 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -85,44 +85,6 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
-#
-# Workspace setup
-#
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# Switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-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 $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# Move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
 #
 # Resizing containers:
 #
diff --git a/.config/sway/config.d/workspaces b/.config/sway/config.d/workspaces
new file mode 100644
index 0000000..f631673
--- /dev/null
+++ b/.config/sway/config.d/workspaces
@@ -0,0 +1,37 @@
+#
+# Workspace setup
+#
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# Switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+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 $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+
+# Move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
diff --git a/.gitignore.d/sway b/.gitignore.d/sway
index e0c3f31..af41fb2 100644
--- a/.gitignore.d/sway
+++ b/.gitignore.d/sway
@@ -11,6 +11,7 @@
 !/.config/sway/config.d/dunst
 !/.config/sway/config.d/media
 !/.config/sway/config.d/screenlock
+!/.config/sway/config.d/workspaces
 !/.gitignore.d
 !/.gitignore.d/sway
 !/.local

From e857d100d8575bbeb64fa9126965d9b74c6e9e6b Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Thu, 19 Sep 2024 00:21:45 +0200
Subject: [PATCH 15/15] workspaces: Add 0th, 11th and 12th workspaces

---
 .config/sway/config.d/workspaces | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.config/sway/config.d/workspaces b/.config/sway/config.d/workspaces
index f631673..4560d67 100644
--- a/.config/sway/config.d/workspaces
+++ b/.config/sway/config.d/workspaces
@@ -1,6 +1,7 @@
 #
 # Workspace setup
 #
+set $ws0 "0"
 set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
@@ -11,8 +12,11 @@ set $ws7 "7"
 set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
+set $ws11 "11"
+set $ws12 "12"
 
 # Switch to workspace
+bindsym $mod+grave workspace number $ws0
 bindsym $mod+1 workspace number $ws1
 bindsym $mod+2 workspace number $ws2
 bindsym $mod+3 workspace number $ws3
@@ -23,8 +27,11 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
+bindsym $mod+minus workspace number $ws11
+bindsym $mod+equal workspace number $ws12
 
 # Move focused container to workspace
+bindsym $mod+Shift+grave move container to workspace number $ws0
 bindsym $mod+Shift+1 move container to workspace number $ws1
 bindsym $mod+Shift+2 move container to workspace number $ws2
 bindsym $mod+Shift+3 move container to workspace number $ws3
@@ -35,3 +42,5 @@ bindsym $mod+Shift+7 move container to workspace number $ws7
 bindsym $mod+Shift+8 move container to workspace number $ws8
 bindsym $mod+Shift+9 move container to workspace number $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10
+bindsym $mod+Shift+underscore move container to workspace number $ws11
+bindsym $mod+Shift+plus move container to workspace number $ws12