Merge branch 'master' of https://forge.o9.re/olivier/dotfiles

.config/i3/config

@@ -190,8 +190,18 @@ bindsym XF86AudioMute exec pactl set-sink-mute $sink toggle # mute sound
 bindsym XF86MonBrightnessUp exec xbacklight -inc 5 # increase screen brightness
 bindsym XF86MonBrightnessDown exec xbacklight -dec 5 # decrease screen brightness
 
+# Player controls (via MPRIS, in example mpv-mpris)
+# play/pause
+bindsym XF86AudioPlay exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause"
+# next file/music/movie
+bindsym XF86AudioNext exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next"
+# previous file/music/movie
+bindsym XF86AudioPrev exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous"
+# stop file/music/movie
+bindsym XF86AudioStop exec "dbus-send --print-reply --dest=org.mpris.MediaPlayer2.mpv /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Stop"
+
 # Lock screen
-bindsym $mod+l exec xscreensaver-command --lock
+bindsym $mod+l exec i3lock -bfte -i ~/.config/i3/matrix-elements-design.png
 
 # Print screen
 bindsym Print exec --no-startup-id scrot '%Y-%m-%d-%s_screenshot_$wx$h.jpg' -e 'mv $f ~/Images/'
@@ -213,13 +223,7 @@ exec_always --no-startup-id "killall picom; picom -b"
 exec --no-startup-id redshift -l 48.666977:7.706748
 
 # Lock screen
-exec_always --no-startup-id xscreensaver  # if not launched via systemd or xinitrc
+exec --no-startup-id xautolock -locker "i3lock -bfte -i ~/.config/i3/matrix-elements-design.png" -corners "--00" -cornersize 30
-
-# XFCE panel instead of i3status
-#exec --no-startup-id xfce4-panel --disable-wm-check
-
-# Time tracking
-#exec --no-startup-id hamster-indicator
 
 # Default terminal
 exec --no-startup-id i3-sensible-terminal
@@ -235,9 +239,6 @@ smart_gaps on
 # https://github.com/blankoworld/dotfiles/blob/master/bin/random_wallpaper)
 exec_always --no-startup-id "kill -9 `ps aux | grep random_wallpaper |grep -v 'grep'| awk '{print $2}'`; random_wallpaper &"
 
-# Network management
-# exec --no-startup-id nm-applet
-
 # Hasmter indicator
 exec --no-startup-id hamster
 

.config/mpv/scripts/mpris.so

@@ -0,0 +1 @@
+/usr/lib/mpv/mpris.so

.config/polybar/config

@@ -335,6 +335,11 @@ type = internal/temperature
 thermal-zone = 0
 warn-temperature = 60
 
+; Full path of temperature sysfs path
+; Use `sensors` to find preferred temperature source, then run
+; $ for i in /sys/class/hwmon/hwmon*/temp*_input; do echo "$(<$(dirname $i)/name): $(cat ${i%_*}_label 2>/dev/null || echo $(basename ${i%_*})) $(readlink -f $i)"; done
+; to find path to desired file
+; Default reverts to thermal zone setting
 hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input
 
 ;format = <ramp> <label>

README.md

@@ -82,6 +82,7 @@ Sont nécessaires :
   * kitty + ttf-fira-code (AUR) pour les fontes avec ligatures
   * mlocate
   * most
+  * i3lock pour le verrouillage de l'écran
   * i3wm-gaps
   * redshift
   * ripgrep
@@ -90,7 +91,6 @@ Sont nécessaires :
   * ttf-dejavu
   * vim + neovim
   * vim-airline + powerline-fonts (pour VIM)
-  * xscreensaver
   * zsh + oh-my-zsh (Cf. https://github.com/robbyrussell/oh-my-zsh) + powerlevel10k (Cf. https://github.com/romkatv/powerlevel10k#oh-my-zsh)
 
 ## Cas de ZSH