Merge branch 'master' into laptop

i3/config

@@ -41,7 +41,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec xfce4-terminal 
+bindsym $mod+Return exec xfce4-terminal
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -110,7 +110,7 @@ bindsym $mod+a focus parent
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
-set $ws1 "1: Firefox"
+set $ws1 "1"
 set $ws2 "2"
 set $ws3 "3"
 set $ws4 "4"
@@ -118,8 +118,8 @@ set $ws5 "5"
 set $ws6 "6"
 set $ws7 "7"
 set $ws8 "8"
-set $ws9 "9: Chat"
-set $ws10 "10: Mail"
+set $ws9 "9"
+set $ws10 "10"
 
 # switch to workspace
 bindsym $mod+1 workspace number $ws1
@@ -158,8 +158,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10; workspace $ws10
 
 # Monitor config
-set $monitor_left eDP1
-set $monitor_right HDMI1
+set $monitor_left DVI-D-0
+set $monitor_right DVI-D-1
 
 workspace $ws1 output $monitor_left
 workspace $ws2 output $monitor_left
@@ -256,12 +256,14 @@ bindsym $mod+Print mode "$mode_screenshot_clipboard"
 bindsym $mod+Ctrl+Right move workspace to output right
 bindsym $mod+Ctrl+Left move workspace to output right
 
-bindsym $mod+c exec rofi_calc 
+bindsym $mod+c exec xfce4-terminal --role floating --hide-scrollbar --title Calculator -e qalc
 bindsym $mod+p exec xwacomcalibrate
 bindsym $mod+t exec thunar
 bindsym $mod+b exec firefox
 bindsym $mod+m exec xfce4-terminal -x mc 
 bindsym $mod+Shift+c exec jupyter-calculator
+bindsym $mod+b exec firefox
+
 workspace_auto_back_and_forth yes
 
 ########## Window settings ##########
@@ -289,9 +291,11 @@ for_window [class="Pamac-manager"] floating enable
 for_window [class="Pamac-updater"] floating enable
 #for_window [class="zoom" title="Chat"] floating enable
 #for_window [class="Thunderbird" instance="Msgcompose"] floating enable
+#
+for_window [window_role=floating] floating enable
 
 ########## Autostart applications ########## 
-exec --no-startup-id "i3-msg 'workspace 9: Chat; append_layout ~/.config/i3/workspace-chat.json'"
+exec --no-startup-id "i3-msg 'workspace 9; append_layout ~/.config/i3/workspace-chat.json'"
 
 exec firefox
 exec thunderbird
@@ -310,10 +314,9 @@ exec --no-startup-id pamac-tray
 exec --no-startup-id msm_notifier
 # Audio
 exec --no-startup-id start-pulseaudio-x11
-# Display setup
-exec_always --no-startup-id /home/julian/.screenlayout/defaultlayout.sh 
-# Background image
-exec_always --no-startup-id "sleep 1; feh --bg-fill /home/julian/nextcloud/space.jpg"
+# Background
+#exec --no-startup-id feh --randomize --bg-fill /home/julian/Pictures/Hintergrundbilder/*
+exec --no-startup-id feh --bg-fill /home/julian/Pictures/Hintergrundbilder/space.jpg
 # Notifications
 exec --no-startup-id dunst -config /home/julian/.config/dunst/dunstrc