From 5bc55968b456007e1e5671e11012704b839f39e5 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Tue, 23 Jul 2024 17:29:05 -0400
Subject: [PATCH] aly: move sway config to parity with hyprland

---
 homeManagerModules/desktop/sway/settings.nix |  6 -----
 homes/aly/windowManagers/default.nix         | 24 +++++++++++++++-----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index ce25b995..56eedf87 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -226,10 +226,8 @@ in {
 
     floating.criteria = [
       {app_id = ".blueman-manager-wrapped";}
-      {app_id = "Bitwarden";}
       {app_id = "blueberry.py";}
       {app_id = "com.github.wwmm.easyeffects";}
-      {app_id = "org.keepassxc.KeePassXC";}
       {app_id = "pavucontrol";}
       {app_id = "solaar";}
       {title = "Open File";}
@@ -266,10 +264,6 @@ in {
           command = "resize set 60ppt 80ppt; move position center";
           criteria = {app_id = "solaar";};
         }
-        {
-          command = "resize set 80ppt 80ppt; move position center";
-          criteria = {app_id = "org.keepassxc.KeePassXC";};
-        }
         {
           command = "resize set 40ppt 60ppt; move position center";
           criteria = {app_id = ".blueman-manager-wrapped";};
diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix
index 5f807b3d..add31a0f 100644
--- a/homes/aly/windowManagers/default.nix
+++ b/homes/aly/windowManagers/default.nix
@@ -8,10 +8,17 @@
     sway.config = {
       assigns = {
         "workspace 1: web" = [{app_id = "firefox";} {app_id = "brave-browser";}];
-        "workspace 2: code" = [{app_id = "codium-url-handler";}];
-        "workspace 3: chat" = [{app_id = "org.gnome.Fractal";} {app_id = "WebCord";}];
-        "workspace 4: work" = [{app_id = "google-chrome";} {app_id = "chromium-browser";} {app_id = "firework";}];
-        "workspace 10: zoom" = [{class = "zoom";} {app_id = "Zoom";}];
+        "workspace 2: code" = [{app_id = "codium-url-handler";} {app_id = "dev.zed.Zed";}];
+        "workspace 3: note" = [{app_id = "obsidian";}];
+        "workspace 4: chat" = [{app_id = "org.gnome.Fractal";} {app_id = "WebCord";}];
+        "workspace 5: work" = [{app_id = "google-chrome";} {app_id = "chromium-browser";} {app_id = "firework";}];
+      };
+
+      floating.criteria = [{app_id = "org.keepassxc.KeePassXC";}];
+
+      keybindings = {
+        "${config.wayland.windowManager.sway.config.modifier}+P" = "exec ${lib.getExe' pkgs.keepassxc "keepassxc"}";
+        "${config.wayland.windowManager.sway.config.modifier}+N" = "exec ${lib.getExe' pkgs.obsidian "obsidian"}";
       };
 
       output = {
@@ -26,8 +33,13 @@
         };
       };
 
-      startup = [
-        {command = ''${lib.getExe' pkgs.keepassxc "keepassxc"}'';}
+      startup = [{command = ''sleep 1 && ${lib.getExe' pkgs.keepassxc "keepassxc"}'';}];
+
+      window.commands = [
+        {
+          command = "resize set 80ppt 80ppt; move position center; sticky toggle; ";
+          criteria = {app_id = "org.keepassxc.KeePassXC";};
+        }
       ];
     };