Moved sway to --user service and other fixes

Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>

home/.config/sway/conf.d/03-output.conf

@@ -2,4 +2,4 @@
 
 output * bg $wallpaper fill
 output eDP-1 position 0 0
-output HDMI-A-1 position 1900 0
+output HDMI-A-1 position 1920 0

home/.config/sway/conf.d/04-workspaces.conf

@@ -1,7 +1,7 @@
 # vim:ft=sway
 
 # Start applications in specific workspaces
-assign [title="Telegram"] workspace 3
+assign [app_id="telegramdesktop"] workspace 3
 assign [app_id="thunderbird"] workspace 4
 
 # Automatically switch to urgent workspace

home/.config/sway/conf.d/05-keybinds.conf

@@ -39,7 +39,7 @@ bindsym $mod+Backspace exec makoctl invoke
 bindsym Control+Escape exec makoctl dismiss
 
 # activate lockscreen
-bindsym Control+Shift+Backspace exec loginctl lock-session
+bindsym Control+Shift+Backspace exec loginctl lock-session $(loginctl show-user $USER -p Sessions | cut -d'=' -f2)
 
 # Move your focus around
 bindsym $mod+h focus left

home/.config/sway/env

@@ -1,5 +1,3 @@
-XDG_SESSION_TYPE=wayland
-
 # Fix java on wayland
 _JAVA_AWT_WM_NONREPARENTING=1
 _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel'