From 52bf03d4c3231e7627b0efa6f9fb84bf00aa26d4 Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <patrick@wanderingcrow.net>
Date: Sun, 29 Dec 2024 10:32:07 -0500
Subject: [PATCH] clean up some of the config stuff in desktops

---
 modules/desktops/wayland/sway.nix   | 23 ++++++++++++-----------
 modules/desktops/wayland/swayfx.nix | 25 +++++++++++++------------
 modules/desktops/x11/i3.nix         |  9 ++++-----
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/modules/desktops/wayland/sway.nix b/modules/desktops/wayland/sway.nix
index 9ecfb5a..30088b5 100644
--- a/modules/desktops/wayland/sway.nix
+++ b/modules/desktops/wayland/sway.nix
@@ -5,11 +5,11 @@
   config,
   ...
 }: {
-  config.programs.sway = lib.mkIf config.desktop.sway.enable {
-    enable = true;
-    xwayland.enable = true;
-    extraPackages = with pkgs;
-    [
+  config = {
+    programs.sway = lib.mkIf config.desktop.sway.enable {
+      enable = true;
+      xwayland.enable = true;
+      extraPackages = with pkgs; [
         foot
         wofi
         swaynotificationcenter
@@ -22,13 +22,14 @@
         waybar
         wl-clipboard
         xorg.xrandr
-    ];
-  };
-  config.programs.dconf.enable = true;
+      ];
+    };
+    programs.dconf.enable = true;
 
-  config.environment = lib.mkIf config.desktop.sway.enable {
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
+    environment = lib.mkIf config.desktop.sway.enable {
+      sessionVariables = {
+        NIXOS_OZONE_WL = "1";
+      };
     };
   };
 }
diff --git a/modules/desktops/wayland/swayfx.nix b/modules/desktops/wayland/swayfx.nix
index 46da7d4..31d2cc3 100644
--- a/modules/desktops/wayland/swayfx.nix
+++ b/modules/desktops/wayland/swayfx.nix
@@ -5,12 +5,12 @@
   config,
   ...
 }: {
-  config.programs.sway = lib.mkIf config.desktop.swayfx.enable {
-    package = pkgs.swayfx;
-    enable = true;
-    xwayland.enable = true;
-    extraPackages = with pkgs;
-    [
+  config = {
+    programs.sway = lib.mkIf config.desktop.swayfx.enable {
+      package = pkgs.swayfx;
+      enable = true;
+      xwayland.enable = true;
+      extraPackages = with pkgs; [
         foot
         wofi
         swaynotificationcenter
@@ -23,13 +23,14 @@
         waybar
         wl-clipboard
         xorg.xrandr
-    ];
-  };
-  config.programs.dconf.enable = true;
+      ];
+    };
+    programs.dconf.enable = true;
 
-  config.environment = lib.mkIf config.desktop.swayfx.enable {
-    sessionVariables = {
-      NIXOS_OZONE_WL = "1";
+    environment = lib.mkIf config.desktop.swayfx.enable {
+      sessionVariables = {
+        NIXOS_OZONE_WL = "1";
+      };
     };
   };
 }
diff --git a/modules/desktops/x11/i3.nix b/modules/desktops/x11/i3.nix
index 6aa5bc1..652cbbe 100644
--- a/modules/desktops/x11/i3.nix
+++ b/modules/desktops/x11/i3.nix
@@ -10,11 +10,10 @@
       displayManager.startx.enable = true;
       windowManager.i3 = {
         enable = true;
-        extraPackages = with pkgs;
-        [
-            xorg.xrandr
-            xterm
-            rofi
+        extraPackages = with pkgs; [
+          xorg.xrandr
+          xterm
+          rofi
         ];
       };
     };