5 files changed, 21 insertions, 17 deletions
diff --git a/.config/sway/config b/.config/sway/config
index 36d1bcd..de658df 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,7 +1,3 @@
-# xdg desktop portal fix
-exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=sway
-
 # Set super key
 set $mod Mod4
 
@@ -17,9 +13,12 @@ set $scale 1.25
 # Set background
 set $bg ~/.config/desktop-common/wallpapers/blue.jpg
 
+# Set lockscreen
+set $lock swaylock
+
 # Set Efects
 set $gaps 10
-set $radius 0
+set $radius 5
 set $shadows on
 set $shadow_blur 15
 set $blur enable
@@ -29,8 +28,11 @@ set $blur_passes 3
 # Set browser
 set $browser librewolf
 
-# Autostart apps
-exec $HOME/.config/sway/scripts.d/auto.sh
+# System configs
+include /etc/sway/config.d/*
 
 # Local configs
 include $HOME/.config/sway/config.d/*
+
+# Autostart apps
+exec $HOME/.config/sway/scripts.d/auto.sh
diff --git a/.config/sway/config.d/idle b/.config/sway/config.d/idle
index fb13083..2b239fe 100644
--- a/.config/sway/config.d/idle
+++ b/.config/sway/config.d/idle
@@ -1,5 +1,5 @@
 # Turn off display after tiemout
 exec swayidle -w \
-    timeout 300 'swaylock -f -c 14171d' \
+    timeout 300 'swaylock' \
     timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -f -c 14171d'
+    before-sleep 'swaylock'
diff --git a/.config/sway/config.d/keybinds b/.config/sway/config.d/keybinds
index ba2609e..214be98 100644
--- a/.config/sway/config.d/keybinds
+++ b/.config/sway/config.d/keybinds
@@ -13,13 +13,10 @@ bindsym $mod+d exec $menu
 bindsym $mod+w exec $browser
 
 # Lock screen
-bindsym $mod+Shift+l exec $lock
+bindsym $mod+l exec $lock
 
 # Exit sway
-bindsym Ctrl+Alt+Delete exec killall sway
-
-# Power menu
-bindsym $mod+L exec killall wlogout || wlogout --css ~/.config/desktop-common/logout.d/power/style.css -l ~/.config/desktop-common/logout.d/power/layout
+bindsym $mod+Shift+l exit
 
 # Drag floating windows by holding down $mod and left mouse button.
 # Resize them with right mouse button + $mod.
@@ -49,12 +46,12 @@ bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Screenshot
-bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" 
+bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard"
 bindsym Print exec grim - | wl-copy -t iamge/png && notify-send -t 3000 "Sway" "Full screen copied to clipboard"
 bindsym Shift+Print exec slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
 
 # Michelsoft Binbows
 bindsym Ctrl+$mod+Shift+L exec $browser "https://linkedin.com"
 bindsym Ctrl+$mod+Shift+S exec $term -e sl
-bindsym Ctrl+$mod+Shift+T exec electron25 "https://twitter.com"
-bindsym Ctrl+$mod+Shift+M exec electron25 "https://www.tumblr.com"
+bindsym Ctrl+$mod+Shift+T exec electron28 "https://twitter.com"
+bindsym Ctrl+$mod+Shift+M exec electron28 "https://www.tumblr.com"
diff --git a/.config/sway/config.d/scratch b/.config/sway/config.d/scratch
index 0337319..bdafcf6 100644
--- a/.config/sway/config.d/scratch
+++ b/.config/sway/config.d/scratch
@@ -7,8 +7,12 @@ bindsym $mod+Shift+minus move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+minus scratchpad show
 
+exec ~/.config/sway/scripts.d/scratchpads.sh
+
 for_window [app_id="scratch_term"] move scratchpad, resize set 960 640
 for_window [app_id="scratch_htop"] move scratchpad, resize set 960 640
+for_window [app_id="scratch_calc"] move scratchpad, resize set 960 640
 
 bindsym $mod+y exec ~/.config/sway/scripts.d/scratchpads.sh scratch_term zsh
 bindsym $mod+h exec ~/.config/sway/scripts.d/scratchpads.sh scratch_htop htop
+bindsym $mod+c exec ~/.config/sway/scripts.d/scratchpads.sh scratch_calc matrix
diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh
index 4a4ebb7..4b2334e 100755
--- a/.config/sway/scripts.d/auto.sh
+++ b/.config/sway/scripts.d/auto.sh
@@ -5,3 +5,4 @@ autotiling &
 discord &
 element-desktop &
 thunderbird &
+dino &