From 3ec434470a5d7e3512f03dba20279df325b56a76 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Mon, 19 Jun 2023 22:24:36 +0200
Subject: [PATCH] configuration/desktop: cleanup config

---
 configuration/desktop/default.nix | 2 ++
 configuration/desktop/gnome.nix   | 5 -----
 configuration/desktop/xserver.nix | 4 ++++
 hosts/krypton/configuration.nix   | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/configuration/desktop/default.nix b/configuration/desktop/default.nix
index 2121bdc..0924e53 100644
--- a/configuration/desktop/default.nix
+++ b/configuration/desktop/default.nix
@@ -6,4 +6,6 @@
     ./gnome.nix
     ./xserver.nix
   ];
+
+  security.sudo.wheelNeedsPassword = true;
 }
diff --git a/configuration/desktop/gnome.nix b/configuration/desktop/gnome.nix
index b120401..9c0a7a9 100644
--- a/configuration/desktop/gnome.nix
+++ b/configuration/desktop/gnome.nix
@@ -1,11 +1,6 @@
 { pkgs, ... }:
 
 {
-
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
   services.gnome = {
     tracker-miners.enable = false;
     tracker.enable = false;
diff --git a/configuration/desktop/xserver.nix b/configuration/desktop/xserver.nix
index 4ae1c9d..771119f 100644
--- a/configuration/desktop/xserver.nix
+++ b/configuration/desktop/xserver.nix
@@ -1,6 +1,10 @@
 { pkgs, ... }:
 
 {
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
   services.xserver.excludePackages = with pkgs; [
     xterm
   ];
diff --git a/hosts/krypton/configuration.nix b/hosts/krypton/configuration.nix
index 7be1f21..1906746 100644
--- a/hosts/krypton/configuration.nix
+++ b/hosts/krypton/configuration.nix
@@ -23,8 +23,6 @@
 
   networking.hostName = "krypton";
 
-  security.sudo.wheelNeedsPassword = true;
-
   system.stateVersion = "23.05";
 }