fixup

3 files changed, 13 insertions, 114 deletions

diff --git a/.bashrc b/.bashrc
index c4bcc2f..e491cb7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -88,6 +88,7 @@ alias gtb='go test -v -cpuprofile cpu.out -memprofile mem.out -benchmem -bench'
 alias ww='vi ~/Wiki/home_page.md'
 alias s='vi ~/Wiki/scratch.md'
 alias dotfiles='git --git-dir=$HOME/dotfiles --work-tree=$HOME'
+alias apk='doas apk'
 
 #alias by='go build ./cmd/yaegi'
 #alias cy='cd ~/go/src/github.com/traefik/yaegi'
diff --git a/.config/sway/config b/.config/sway/config
index 3419359..6e94434 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,5 +1,9 @@
 # xwayland disable
 
+# Setup sound
+exec /usr/libexec/pipewire-launcher
+exec dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+
 input * {
 	xkb_layout "fr"
 }
@@ -19,10 +23,12 @@ input "1739:52544:SYNA7DAB:00_06CB:CD40_Touchpad" {
 	natural_scroll enabled
 }
 
-font Monospace 9
+# font Monospace 9
+font pango:MiscFixedSC613 9
 
 set $mod Mod4
 
+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'
 bindsym $mod+q kill
 bindsym $mod+Return exec --no-startup-id foot
 #bindsym $mod+Return exec --no-startup-id xt
@@ -32,6 +38,11 @@ bindsym $mod+Return exec --no-startup-id foot
 #bindsym $mod+d exec --no-startup-id wemenu-run
 bindsym $mod+d exec --no-startup-id fuzzel -T foot
 
+# Use pactl to ajust volume in PulseAudio/PipeWire
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && pkill -USR1 i3status
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pkill -USR1 i3status
+bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -USR1 i3status
+
 for_window [app_id="google-chrome"] floating enable
 for_window [class="firefox"] floating enable
 for_window [class="thunderbird"] floating enable
diff --git a/.i3status.conf b/.i3status.conf
deleted file mode 100644
index 31c0a8d..0000000
--- a/.i3status.conf
+++ /dev/null
@@ -1,113 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-# Some icon chars can be found at https://emojipedia.org/objects/
-
-general {
-        colors = true
-        interval = 5
-}
-
-order += "read_file hostname"
-#order += "ipv6"
-order += "wireless _first_"
-#order += "ethernet _first_"
-order += "battery all"
-order += "disk /"
-#order += "disk /boot"
-order += "cpu_usage"
-#order += "load"
-order += "memory"
-order += "volume master"
-order += "cpu_temperature 0"
-order += "tztime local"
-
-read_file hostname {
-	format = "%content"
-	path = "/etc/hostname"
-}
-
-wireless _first_ {
-        #format_up = "🌐 %essid %quality"
-        #format_up = "📶 %essid %quality"
-        format_up = "📡 %essid %signal %bitrate"
-        format_down = "📡 down"
-}
-
-ethernet _first_ {
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-# 
-battery all {
-	last_full_capacity = true
-	integer_battery_capacity = true
-#	format = "%status %percentage %remaining"
-	format = "%status %percentage %remaining %consumption"
-	status_chr = "⚡🔋"
-        status_bat = "🔋"
-        status_unk = "? UNK"
-        status_full = "⚡🔋"
-	threshold_type = "percentage"
-	low_threshold = 10
-}
-
-#battery 0 {
-#	format = "%status %percentage %remaining %emptytime"
-#	format_down = "No battery"
-#	status_chr = "CHR"
-#	status_bat = "BAT"
-#	status_unk = "UNK"
-#	status_full = "FULL"
-#	path = "/sys/class/power_supply/BAT%d/uevent"
-#	low_threshold = 10
-#}
-
-disk "/" {
-        #format = "📀 %avail"
-        #format = "💽 %avail"
-        format = "/ %avail av."
-}
-
-disk "/boot" {
-        format = "/boot %avail"
-}
-
-cpu_usage {
-	format = "CPU %usage"
-}
-
-load {
-        format = "Load: %1min"
-}
-
-memory {
-        format = "Mem %available av."
-        threshold_degraded = "1G"
-        format_degraded = "MEMORY < %available"
-}
-
-cpu_temperature 0 {
-	format = "🌡%degrees °C"
-	#path = "/sys/class/hwmon/hwmon0/temp1_input"
-	#path = "/sys/class/hwmon/hwmon6/temp1_input"
-	#path = "/sys/class/hwmon/hwmon7/temp1_input"
-	#path = "/sys/class/hwmon/hwmon8/temp1_input"
-}
-
-tztime local {
-        #format = "%Y-%m-%d %H:%M:%S"
-        format = "%a %d %b %H:%M:%S"
-        #format = "📅 %a %d %b ⌚ %H:%M:%S"
-}
-
-volume master {
-        format = "🎜 %volume"
-        format_muted = "🎜 mute (%volume)"
-        device = "pulse:alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink"
-}