From c17805f61ab0a70040551e196da51ca1201dab0e Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sat, 29 Jun 2024 12:40:18 -0400
Subject: [PATCH] aly: cleanup and reorg home configuration

---
 homes/aly/default.nix                | 58 +---------------------------
 homes/aly/windowManagers/default.nix | 56 +++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 homes/aly/windowManagers/default.nix

diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 4746489e..eaf8d00d 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -9,6 +9,7 @@
   imports = [
     ./firefox
     ./mail
+    ./windowManagers
   ];
 
   home = {
@@ -24,13 +25,10 @@
       fractal
       gh
       git
-      google-chrome
       obsidian
-      plexamp
       python3
       ruby
       tauon
-      trayscale
       webcord
       wget
     ];
@@ -49,56 +47,6 @@
     };
   };
 
-  wayland.windowManager = {
-    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";}];
-      };
-
-      startup = [
-        {command = ''${lib.getExe' pkgs.keepassxc "keepassxc"}'';}
-      ];
-    };
-
-    hyprland.extraConfig = ''
-      # Workspace - Browser
-      workspace = 1, defaultName:web, on-created-empty:${config.ar.home.defaultApps.webBrowser.exe}
-      windowrulev2 = workspace 1,class:(firefox)
-      windowrulev2 = workspace 1,class:(brave-browser)
-
-      # Workspace - Coding
-      workspace = 2, defaultName:code, on-created-empty:${config.ar.home.defaultApps.editor.exe}
-      windowrulev2 = workspace 2,class:(codium-url-handler)
-
-      # Workspace - Work
-      windowrulev2 = workspace 3,class:(google-chrome)
-      windowrulev2 = workspace 3,class:(firework)
-
-      # Scratchpad Chat
-      # bind = SUPER, S, togglespecialworkspace, magic
-      # bind = SUPER SHIFT, W, movetoworkspace, special:magic
-      workspace = special:magic, on-created-empty:${lib.getExe pkgs.fractal}
-      windowrulev2 = workspace special:magic,class:(org.gnome.Fractal)
-      windowrulev2 = workspace special:magic,class:(WebCord)
-
-      # Scratchpad Notes
-      bind = SUPER, N, togglespecialworkspace, notes
-      bind = SUPER SHIFT, N, movetoworkspace, special:notes
-      workspace = special:notes, on-created-empty:${lib.getExe' pkgs.obsidian "obsidian"}
-      # windowrulev2 = workspace special:notes,class:(obsidian)
-
-      # # Scratchpad Music
-      # bind = SUPER, P, togglespecialworkspace, music
-      # bind = SUPER SHIFT, P, movetoworkspace, special:music
-      # workspace = special:music, on-created-empty:${lib.getExe' pkgs.plexamp "plexamp"}
-      # windowrulev2 = workspace special:music,class:(Plexamp)
-    '';
-  };
-
   ar.home = {
     apps = {
       alacritty.enable = true;
@@ -122,10 +70,6 @@
       startupApps = [(lib.getExe' pkgs.keepassxc "keepassxc")];
     };
 
-    scripts = {
-      pp-adjuster.enable = true;
-    };
-
     theme = {
       enable = true;
       wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-3led2d.jpg";
diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix
new file mode 100644
index 00000000..7115b373
--- /dev/null
+++ b/homes/aly/windowManagers/default.nix
@@ -0,0 +1,56 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  wayland.windowManager = {
+    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";}];
+      };
+
+      startup = [
+        {command = ''${lib.getExe' pkgs.keepassxc "keepassxc"}'';}
+      ];
+    };
+
+    hyprland.extraConfig = ''
+      # Workspace - Browser
+      workspace = 1, defaultName:web, on-created-empty:${config.ar.home.defaultApps.webBrowser.exe}
+      windowrulev2 = workspace 1,class:(firefox)
+      windowrulev2 = workspace 1,class:(brave-browser)
+
+      # Workspace - Coding
+      workspace = 2, defaultName:code, on-created-empty:${config.ar.home.defaultApps.editor.exe}
+      windowrulev2 = workspace 2,class:(codium-url-handler)
+
+      # Workspace - Work
+      windowrulev2 = workspace 3,class:(google-chrome)
+      windowrulev2 = workspace 3,class:(firework)
+
+      # Scratchpad Chat
+      # bind = SUPER, S, togglespecialworkspace, magic
+      # bind = SUPER SHIFT, W, movetoworkspace, special:magic
+      workspace = special:magic, on-created-empty:${lib.getExe pkgs.fractal}
+      windowrulev2 = workspace special:magic,class:(org.gnome.Fractal)
+      windowrulev2 = workspace special:magic,class:(WebCord)
+
+      # Scratchpad Notes
+      bind = SUPER, N, togglespecialworkspace, notes
+      bind = SUPER SHIFT, N, movetoworkspace, special:notes
+      workspace = special:notes, on-created-empty:${lib.getExe' pkgs.obsidian "obsidian"}
+      # windowrulev2 = workspace special:notes,class:(obsidian)
+
+      # # Scratchpad Music
+      # bind = SUPER, P, togglespecialworkspace, music
+      # bind = SUPER SHIFT, P, movetoworkspace, special:music
+      # workspace = special:music, on-created-empty:${lib.getExe' pkgs.plexamp "plexamp"}
+      # windowrulev2 = workspace special:music,class:(Plexamp)
+    '';
+  };
+}