From bcaa6669f3d7df68291b6000c5aa001e743d76e7 Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <contact@wanderingcrow.net>
Date: Wed, 2 Oct 2024 07:11:01 -0400
Subject: [PATCH] Merge monitor and background configs

---
 modules/users/crow/home.nix                    | 1 -
 modules/users/crow/sway/backgrounds.conf       | 3 ---
 modules/users/crow/sway/parzival-monitors.conf | 4 ++++
 modules/users/crow/sway/sway.conf              | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 modules/users/crow/sway/backgrounds.conf

diff --git a/modules/users/crow/home.nix b/modules/users/crow/home.nix
index 812896c..cb2dd2a 100644
--- a/modules/users/crow/home.nix
+++ b/modules/users/crow/home.nix
@@ -17,7 +17,6 @@ in
         file.".config/waybar/config.jsonc".source = ./waybar/config.jsonc;
         file.".config/waybar/style.css".source = ./waybar/style.css;
         file.".config/sway/config".source = ./sway/sway.conf;
-        file.".config/sway/backgrounds.conf".source = ./sway/backgrounds.conf;
         file.".config/sway/monitors.conf".source = lib.mkIf (swayMonitorConfig != null) swayMonitorConfig;
         file.".config/sway/background-1".source = ./sway/cyber_defiance.jpg;
         file.".config/sway/background-2".source = ./sway/cyber_skyscrapers.jpg;
diff --git a/modules/users/crow/sway/backgrounds.conf b/modules/users/crow/sway/backgrounds.conf
deleted file mode 100644
index 9595c46..0000000
--- a/modules/users/crow/sway/backgrounds.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-output HDMI-A-1 background /home/crow/.config/sway/background-2 fill
-
-output DP-1 background /home/crow/.config/sway/background-1 fill
diff --git a/modules/users/crow/sway/parzival-monitors.conf b/modules/users/crow/sway/parzival-monitors.conf
index d6a9885..941c8ba 100644
--- a/modules/users/crow/sway/parzival-monitors.conf
+++ b/modules/users/crow/sway/parzival-monitors.conf
@@ -5,6 +5,10 @@ output HDMI-A-1 transform 270
 output DP-1 mode 2560x1440@169.831Hz
 output DP-1 pos 1080 215
 
+# Backgrounds
+output HDMI-A-1 background /home/crow/.config/sway/background-2 fill
+output DP-1 background /home/crow/.config/sway/background-1 fill
+
 # Assign specific workspaces to specific outputs
 workspace 1 output HDMI-A-1 # Firefox
 workspace 2 output HDMI-A-1 # Comms
diff --git a/modules/users/crow/sway/sway.conf b/modules/users/crow/sway/sway.conf
index e5679b7..a5a88be 100644
--- a/modules/users/crow/sway/sway.conf
+++ b/modules/users/crow/sway/sway.conf
@@ -3,7 +3,6 @@
 ################
 
 include /home/crow/.config/sway/monitors.conf
-include /home/crow/.config/sway/backgrounds.conf
 
 
 ###################