From b721d9b520854d1fd8aacc05da6fd67b60c266ac Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 1 Mar 2025 04:44:04 +0100
Subject: [PATCH] Improve t490s setup.

---
 testing/aptmark/desktop                  |  7 ++
 testing/home/desktop/.config/sway/config | 84 +++++++++++++++++++-----
 2 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/testing/aptmark/desktop b/testing/aptmark/desktop
index 8960b86..9f616cd 100644
--- a/testing/aptmark/desktop
+++ b/testing/aptmark/desktop
@@ -1,4 +1,11 @@
 # wayland usage essentials
 sway
+# dmenu replacement
+wmenu
+# for status.sh to work
+calc
+# xterm replacement
 foot
+# for e.g. chromium to work (and to disappear certain error messages)
+xwayland
 
diff --git a/testing/home/desktop/.config/sway/config b/testing/home/desktop/.config/sway/config
index e995681..d7e9367 100644
--- a/testing/home/desktop/.config/sway/config
+++ b/testing/home/desktop/.config/sway/config
@@ -2,6 +2,12 @@
 include /etc/sway/config-vars.d/*
 include /etc/sway/config.d/*
 
+# font for wm text
+font pango:Terminus 16px
+
+# force "tabbed" as default layout for new windows
+workspace_layout              tabbed
+
 # simple green background
 output * background #559911 solid_color
 
@@ -14,24 +20,72 @@ bar {
   status_command ~/.nonpath_bins/status.sh
 }
 
-# keybindings
+# make Windows key modifier key for all wm actions
 set $mod Mod4
+floating_modifier $mod
+
+# program launcher
+bindsym $mod+d			exec wmenu-run
+bindsym $mod+x			exec wmenu-run
+
+# launch terminal emulator
+bindsym $mod+Return		exec foot
+
+# kill window
+bindsym $mod+Shift+q		kill
+
+# move focus between windows, but not by mouse
+bindsym $mod+Left		focus left
+bindsym $mod+Down		focus down
+bindsym $mod+Up			focus up
+bindsym $mod+Right		focus right
+focus_follows_mouse		no
+
+# move windows
+bindsym $mod+Shift+Left		move left
+bindsym $mod+Shift+Down		move down
+bindsym $mod+Shift+Up		move up
+bindsym $mod+Shift+Right	move right
+
+# resize windows
+bindsym $mod+h			resize shrink width 1 px or 1 ppt
+bindsym $mod+l			resize grow width 1 px or 1 ppt
+bindsym $mod+j			resize shrink height
+bindsym $mod+k			resize grow height
+
+# toggle fullscreen for focused window
+bindsym $mod+f			fullscreen
 
-bindsym $mod+Return exec foot
-bindsym $mod+Shift+q kill
-bindsym $mod+Shift+p exit
+# toggle floating of window, focus on floating or tabbed windows.
+bindsym $mod+Shift+space	floating toggle
+bindsym $mod+space		focus mode_toggle
 
-bindsym $mod+f fullscreen
-bindsym $mod+space focus mode_toggle
-bindsym $mod+Shift+space floating toggle
+# reload config file
+bindsym $mod+Shift+c 		reload
 
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
+# stop wm
+bindsym $mod+Shift+p		exit
 
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
+# switch workspaces
+bindsym $mod+1			workspace 1
+bindsym $mod+2			workspace 2
+bindsym $mod+3			workspace 3
+bindsym $mod+4			workspace 4
+bindsym $mod+5			workspace 5
+bindsym $mod+6			workspace 6
+bindsym $mod+7			workspace 7
+bindsym $mod+8			workspace 8
+bindsym $mod+9			workspace 9
+bindsym $mod+0			workspace 10
 
+# move window to workspace
+bindsym $mod+Shift+1		move workspace 1
+bindsym $mod+Shift+2		move workspace 2
+bindsym $mod+Shift+3		move workspace 3
+bindsym $mod+Shift+4		move workspace 4
+bindsym $mod+Shift+5		move workspace 5
+bindsym $mod+Shift+6		move workspace 6
+bindsym $mod+Shift+7		move workspace 7
+bindsym $mod+Shift+8		move workspace 8
+bindsym $mod+Shift+9		move workspace 9
+bindsym $mod+Shift+0		move workspace 10
-- 
2.30.2