User dirs and sway cleanup

common/bin/dotfiles-setup

@@ -51,7 +51,6 @@ l common/kitty $c/kitty
 l common/mutt/rc $h/.muttrc
 l common/git/config $h/.gitconfig
 l common/elixir/iex.exs $h/.iex.exs
-l common/data/user-dirs $c/user-dirs.dirs
 popd
 
 for s in $c/lytedev-env/*/dotfiles-setup.d.fish

common/htop/rc

@@ -1,7 +1,7 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=47
+sort_key=46
 sort_direction=1
 tree_sort_key=0
 tree_sort_direction=1

os/linux/kanshi/config

@@ -1,20 +1,17 @@
-profile desktop-1x4kside  {
-  output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 0,1200 scale 1 transform normal
-  output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 3440,0 scale 1.5 transform 90
-}
-
-profile desktop-1x4kside2  {
-  output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,800 scale 1 transform normal
-  output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1.5 transform 270
-}
-
 profile desktop-H-2x4kside2  {
-  output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1.5 transform 270
+  output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1 transform 270
-  output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,800 scale 1 transform normal
+  output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 2160,1200 scale 1 transform normal
-  output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 4880,0 scale 1.5 transform 90
+  output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 5600,0 scale 1 transform 90
   exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh"
 }
 
+# profile desktop-H-2x4kside2  {
+#   output "Dell Inc. DELL U2720Q D3TM623" enable mode 3840x2160@60Hz position 0,0 scale 1.5 transform 270
+#   output "Samsung Electric Company CF791 HTRJ500315" enable mode 3440x1440@100Hz position 1440,800 scale 1 transform normal
+#   output "Dell Inc. DELL U2720Q CWTM623" enable mode 3840x2160@60Hz position 4880,0 scale 1.5 transform 90
+#   exec "$DOTFILES_PATH/os/linux/kanshi/desktop-H-workspaces.sh"
+# }
+
 profile tv4k  {
   output "Samsung Electric Company CF791 HTRJ500315" disable
 	output "Samsung Electric Company SyncMaster H1AK500000" enable mode 4096x2160@60Hz position 0,0 scale 1 transform normal
@@ -25,12 +22,6 @@ profile desktop-ultrawide  {
   exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/desktop-single-workspace.sh"
 }
 
-profile laptop-solo {
+profile laptop {
   output "Sharp Corporation 0x144A 0x00000000" enable mode 3200x1800@60Hz position 0,0 scale 2 transform normal
 }
-
-profile laptop-single-ext-mon {
-	output "Dell Inc. DELL U2719DC 9CL4QS2" enable mode 2560x1440@60Hz position 0,0 scale 1 transform normal
-  output "Sharp Corporation 0x144A 0x00000000" enable mode 3200x1800@60Hz position 0,1440 scale 2 transform normal
-  exec "$HOME/.config/lytedev-dotfiles/apps/de/kanshi/laptop-workspaces.sh"
-}

os/linux/kanshi/desktop-H-workspaces.sh

@@ -2,34 +2,21 @@
 
 # kanshi will potentially run this more than once
 LOCKFILE="/tmp/lytedev-kanshi-workspace-arranging.lock"
-if ! [[ -f $LOCKFILE ]]; then
+[[ -f $LOCKFILE ]] && { echo "Already locked: $LOCKFILE" >&2; exit 1; }
-	touch "$LOCKFILE"
-	# TODO: something is pretty broken with sway/kanshi right now
-	sleep 0.1
-	# TODO: some way to ensure the lock file is cleaned up?
-	# maybe check if the file is older than a minute?
 
-	move_workspace() { swaymsg workspace "$1"; swaymsg move workspace to "'$2'"; }
+touch "$LOCKFILE"
-	setup_output() { out="$1"; shift; while (($#)); do move_workspace "$1" "$out"; shift; done; }
+sleep 0.1
 
-	set -x
+move_workspace() { swaymsg workspace "$1"; swaymsg move workspace to "'$2'"; }
-	# setup_output 'Dell Inc. DELL U2719DC 9DL4QS2'            7 8 9
+setup_output() { out="$1"; shift; while (($#)); do move_workspace "$1" "$out"; shift; done; }
-	# setup_output 'Dell Inc. DELL U2719DC 5DL4QS2'            4 5 6
-	# setup_output 'Samsung Electric Company CF791 HTRJ500315' 1 2 3
 
-	setup_output 'Dell Inc. DELL U2720Q CWTM623'             9 8
+set -x
-	setup_output 'Dell Inc. DELL U2720Q D3TM623'             6 5
-	setup_output 'Samsung Electric Company CF791 HTRJ500315' 3 2
-	setup_output 'Dell Inc. DELL U2720Q CWTM623'             7
-	setup_output 'Dell Inc. DELL U2720Q D3TM623'             4
-	setup_output 'Samsung Electric Company CF791 HTRJ500315' 1
 
-	# setup_output 'Dell Inc. DELL U2719DC 9DL4QS2'            8 9 7
+setup_output 'Dell Inc. DELL U2720Q CWTM623'             9 8
-	# setup_output 'Dell Inc. DELL U2719DC 5DL4QS2'            5 6 4
+setup_output 'Dell Inc. DELL U2720Q D3TM623'             6 5
-	# setup_output 'Samsung Electric Company CF791 HTRJ500315' 2 3 1
+setup_output 'Samsung Electric Company CF791 HTRJ500315' 3 2
+setup_output 'Dell Inc. DELL U2720Q CWTM623'             7
+setup_output 'Dell Inc. DELL U2720Q D3TM623'             4
+setup_output 'Samsung Electric Company CF791 HTRJ500315' 1
 
-	rm "$LOCKFILE"
+rm "$LOCKFILE"
-else
-	echo "Already locked: $LOCKFILE" >&2
-	exit 1
-fi

os/linux/sway/config

@@ -157,6 +157,9 @@ mode "resize" {
 	bindsym escape mode "default"
 }
 
+for_window [title="."] title_format "<span background="#111111">%title</span>"
+for_window [app_id="__focused__"] title_format "<span background="#111111">%title</span>"
+
 for_window [app_id="floating_terminal"] floating enable
 for_window [class="floating_terminal"] floating enable
 # for_window [class=".*"] layout splitv