diff --git a/flake.nix b/flake.nix
index f481ce2..db1cf61 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,7 @@
         timezone = "America/New_York";         # Time Zone
         locale = "en_US.UTF-8";                # Locale
         diskoConfig = "luks-btrfs-subvolumes"; # Select the disko config that was used to partition drive
+        desktopEnvironment = "gnome";          # Window Manager / Desktop Environment to use
       };
 
       # --- USER SETTINGS --- #
diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix
index aaabcac..a0c24d1 100644
--- a/profiles/personal/configuration.nix
+++ b/profiles/personal/configuration.nix
@@ -17,7 +17,7 @@
     ../../system/app/gaming/steam.nix
     ../../system/app/gaming/gamemode.nix
     ../../system/hardware/audio.nix
-    ../../system/gui/dwm.nix
+    (./. + "../../system/gui" + ("/" + systemSettings.desktopEnvironment) + ".nix")
   ];
 
   nix = {
diff --git a/system/app/gaming/gamemode.nix b/system/app/gaming/gamemode.nix
index e7520ba..cf31ae1 100644
--- a/system/app/gaming/gamemode.nix
+++ b/system/app/gaming/gamemode.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.gamemode ];
   programs.gamemode.enable = true;
 }
diff --git a/system/app/gaming/steam.nix b/system/app/gaming/steam.nix
index 60cda8d..d2c8f27 100644
--- a/system/app/gaming/steam.nix
+++ b/system/app/gaming/steam.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.steam ];
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index 920ca8a..45060cc 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -9,7 +9,6 @@
     ../app/launcher/rofi.nix
   ];
 
-  environment.systemPackages = [ pkgs.dwm ];
   services.xserver.windowManager.dwm.enable = true;
   services.xserver.displayManager.defaultSession = "none+dwm";
 }
diff --git a/system/gui/gnome.nix b/system/gui/gnome.nix
new file mode 100644
index 0000000..1da7fb2
--- /dev/null
+++ b/system/gui/gnome.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./x11.nix
+  ];
+
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+}
diff --git a/system/gui/lightdm.nix b/system/gui/lightdm.nix
index 6cd1e8e..9b3a531 100644
--- a/system/gui/lightdm.nix
+++ b/system/gui/lightdm.nix
@@ -1,8 +1,5 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.lightdm ];
-  services.xserver.displayManager = {
-    lightdm.enable = true;
-  };
+  services.xserver.displayManager.lightdm.enable = true;
 }
diff --git a/system/hardware/audio.nix b/system/hardware/audio.nix
index ae0cdfb..e5ea4fa 100644
--- a/system/hardware/audio.nix
+++ b/system/hardware/audio.nix
@@ -1,8 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.pipewire ];
-  hardware.pulseaudio.enable = false;
   sound.enable = true;
   security.rtkit.enable = true;
   services.pipewire = {
diff --git a/system/hardware/automount.nix b/system/hardware/automount.nix
index 9896064..25fcbc4 100644
--- a/system/hardware/automount.nix
+++ b/system/hardware/automount.nix
@@ -1,11 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [
-    pkgs.gvfs
-    pkgs.udisks
-    pkgs.udiskie
-  ];
   services.devmon.enable = true;
   services.gvfs.enable = true;
   services.udisks2.enable = true;
diff --git a/system/hardware/bluetooth.nix b/system/hardware/bluetooth.nix
index 08a5ff8..038980c 100644
--- a/system/hardware/bluetooth.nix
+++ b/system/hardware/bluetooth.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [ pkgs.blueman ];
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
 }
diff --git a/system/hardware/openrgb.nix b/system/hardware/openrgb.nix
index 4bb58c9..dabcfc7 100644
--- a/system/hardware/openrgb.nix
+++ b/system/hardware/openrgb.nix
@@ -2,7 +2,5 @@
 
 {
   environment.systemPackages = [ pkgs.openrgb-with-all-plugins ];
-  services.hardware.openrgb = {
-    enable = true;
-  };
+  services.hardware.openrgb.enable = true;
 }
diff --git a/system/hardware/printing.nix b/system/hardware/printing.nix
index fe6df77..dfb57af 100644
--- a/system/hardware/printing.nix
+++ b/system/hardware/printing.nix
@@ -1,11 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = [
-    pkgs.cups
-    pkgs.cups-filters
-    pkgs.avahi
-  ];
   services.printing.enable = true;
   services.avahi.enable = true;
   services.avahi.nssmdns4 = true;