From 28becd0d97506c06999231ecf1d207314e3e6dba Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Mon, 10 Jun 2024 23:08:54 -0500
Subject: [PATCH] switch to shikane + cleanup

---
 home/gui/default.nix        |  4 ++++
 home/gui/files/shikane.toml | 30 ++++++++++++++++++++++++++++++
 home/gui/files/sway/default |  6 +++---
 home/gui/files/sway/eve     |  6 +++---
 home/gui/files/sway/loki    | 22 +++-------------------
 home/gui/files/sway/pocket2 |  4 +++-
 home/gui/files/sway/smaug   |  6 +++---
 7 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 home/gui/files/shikane.toml

diff --git a/home/gui/default.nix b/home/gui/default.nix
index f7d901d..67490ba 100644
--- a/home/gui/default.nix
+++ b/home/gui/default.nix
@@ -62,6 +62,7 @@
       qutebrowser
       rofi
       signal-desktop
+      shikane
       shortwave
       sonixd
       source-code-pro
@@ -161,6 +162,9 @@
           categories = [ "Office" ];
         };
       };
+      configFile = {
+        "shikane/config.toml".source = files/shikane.toml;
+      };
     };
   };
 }
diff --git a/home/gui/files/shikane.toml b/home/gui/files/shikane.toml
new file mode 100644
index 0000000..580e952
--- /dev/null
+++ b/home/gui/files/shikane.toml
@@ -0,0 +1,30 @@
+[[profile]]
+name = "docked"
+exec = [
+  "swaymsg workspace 1, move workspace to output 'Samsung Electric Company C24F390 H4ZN519488'",
+  "swaymsg workspace 5, move workspace to output 'Stargate Technology HDMI '",
+  "swaymsg workspace 6, move workspace to output 'Samsung Electric Company C24F390 H4ZN519488'",
+  "swaymsg workspace 9, move workspace to output 'Stargate Technology HDMI '",
+]
+
+[[profile.output]]
+search = 'eDP-1'
+enable = false
+
+[[profile.output]]
+search = 'Samsung Electric Company C24F390 H4ZN519488'
+enable = true
+position = '0,0'
+
+[[profile.output]]
+search = 'Stargate Technology HDMI '
+enable = true
+position = '0,1080'
+
+
+[[profile]]
+name = "undocked"
+
+[[profile.output]]
+search = 'eDP-1'
+enable = true
diff --git a/home/gui/files/sway/default b/home/gui/files/sway/default
index 7408e25..c1ade00 100644
--- a/home/gui/files/sway/default
+++ b/home/gui/files/sway/default
@@ -58,8 +58,7 @@ bindsym $mod+Return exec --no-startup-id $HOME/bin/mynewterm
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-#set $menu_command fuzzel
-set $menu_command wofi --show drun
+set $menu_command fuzzel
 set $bemenu_options -i --nb "#3f3f3f" --nf "#dcdccc" -fn "pango:JetBrains Mono 8"
 set $menu dmenu_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
@@ -339,7 +338,8 @@ client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 client.background       #F8F8F2
 
 exec_always keyctl link @u @s
-exec_always mykanshi
+#exec_always mykanshi
+exec shikane
 exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
diff --git a/home/gui/files/sway/eve b/home/gui/files/sway/eve
index fcce91f..66415a1 100644
--- a/home/gui/files/sway/eve
+++ b/home/gui/files/sway/eve
@@ -58,8 +58,7 @@ bindsym $mod+Return exec --no-startup-id $HOME/bin/mynewterm
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-#set $menu_command fuzzel
-set $menu_command wofi --show drun
+set $menu_command fuzzel
 set $bemenu_options -i --nb "#3f3f3f" --nf "#dcdccc" -fn "pango:JetBrains Mono 8"
 set $menu dmenu_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
@@ -339,7 +338,8 @@ client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 client.background       #F8F8F2
 
 exec_always keyctl link @u @s
-exec_always mykanshi
+#exec_always mykanshi
+exec shikane
 exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
diff --git a/home/gui/files/sway/loki b/home/gui/files/sway/loki
index 0caf9fd..d9c52b4 100644
--- a/home/gui/files/sway/loki
+++ b/home/gui/files/sway/loki
@@ -338,50 +338,34 @@ client.urgent           #44475A #FF5555 #F8F8F2 #FF5555   #FF5555
 client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 client.background       #F8F8F2
 
+exec pasystray
 exec_always keyctl link @u @s
-exec_always mykanshi
+#exec_always mykanshi
+exec shikane
 exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
 exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-#exec dbus-update-activation-environment --systemd DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=sway
 exec --no-startup-id udiskie --tray
-# Gnome intergration
 exec --no-startup-id /usr/lib/gnome-settings-daemon/gsd-xsettings
 exec --no-startup-id gnome-flashback
 exec --no-startup-id dbus-send --session --print-reply=literal --dest=org.gnome.SessionManager "/org/gnome/SessionManager" org.gnome.SessionManager.RegisterClient "string:sway" "string:$DESKTOP_AUTOSTART_ID"
-exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec --no-startup-id /usr/bin/gnome-keyring-daemon --start
-# My stuff
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
-exec supersonic
 exec sonixd
-exec safeeyes
 exec dovideo.sh
 exec auto-start
-exec /usr/lib/kdeconnectd
 exec_always gremind
 exec swaync
-exec /usr/libexec/notification-daemon
 exec nm-applet
-#exec nextcloud
 exec randbg
-#exec birdtray
 exec indicator-kdeconnect
 exec kdeconnect-indicator
 exec myweb
 exec myterm
-#exec srandrd dovideo.sh
 exec cbatticons
-exec telegram-desktop
-exec element-desktop
-exec signal-desktop
-#exec authy
-#exec obsidian
-exec pasystray
 exec headset-charge-indicator.py
 exec blueberry-tray
 exec ktimer
diff --git a/home/gui/files/sway/pocket2 b/home/gui/files/sway/pocket2
index 3c08834..d7278c1 100644
--- a/home/gui/files/sway/pocket2
+++ b/home/gui/files/sway/pocket2
@@ -339,7 +339,8 @@ client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 client.background       #F8F8F2
 
 exec_always keyctl link @u @s
-exec_always mykanshi
+#exec_always mykanshi
+exec shikane
 exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000
@@ -358,6 +359,7 @@ exec --no-startup-id /usr/bin/gnome-keyring-daemon --start
 exec wl-paste -t text --watch clipman store
 exec configure-gtk
 exec supersonic
+exec sonixd
 exec safeeyes
 exec dovideo.sh
 exec auto-start
diff --git a/home/gui/files/sway/smaug b/home/gui/files/sway/smaug
index 807fe13..3d10d3d 100644
--- a/home/gui/files/sway/smaug
+++ b/home/gui/files/sway/smaug
@@ -58,8 +58,7 @@ bindsym $mod+Return exec --no-startup-id $HOME/bin/mynewterm
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-#set $menu_command fuzzel
-set $menu_command wofi --show drun
+set $menu_command fuzzel
 set $bemenu_options -i --nb "#3f3f3f" --nf "#dcdccc" -fn "pango:JetBrains Mono 8"
 set $menu dmenu_path | bemenu $bemenu_options| xargs swaymsg exec --
 bindsym $mod+Shift+d exec $menu
@@ -339,7 +338,8 @@ client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 client.background       #F8F8F2
 
 exec_always keyctl link @u @s
-exec_always mykanshi
+#exec_always mykanshi
+exec shikane
 exec foot --server
 exec kitty --title ttmenu -e ttmenu-loop
 seat * hide_cursor 8000