diff --git a/autostart.conf b/autostart.conf
index 13effd7..c375357 100644
--- a/autostart.conf
+++ b/autostart.conf
@@ -1,8 +1,6 @@
# Things that will get started automatically at startup
exec /home/kellya/bin/sway_screenshare.sh
-# greenclip for clipboard management
-exec greenclip daemon
exec_always cat /proc/acpi/button/lid/LID/state | awk '{print $2}' | grep -q 'closed' && swaymsg output eDP-1 disable
exec copyq --start-server
exec export YDOTOOL_SOCKET=/tmp/.ydotool_socket
@@ -19,39 +17,29 @@ exec nm-applet
#exec xss-lock -n /usr/libexec/xsecurelock/dimmer -l -- xsecurelock
#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -c 04090e --nofork
-# Load workspace configs
-#exec --no-startup-id "i3-msg 'workspace $ws1; append_layout ~/.config/i3/layout/w1.json'"
-#exec --no-startup-id "i3-msg 'workspace $ws2; append_layout ~/.config/i3/layout/w2.json'"
-#exec --no-startup-id "i3-msg 'workspace $ws3; append_layout ~/.config/i3/layout/w3.json'"
-#exec --no-startup-id "i3-msg 'workspace $ws4; append_layout ~/.config/i3/layout/w4.json'"
-#exec --no-startup-id "i3-msg 'workspace $ws5; append_layout ~/.config/i3/layout/w5.json'"
-#exec --no-startup-id "i3-msg 'workspace $ws6; append_layout ~/.config/i3/layout/w6.json'"
-
-# disable the urgency flags on all windows at startup
-exec ~/bin/disable_startup_urgency.sh
-
# use gnome settings to set gnome things to dark mode by default
exec /usr/libexec/gsd-xsettings
-# Startup logseq
workspace $ws6
-exec /home/kellya/bin/logseq
exec /usr/bin/thunderbird
+exec /home/kellya/bin/logseq
-workspace $ws5
# Start spotify from the stupid flatpak
+workspace $ws5
exec "/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=spotify --file-forwarding com.spotify.Client"
workspace $ws3
-exec "kitty"
-exec "/usr/bin/1password"
+exec kitty
+exec 1password
+workspace $ws2
+exec /opt/teams-for-linux/teams-for-linux
# Always need firefox, so let's just start it
workspace $ws1
-exec firefox
+exec firefox
# start the auto run .desktop files
-exec dex-autostart --autostart --environment i3
+exec dex-autostart --autostart --environment sway
# Start redshift, becuase I like not being blinded at night
#exec --no-startup-id redshift
@@ -59,3 +47,5 @@ exec dex-autostart --autostart --environment i3
# Switch to the terminal/email workspace by default
workspace $ws3
+exec /home/kellya/bin/bg_rotate_sway.sh
+exec ~/.local/bin/solaar -w hide -b symbolic
diff --git a/conf.d/input.conf b/conf.d/input.conf
new file mode 100644
index 0000000..af28d06
--- /dev/null
+++ b/conf.d/input.conf
@@ -0,0 +1,11 @@
+input 1739:52744:SYNA30B3:00_06CB:CE08 {
+ tap enabled
+ natural_scroll disabled
+ dwt enabled
+ accel_profile "adaptive"
+ pointer_accel 0.5 # set mouse sensitivity (between -1 and 1)
+}
+input 1118:64:Microsoft_Microsoft_3-Button_Mouse_with_IntelliEye(TM) {
+ accel_profile "adaptive"
+ pointer_accel 0.5 # set mouse sensitivity (between -1 and 1)
+}
diff --git a/conf.d/key_bindings.conf b/conf.d/key_bindings.conf
index db9ed19..184f593 100644
--- a/conf.d/key_bindings.conf
+++ b/conf.d/key_bindings.conf
@@ -23,7 +23,8 @@ bindsym XF86AudioPrev exec "~/bin/mediakeys.sh previous";
bindsym XF86AudioNext exec "~/bin/mediakeys.sh next";
# display clipboard contents via rofi
-bindsym Control+$alt+h exec rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}'
+#bindsym Control+$alt+h exec rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}'
+bindsym Control+$alt+h exec ~/.local/bin/rofi-copyq
# kill active window
bindsym $mod+q kill
@@ -32,7 +33,10 @@ bindsym $mod+Shift+c reload
# restart i3
bindsym $mod+Shift+r restart
# quit i3
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+e exec "wlogout"
+bindsym Control+Alt+Backspace exec "wlogout"
+bindsym Control+Alt+Delete exec "wlogout"
bindsym $mod+b bar mode hide
bindsym $mod+Shift+b bar mode dock
@@ -94,6 +98,10 @@ bindsym $mod+Shift+8 move container to workspace number $ws8
bindsym $mod+Shift+9 move container to workspace number $ws9
bindsym $mod+Shift+0 move container to workspace number $ws10
+# Move workspace to monitor
+bindsym $mod+Ctrl+greater move workspace to output right
+bindsym $mod+Ctrl+less move workspace to output left
+#
# scratchpad
bindsym $mod+Shift+minus move scratchpad
bindsym $mod+minus scratchpad show
diff --git a/conf.d/prt_scr.conf b/conf.d/prt_scr.conf
index 072ab80..1c34dd6 100644
--- a/conf.d/prt_scr.conf
+++ b/conf.d/prt_scr.conf
@@ -7,4 +7,5 @@ bindsym Shift+Print exec --no-startup-id maim --select "/home/$USER/Pictures/Scr
## Clipboard Screenshots
bindsym Ctrl+Print exec --no-startup-id maim | xclip -selection clipboard -t image/png
bindsym Ctrl+$mod+Print exec --no-startup-id maim --window $(xdotool getactivewindow) | xclip -selection clipboard -t image/png
-bindsym Ctrl+Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
+bindsym Ctrl+Shift+Print exec grim -g "$(slurp -d)" - | wl-copy -t image/png
+#bindsym Ctrl+Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
diff --git a/conf.d/title_bar_icons.conf b/conf.d/title_bar_icons.conf
new file mode 100644
index 0000000..eda2299
--- /dev/null
+++ b/conf.d/title_bar_icons.conf
@@ -0,0 +1,88 @@
+# because wayland is sucky, here is a matching list of nerdfont icons for title bar rewriting.
+# Thanks, I hate it.
+for_window [app_id=^Alacritty$|^foot$|^footclient$|^kitty$|-terminal$] title_format " %title"
+for_window [app_id=^avahi-discover$|^bssh$|^bvnc$] title_format " %title"
+for_window [app_id=^assistant$|^designer$|^linguist$|^qdbusviewer$] title_format " %title"
+for_window [app_id=^audacity$] title_format " %title"
+for_window [app_id=^blender$] title_format " %title"
+for_window [app_id=^com.github.hluk.copyq$] title_format " %title"
+for_window [app_id=^com.usebottles.Bottles$] title_format " %title"
+for_window [app_id=^com.github.tchx84.Flatseal$] title_format " %title"
+for_window [app_id=^com.obsproject.Studio$] title_format " %title"
+for_window [app_id=^corectrl$|^radeon-profile$] title_format " %title"
+for_window [app_id=^de.shorsh.discord-screenaudio$] title_format " %title"
+for_window [app_id=^deluge$] title_format " %title"
+for_window [app_id=^discord$|^webcord$] title_format " %title"
+for_window [app_id=^dolphin$|^nemo$|^org.gnome.Nautilus$|^pcmanfm$|^pcmanfm-qt$|^thunar$] title_format " %title"
+for_window [app_id=^dconf-editor$|^qt5ct$|^qt6ct$] title_format " %title"
+for_window [app_id=^eog$|^eom$|^feh$|^ristretto$|^xviewer$] title_format " %title"
+for_window [app_id=^epiphany$|^org.qutebrowser.qutebrowser$] title_format " %title"
+for_window [app_id=^file-roller$] title_format " %title"
+for_window [app_id=^firefox$|^librewolf$|^firedragon$] title_format " %title"
+for_window [app_id=^galculator$|^gnome-calculator$|^mate-calc$|^org.kde.kalk$|^org.kde.kcalc$|^qalculate-gtk$] title_format " %title"
+for_window [app_id=^gimp-] title_format " %title"
+for_window [app_id=^gnome-boxes$] title_format " %title"
+for_window [app_id=^gnome-mines$] title_format " %title"
+for_window [app_id=^gnome-tetravex$] title_format " %title"
+for_window [app_id=^gtk3-|^org.gtk.] title_format " %title"
+for_window [app_id=^heroic$] title_format " %title"
+for_window [app_id=^io.github.celluloid_player.Celluloid$] title_format " %title"
+for_window [app_id=^kdiskmark$] title_format " %title"
+for_window [app_id=^kvantummanager$|^lxappearance$|^nwg-look$] title_format " %title"
+for_window [app_id=^libreoffice-startcenter$] title_format " %title"
+for_window [app_id=^libreoffice-base$] title_format " %title"
+for_window [app_id=^libreoffice-calc$] title_format " %title"
+for_window [app_id=^libreoffice-draw$] title_format " %title"
+for_window [app_id=^libreoffice-impress$] title_format " %title"
+for_window [app_id=^libreoffice-math$] title_format " %title"
+for_window [app_id=^libreoffice-writer$] title_format " %title"
+for_window [app_id=^lutris$] title_format " %title"
+for_window [app_id=^mpv$] title_format " %title"
+for_window [app_id=^org.gnome.Chess$] title_format " %title"
+for_window [app_id=^org.inkscape.Inkscape$] title_format " %title"
+for_window [app_id=^org.kde.kdeconnect.] title_format " %title"
+for_window [app_id=^org.kde.kdenlive$] title_format " %title"
+for_window [app_id=^org.libretro.RetroArch$] title_format " %title"
+for_window [app_id=^org.pipewire.Helvum$] title_format " %title"
+for_window [app_id=^org.qbittorrent.qBittorrent$|transmission] title_format " %title"
+for_window [app_id=^pitivi$] title_format " %title"
+for_window [app_id=^pavucontrol] title_format " %title"
+for_window [app_id=^quadrapassel$] title_format " %title"
+for_window [app_id=^rhythmbox$] title_format " %title"
+for_window [app_id=^soundux$] title_format " %title"
+for_window [app_id=^virt-manager$] title_format " %title"
+for_window [app_id=^vlc$] title_format " %title"
+for_window [app_id=^zenity$] title_format " %title"
+
+for_window [class=^Ardour$] title_format " %title"
+for_window [class=^Audacity$|^lmms] title_format " %title"
+for_window [class=^Brave-browser$|^Vivaldi-stable$] title_format " %title"
+for_window [class=^Caja$|^Pcmanfm$] title_format " %title"
+for_window [class=^Chromium$|^Chromium-browser$|^Google-chrome$] title_format " %title"
+for_window [class=^qBittorrent$|^transmission$] title_format " %title"
+for_window [class=^Discord$|^WebCord$] title_format " %title"
+for_window [class=^dolphin-emu$] title_format " %title"
+for_window [class=^firefox$|^librewolf$|^firedragon$] title_format " %title"
+for_window [class=^Gimp-] title_format " %titlea"
+for_window [class=^Godot$] title_format " %title"
+for_window [class=^heroic$] title_format " %title"
+for_window [class=^krita$] title_format " %title"
+for_window [class=^Lxappearance$] title_format " %title"
+for_window [class=^LBRY$] title_format " %title"
+for_window [class=^Microsoft-edge$] title_format " %title"
+for_window [class=^obs$] title_format " %title"
+for_window [class=^pcsx2-qt$|^rpcs3$] title_format " %title"
+for_window [class=^qalculate-qt$] title_format " %title"
+for_window [class=^qpwgraph$] title_format " %title"
+for_window [class=^REAPER$] title_format " %title"
+for_window [class=^Renoise$] title_format " %title"
+for_window [class=^Shotcut$] title_format " %title"
+for_window [class=^Signal$] title_format " %title"
+for_window [class=^steam$] title_format " %title"
+for_window [class=^Timeshift-gtk$] title_format " %title"
+for_window [class=^VirtualBox] title_format " %title"
+for_window [class=^vlc$] title_format " %title"
+for_window [class=^Spotify$] title_format " %title"
+for_window [class=^jetbrains-pycharm$] title_format " %title"
+for_window [class=^Slack$] title_format " %title"
+for_window [class=^teams-for-linux$] title_format " %title"
diff --git a/conf.d/window_rules.conf b/conf.d/window_rules.conf
index 77280ec..2377811 100644
--- a/conf.d/window_rules.conf
+++ b/conf.d/window_rules.conf
@@ -1,16 +1,17 @@
# specify window display rules
+for_window [app_id=".*"] title_window_icon on
for_window [class=".*"] title_window_icon on
for_window [class=".*"] title_window_icon padding 1px
for_window [urgent="latest" app_id="firefox" workspace=$ws1] focus ; workspace number $ws1
-for_window [class="Slack"] workspace number $ws2
-for_window [class="teams-for-linux"] workspace number $ws2
-for_window [class="kitty"] workspace number $ws3
-for_window [class="jetbrains-pycharm"] workspace number $ws4
-for_window [class="spotify"] workspace number $ws5
-for_window [class="logseq"] workspace number $ws6
-for_window [class="thunderbird"] workspace number $ws6
-for_window [class="Joplin"] workspace number $ws6
-for_window [urgent=latest] focus
for_window [app_id="firefox"] border pixel 0
for_window [app_id="org.gnome.Calculator"] floating enable
+assign [class="Spotify"] workspace number $ws5
+assign [instance="spotify"] workspace number $ws5
+assign [class="teams-for-linux"] workspace number $ws2
+assign [class="Microsoft-edge" title="Microsoft Teams.*"] workspace number $ws2
+assign [instance="logseq"] workspace number $ws6
+assign [class="jetbrains-pycharm"] workspace number $ws4
+assign [class="Slack"] workspace number $ws2
+assign [class="thunderbird"] workspace number $ws6
+assign [class="Joplin"] workspace number $ws6
diff --git a/config b/config
index e5701d6..2ea7ef8 100644
--- a/config
+++ b/config
@@ -9,7 +9,7 @@ set $alt Mod1
font pango:Noto Sans 9
hide_edge_borders smart
-set $refresh_i3status killall -SIGUSR1 i3status
+#set $refresh_i3status killall -SIGUSR1 i3status
# Use Mouse+$mod to drag floating windows to their wanted position
floating_modifier $mod
@@ -27,10 +27,10 @@ exec swayidle -w \
before-sleep '/home/kellya/.config/sway/scripts/lock.sh'
# Include the initial exec commands
-include autostart.conf
-
include workspaces.conf
-
# Pull the rest of config from .conf files in conf.d
include conf.d/*.conf
+
+include autostart.conf
+focus_on_window_activation focus