Merge branch 'master' of github.com:mvertes/dotfiles

8 files changed, 28 insertions, 152 deletions

diff --git a/.bashrc b/.bashrc
index 2138f37..ad2ab95 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/.i3status.conf b/.config/i3status/config
index 31c0a8d..0cea047 100644
--- a/.i3status.conf
+++ b/.config/i3status/config
@@ -12,7 +12,7 @@ general {
         interval = 5
 }
 
-order += "read_file hostname"
+#order += "read_file hostname"
 #order += "ipv6"
 order += "wireless _first_"
 #order += "ethernet _first_"
@@ -22,8 +22,8 @@ order += "disk /"
 order += "cpu_usage"
 #order += "load"
 order += "memory"
-order += "volume master"
 order += "cpu_temperature 0"
+order += "volume master"
 order += "tztime local"
 
 read_file hostname {
@@ -43,7 +43,7 @@ ethernet _first_ {
         format_down = "E: down"
 }
 
-# 
+#
 battery all {
 	last_full_capacity = true
 	integer_battery_capacity = true
@@ -93,11 +93,8 @@ memory {
 }
 
 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"
+	format = "🌡 %degrees °C"
+	path = "/sys/devices/platform/coretemp.0/hwmon/hwmon*/temp?_input"
 }
 
 tztime local {
@@ -107,7 +104,7 @@ tztime local {
 }
 
 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"
+        format = "🔈 %volume"
+        format_muted = "🔈 mute (%volume)"
+        device = "default"
 }
diff --git a/.config/sway/config b/.config/sway/config
index 3419359..e014f3a 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,14 @@ 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 XF86AudioMute        exec pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -USR1 i3status
+bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pkill -USR1 i3status
+bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% && pkill -USR1 i3status
+bindsym F9 exec pactl set-sink-mute @DEFAULT_SINK@ toggle && pkill -USR1 i3status
+bindsym F10 exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pkill -USR1 i3status
+bindsym F11 exec pactl set-sink-volume @DEFAULT_SINK@ +5% && 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/.mutt/free b/.mutt/free
deleted file mode 100644
index 4694401..0000000
--- a/.mutt/free
+++ /dev/null
@@ -1,8 +0,0 @@
-set folder = "~/Mail/free/"
-set spoolfile = "+INBOX"
-set postponed = "+Drafts"
-set trash = "+Trash"
-set record = ""
-
-set from = "mvertes@free.fr"
-set realname = "Marc Vertes"
diff --git a/.mutt/muttrc b/.mutt/muttrc
deleted file mode 100644
index 817065b..0000000
--- a/.mutt/muttrc
+++ /dev/null
@@ -1,68 +0,0 @@
-set folder=~/Mail/free
-set spoolfile=+/INBOX
-set header_cache=~/.cache/mutt
-auto_view text/html
-alternative_order text/plain text/enriched text/html
-
-color normal            black           default
-
-color hdrdefault        red             default
-color signature         blue            default
-color indicator         black           brightyellow
-color error             brightred       default
-color status            white           blue
-color tree              red             default # the thread tree in the index menu
-color tilde             magenta         default
-color message           blue            default
-color markers           cyan            default
-color attachment        brightmagenta   default
-color search            black           green   # how to hilite searches in the pager
-color quoted            blue            default # quoted text
-color quoted1           magenta         default
-color quoted2           red             default
-color quoted3           green           default
-color quoted4           cyan            default
-color quoted5           blue            default
-color quoted6           magenta         default
-color quoted7           red             default
-color quoted8           green           default
-color quoted9           cyan            default
-color underline         brightgreen     default
-color index             green           default ~F
-
-color header            red             default ^(From|Subject):
-# point out url's
-color body              black           default "((ftp|http|https)://|(file|news):|www\\.)[-a-z0-9_.:]*[a-z0-9](/[^][{} \t\n\r\"<>()]*[^][{} \t\n\r\"<>().,:!])?/?"
-color body              cyan            default [-a-z_0-9.]+@[-a-z_0-9.]+    # e-mail addresses
-
-# smilies and the like
-color body brightgreen default "<[Gg]>"
-color body brightgreen default "<[Bb][Gg]>"
-# see also the variables smileys
-color body black yellow ">?[;:][-^]?[][)(><}{|/DP][)}]*"
-
-#
-#  Mono
-#
-
-mono normal             none            # normal text
-mono indicator          reverse         # actual message
-mono tree               none            # thread arrows
-mono status             reverse         # status line
-#mono error              bold
-mono error              standout
-mono message            none            # info messages
-mono quoted             bold
-mono signature          none
-mono attachment         underline       # MIME attachments
-mono search             reverse         # search matches
-mono tilde              none            # ~ at bottom of msg
-mono markers            bold            # + at beginning of wrapped lines
-mono hdrdefault         none            # default header lines
-mono bold               bold            # hilite bold patterns in body
-mono underline          underline       # hilite underlined patterns in body
-mono header                     bold           "^(from|subject):"
-mono body                       underline      "((ftp|http|https)://|(file|news):|www\\.)[-a-z0-9_.:]*[a-z0-9](/[^][{} \t\n\r\"<>()]*[^][{} \t\n\r\"<>().,:!])?/?"
-mono body                       underline      "[-a-z_0-9.]+@[-a-z_0-9.]+"
-mono body                       bold           "(^| )\\*[-a-z0-9äöüß*]+\\*[,.?]?[ \n]"
-mono body                       underline      "(^| )_[-a-z0-9äöüß_]+_[,.?]?[ \n]"
diff --git a/.otp_accounts.json.gpg b/.otp_accounts.json.gpg
deleted file mode 100644
index e99f48a..0000000
--- a/.otp_accounts.json.gpg
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN PGP MESSAGE-----
-
-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
-0I6oD0UBjnXA
-=OCjq
------END PGP MESSAGE-----
diff --git a/bin/icat b/bin/icat
index d363e09..118de7b 100755
--- a/bin/icat
+++ b/bin/icat
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 # Display images directly in terminal.
-# Tested with xterm v361. Depends on imagemagick convert(1).
+# Tested with xterm v361. Depends on magick(1).
 
 [ "$LC_TERMINAL" = iTerm2 ] && [ -x "$HOME/.iterm2/imgcat" ] && exec "$HOME/.iterm2/imgcat" "$@"
 
@@ -25,7 +25,7 @@ clearline() { printf "\r                                                     \r"
 
 ms=$(maxsize)
 
-# Use convert(1) from imagemagick to output sixel format.
+# Use magick(1) from imagemagick to output sixel format.
 # -flatten uses the terminal background color as transparent layer
 # -resize use the terminal size as bounding box, with a limit of 1000 pixels
 # image is not resized if smaller than limit
@@ -45,7 +45,7 @@ done
 shift $((OPTIND - 1))
 
 [ "$#" = 0 -o "$#" = 1 -a "$1" = - ] && {
-	convert -resize "$ms>" - sixel:-
+	magick - -resize "$ms>" sixel:-
 	exit
 }
 
@@ -58,5 +58,5 @@ for f; do
 	[ "$clear" ] && clear
 	clearline
 	$put "%s\n" "$f"
-	convert -resize "$ms>" -- "$f" sixel:-
+	magick "$f" -resize "$ms>" sixel:-
 done
diff --git a/casque/sennheiser_px100ii/ParametricEQ.txt b/casque/sennheiser_px100ii/ParametricEQ.txt
deleted file mode 100644
index eed7ac5..0000000
--- a/casque/sennheiser_px100ii/ParametricEQ.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Preamp: -6.5 dB
-Filter 1: ON PK Fc 23 Hz Gain 6.3 dB Q 0.95
-Filter 2: ON PK Fc 162 Hz Gain -3.6 dB Q 0.66
-Filter 3: ON PK Fc 6208 Hz Gain 4.1 dB Q 3.63
-Filter 4: ON PK Fc 7884 Hz Gain 4.8 dB Q 2.31
-Filter 5: ON PK Fc 20428 Hz Gain 2.2 dB Q 0.14
-Filter 6: ON PK Fc 685 Hz Gain 0.9 dB Q 1.75
-Filter 7: ON PK Fc 1940 Hz Gain -2.8 dB Q 1.56
-Filter 8: ON PK Fc 2635 Hz Gain 3.4 dB Q 3.46
-Filter 9: ON PK Fc 3997 Hz Gain 3.0 dB Q 2.57
-Filter 10: ON PK Fc 4436 Hz Gain -5.7 dB Q 6.16