From a95c7d5ee3cd91f274cf46b7484f859f57a451a9 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 21 Jul 2024 22:25:42 -0400
Subject: [PATCH] home/sway: move display configuration to hosts

---
 homeManagerModules/desktop/sway/settings.nix | 19 +------------
 homes/aly/windowManagers/default.nix         | 12 +++++++++
 hosts/fallarbor/home.nix                     |  1 +
 hosts/lavaridge/home.nix                     |  2 ++
 hosts/mauville/home.nix                      |  1 +
 hosts/petalburg/home.nix                     | 28 +++++++++++---------
 hosts/rustboro/home.nix                      |  2 +-
 7 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index d68897ca..9a56ab16 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -231,23 +231,6 @@ in {
       ++ lib.optional cfg.desktop.sway.randomWallpaper {command = "${scripts.randomWallpaper}";}
       ++ lib.optional (!cfg.desktop.sway.randomWallpaper) {command = "${lib.getExe pkgs.swaybg} -i ${cfg.theme.wallpaper}";};
 
-    output = {
-      "BOE 0x095F Unknown".scale = "1.5";
-      "LG Display 0x0569 Unknown".scale = "1.0";
-      "Samsung Display Corp. 0x4152 Unknown".scale = "2.0";
-      "LG Electronics LG ULTRAWIDE 311NTAB5M720".scale = "1.25";
-
-      "Guangxi Century Innovation Display Electronics Co., Ltd 27C1U-D 0000000000001" = {
-        scale = "1.5";
-        pos = "-2560 0";
-      };
-
-      "HP Inc. HP 24mh 3CM037248S   " = {
-        scale = "1.0";
-        pos = "-1920 0";
-      };
-    };
-
     floating.criteria = [
       {app_id = ".blueman-manager-wrapped";}
       {app_id = "Bitwarden";}
@@ -340,7 +323,7 @@ in {
         blur enable
         blur_passes 1
 
-        corner_radius 10
+        # corner_radius 10
         shadows enable
         shadows_on_csd enable
         shadow_color ${cfg.theme.colors.shadow}
diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix
index acd3e2e9..5f807b3d 100644
--- a/homes/aly/windowManagers/default.nix
+++ b/homes/aly/windowManagers/default.nix
@@ -14,6 +14,18 @@
         "workspace 10: zoom" = [{class = "zoom";} {app_id = "Zoom";}];
       };
 
+      output = {
+        "Guangxi Century Innovation Display Electronics Co., Ltd 27C1U-D 0000000000001" = {
+          scale = "1.5";
+          pos = "-2560 0";
+        };
+
+        "HP Inc. HP 24mh 3CM037248S   " = {
+          scale = "1.0";
+          pos = "-1920 0";
+        };
+      };
+
       startup = [
         {command = ''${lib.getExe' pkgs.keepassxc "keepassxc"}'';}
       ];
diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix
index 780a258f..fec165fc 100644
--- a/hosts/fallarbor/home.nix
+++ b/hosts/fallarbor/home.nix
@@ -1,6 +1,7 @@
 {
   home-manager.sharedModules = [
     {
+      wayland.windowManager.sway.config.output = {"BOE 0x095F Unknown".scale = "1.5";};
       ar.home.desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];
     }
   ];
diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix
index 2a0fa9b0..2776799f 100644
--- a/hosts/lavaridge/home.nix
+++ b/hosts/lavaridge/home.nix
@@ -1,6 +1,8 @@
 {
   home-manager.sharedModules = [
     {
+      wayland.windowManager.sway.config.output = {"BOE 0x095F Unknown".scale = "1.5";};
+
       ar.home = {
         desktop.hyprland.laptopMonitors = ["desc:BOE 0x095F,preferred,auto,1.566667"];
 
diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix
index fb74598e..9f8b31a7 100644
--- a/hosts/mauville/home.nix
+++ b/hosts/mauville/home.nix
@@ -7,6 +7,7 @@
   home-manager = {
     sharedModules = [
       {
+        wayland.windowManager.sway.config.output = {"LG Electronics LG ULTRAWIDE 311NTAB5M720".scale = "1.25";};
         xdg.userDirs.music = "/mnt/Media/Music";
 
         ar.home = {
diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix
index 83c4b083..428c931d 100644
--- a/hosts/petalburg/home.nix
+++ b/hosts/petalburg/home.nix
@@ -6,23 +6,25 @@
 }: {
   home-manager.sharedModules = [
     {
-      wayland.windowManager.hyprland.settings = {
-        bind = [
-          ",xf86launch4,exec,${lib.getExe self.inputs.pp-adjuster.packages.${pkgs.system}.default}"
-          ",xf86launch2,exec,${lib.getExe pkgs.playerctl} play-pause"
-        ];
+      wayland.windowManager = {
+        hyprland.settings = {
+          bind = [
+            ",xf86launch4,exec,${lib.getExe self.inputs.pp-adjuster.packages.${pkgs.system}.default}"
+            ",xf86launch2,exec,${lib.getExe pkgs.playerctl} play-pause"
+          ];
 
-        exec-once = [''${
-            lib.getExe self.inputs.iio-hyprland.packages.${pkgs.system}.default
-          } "desc:Samsung Display Corp. 0x4152"''];
+          exec-once = [''${
+              lib.getExe self.inputs.iio-hyprland.packages.${pkgs.system}.default
+            } "desc:Samsung Display Corp. 0x4152"''];
 
-        input = {
-          tablet.output = "eDP-1";
-          touchdevice.output = "eDP-1";
+          input = {
+            tablet.output = "eDP-1";
+            touchdevice.output = "eDP-1";
+          };
         };
-      };
 
-      ar.home.desktop.sway.enable = true;
+        sway.config.output = {"Samsung Display Corp. 0x4152 Unknown".scale = "2.0";};
+      };
 
       ar.home.desktop.hyprland = {
         laptopMonitors = ["desc:Samsung Display Corp. 0x4152,preferred,auto,2,transform,0"];
diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix
index a8c1b64a..45dabebc 100644
--- a/hosts/rustboro/home.nix
+++ b/hosts/rustboro/home.nix
@@ -3,7 +3,7 @@
     {
       gtk.font.size = lib.mkForce 14;
       home.pointerCursor.size = lib.mkForce 24;
-      programs.vscode.userSettings."editor.fontSize" = lib.mkForce "16";
+      wayland.windowManager.sway.config.output = {"LG Display 0x0569 Unknown".scale = "1.0";};
 
       ar.home = {
         desktop.hyprland.laptopMonitors = ["desc:LG Display 0x0569,preferred,auto,1.0"];