Merge branch 'work'

Conflicts:
- .config/dunst/dunstrc
- .config/i3/config
- .local/bin/fuzzy-i3lock

.config/i3/config

@@ -30,7 +30,7 @@ bindsym $mod+Shift+Return exec i3-sensible-editor
 bindsym $mod+Print exec scrot ~/tmp/screenshots/'%Y-%m-%d_%H:%M:%S_$wx$h.png'
 
 # lock screen
-bindsym $mod+Shift+l exec fuzzy-i3lock
+bindsym $mod+Shift+l exec fuzzy-i3lock 37c3
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -157,8 +157,8 @@ client.focused #000000 #009900 #ffffff #ff0000
 client.unfocused #000000 #005500 #000000 #ff0000
 
 # use variables for screens
-set $screen0 "DP-1"
-set $screen1 "HDMI-2"
+set $screen0 "eDP-1"
+set $screen1 "HDMI-A-2"
 
 # Start i3bar to display a workspace bar (plus the system information
 # i3status-rust finds out, if available)
@@ -197,5 +197,3 @@ bar {
 	  #client.orientation #ff0000
         }
 }
-
-include ~/.config/i3/config.d/*.conf