check in changes to sync with what is in 'prod'

autostart.conf

@@ -8,7 +8,7 @@ exec export YDOTOOL_SOCKET=/tmp/.ydotool_socket
 exec ydotoold
 
 ##password keyring unlock
-#exec --no-startup-id /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret
+#exec /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret
 
 # start nm-applet for network tray icon
 exec nm-applet
@@ -23,5 +23,6 @@ exec /home/kellya/.config/sway/scripts/workspaces.sh
 exec dex-autostart --autostart --environment sway
 
 exec /home/kellya/bin/bg_rotate_sway.sh
-exec ~/.local/bin/solaar -w hide -b symbolic
+#exec /usr/bin/solaar -w hide -b symbolic
+#exec flatpak run im.nheko.Nheko
 exec swayosd-server

conf.d/key_bindings.conf

@@ -1,7 +1,8 @@
 # keybindings
 # Note, this is for more of a "global" keybindings.  Modes will have their own mode_whatever.conf keybinding
 
-bindsym $mod+Return exec kitty
+bindsym $mod+Return exec ghostty
+#bindsym $mod+Return exec kitty
 
 bindsym Control+$alt+l exec /home/kellya/.config/sway/scripts/lock.sh
 

conf.d/title_bar_icons.conf

@@ -53,6 +53,8 @@ for_window [app_id=^soundux$] title_format "­<span size='120%' font-weight='nor
 for_window [app_id=^virt-manager$] title_format "­<span size='100%' font-weight='normal'>  </span>%title"
 for_window [app_id=^vlc$] title_format "­<span size='110%' font-weight='normal'>󰕼  </span>%title"
 for_window [app_id=^zenity$] title_format "­<span size='110%' font-weight='normal' rise='-1pt'>  </span>%title"
+for_window [app_id=^com.mitchellh.ghostty$] title_format "­<span size='110%' font-weight='normal' rise='-1pt'>󰊠 </span>%title"
+for_window [app_id=^org.gnome.Fractal$] title_format "­<span size='110%' font-weight='normal' rise='-1pt'>౷  </span>%title"
 
 for_window [class=^Ardour$] title_format "­<span size='120%' font-weight='normal'>󰔶  </span>%title"
 for_window [class=^Audacity$|^lmms] title_format "­<span size='110%' font-weight='normal'>  </span>%title"
@@ -85,4 +87,5 @@ for_window [class=^vlc$] title_format "­<span size='120%' font-weight='normal'>
 for_window [class=^Spotify$] title_format "­<span size='120%' font-weight='normal'>  </span>%title"
 for_window [class=^jetbrains-pycharm$] title_format "­<span size='120%' font-weight='normal'>  </span>%title"
 for_window [class=^Slack$] title_format "­<span size='120%' font-weight='normal'>  </span>%title"
-for_window [class=^teams-for-linux$] title_format "­<span size='120%' font-weight='normal'>  </span>%title"
+for_window [class=^teams-for-linux$] title_format "­<span size='120%' font-weight='normal'>󰇷  </span>%title"
+for_window [instance=^element$] title_format "­<span size='120%' font-weight='normal'> ⌺ </span>%title"

conf.d/window_rules.conf

@@ -19,6 +19,8 @@ assign [class="jetbrains-phpstorm"] workspace number $ws4
 assign [class="Slack"] workspace number $ws2
 assign [app_id="org.mozilla.thunderbird"] workspace number $ws6
 assign [class="Joplin"] workspace number $ws6
+assign [instance="element"] workspace number $ws2
+assign [instance="im.nheko.Nheko"] workspace number $ws2
 
 
 #Default floating (copied from https://github.com/jjquin/swayarch/blob/master/.config/sway/config.d/window_rules)

config

@@ -34,5 +34,5 @@ include conf.d/*.conf
 
 include autostart.conf
 focus_on_window_activation focus
-output DP-4 pos 0 0
-output DP-5 pos 1920 0
+output DP-6 pos 0 0
+output DP-7 pos 1920 0

scripts/lock.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 swaylock \
+    -f \
 	--screenshots \
 	--indicator \
 	--indicator-radius 100 \

workspaces.conf

@@ -17,8 +17,8 @@ set $ws7 7
 set $ws8 8
 set $ws9 9
 set $ws10 10
-set $display_1 DP-4
-set $display_2 DP-5
+set $display_1 DP-6
+set $display_2 DP-7
 
 # New workspaces will get fullscreen/tabbed by default
 workspace_layout tabbed