Merge branch 'main' of ssh://src.twobees.de/git/dotfiles

diff --combined stow/i3/.config/i3/config
index 12e5bde8d0db066e859267323d51f54fa5f3ee29,914fa404101a4bca456ce83105f89efe5f685378..a398b95f0b27bf18b07c8cea8d44188688e0a28d
--- 1/stow/i3/.config/i3/config
--- 2/stow/i3/.config/i3/config
+++ b/stow/i3/.config/i3/config
@@@ -24,7 -24,7 +24,7 @@@ font pango:monospace 
  
  # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
  # screen before suspend. Use loginctl lock-session to lock your screen.
- exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+ #exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
  bindsym $mod+Control+l exec --no-startup-id i3lock
  
  # NetworkManager is the most popular way to manage wireless networks on Linux,
@@@ -59,7 -59,6 +59,7 @@@ floating_modifier $mo
  bindsym $mod+Return exec ~/.bin/sensible-terminal.sh
  bindsym $mod+Shift+d exec /usr/bin/dolphin
  bindsym $mod+Shift+f exec firefox
 +bindsym $mod+space exec "DISPLAY=:0 setxkbmap -query | grep 'layout:.*us' && setxkbmap de || setxkbmap us"
  # start a terminal
  # use hefault and hope for the best. ... # bindsym $mod+Return exec /usr/bin/gnome-terminal
  
@@@ -79,6 -78,8 +79,6 @@@ bindsym $mod+h focus lef
  bindsym $mod+j focus down
  bindsym $mod+k focus up
  bindsym $mod+l focus right
 -bindsym Control+space focus right
 -bindsym Control+Shift+space focus left
  bindsym Mod1+Tab focus right
  bindsym Mod1+Shift+Tab focus left
  
@@@ -118,7 -119,7 +118,7 @@@ bindsym $mod+e layout toggle spli
  bindsym $mod+Shift+space floating toggle
  
  # change focus between tiling / floating windows
 -bindsym $mod+space focus mode_toggle
 +bindsym alt+Shift focus mode_toggle
  
  # focus the parent container
  bindsym $mod+a focus parent
@@@ -244,8 -245,3 +244,8 @@@ client.unfocused            #1b1b1b   #
  client.focused_inactive     #1b1b1b   #353535   #f0f0f0   #9FA0FF
  Client.urgent               #d64937   #444444   #000000   #d64937
  client.background           #1b1b1b   #353535   #f0f0f0   #9FA0FF
 +
 +
 +
 +for_window [window_role="About"] floating enable
 +for_window [class="vlc"] floating enable