From 31fb8f6a87e85f30937b11bd53ac49bae2e1b49f Mon Sep 17 00:00:00 2001
From: Bryan Ramos <bryan@ramos.codes>
Date: Wed, 28 Feb 2024 21:32:24 -0500
Subject: [PATCH] cont2

---
 src/user/modules/gui/default.nix                    |   5 ++++-
 .../gui/desktopEnvironments/sway/config/sway.nix    |   4 ++--
 .../gui/desktopEnvironments/sway/default.nix        |   1 -
 .../wallpapers/mountains.jpg                        | Bin
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/user/modules/gui/{ => desktopEnvironments}/wallpapers/mountains.jpg (100%)

diff --git a/src/user/modules/gui/default.nix b/src/user/modules/gui/default.nix
index 936f908..1ed120c 100644
--- a/src/user/modules/gui/default.nix
+++ b/src/user/modules/gui/default.nix
@@ -1,3 +1,6 @@
 {
-  imports = [ ./desktopEnvironments ];
+  imports = [
+    ./desktopEnvironments
+    ./modules
+  ];
 }
diff --git a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix
index 5eec3b2..4a16e6d 100644
--- a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix
+++ b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix
@@ -17,13 +17,13 @@ in
       HDMI-A-1 = {
         resolution = "1920x1080";
         position = "0,0";
-        bg = "/etc/nixos/src/modules/gui/wallpapers/mountains.jpg fill";
+        bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill";
       };
       DP-1 = {
         resolution = "1080x1920";
         position = "1920,0";
         transform = "90";
-        bg = "/etc/nixos/src/modules/gui/wallpapers/mountains.jpg fill";
+        bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill";
       };
     };
     modifier = "Mod1";
diff --git a/src/user/modules/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix
index 100d7e3..ecf7c4e 100644
--- a/src/user/modules/gui/desktopEnvironments/sway/default.nix
+++ b/src/user/modules/gui/desktopEnvironments/sway/default.nix
@@ -6,7 +6,6 @@ let
 
 in
 { options.modules.user.gui.sway = { enable = mkEnableOption "user.gui.sway"; };
-  imports = [ ../../modules ];
   config = mkIf cfg.enable {
     wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
     programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };
diff --git a/src/user/modules/gui/wallpapers/mountains.jpg b/src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg
similarity index 100%
rename from src/user/modules/gui/wallpapers/mountains.jpg
rename to src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg