From 89b0ee82e6f2de2e33d8c5ac0ea90642091c32eb Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sat, 3 Dec 2022 15:46:43 +0100
Subject: [PATCH] Fix odin config

---
 odin/common_configuration.nix | 11 -----------
 odin/configuration-intel.nix  |  7 +------
 odin/configuration-nvidia.nix |  6 ++++++
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index bfcd1e4..e44c0ca 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -63,11 +63,6 @@ with lib; {
   services.xserver = {
     enable = true;
     # Enable the GNOME 3 Desktop Environment.
-    displayManager.gdm = {
-      enable = true;
-      # wayland = true;
-      # nvidiaWayland = true;
-    };
     desktopManager.gnome.enable = true;
     # desktopManager.plasma5 = {
     #   enable = true;
@@ -75,12 +70,6 @@ with lib; {
     # };
     # windowManager.bspwm.enable = true;
 
-    displayManager.sddm = {
-      enable = true;
-      autoNumlock = true;
-      theme =
-        "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
-    };
 
     # Configure keymap in X11
     layout = "it,us";
diff --git a/odin/configuration-intel.nix b/odin/configuration-intel.nix
index 4773afc..b9303f4 100644
--- a/odin/configuration-intel.nix
+++ b/odin/configuration-intel.nix
@@ -16,12 +16,7 @@
     libvdpau-va-gl
   ];
 
-  services.xserver = {
-    # displayManager.gdm = {
-    #   enable = true;
-    #   wayland = true;
-    # };
-  };
+  services.xserver.displayManager.gdm.enable = true;
 
   # This runs only Intel and nvidia does not drain power.
   ##### disable nvidia for a very nice battery life.
diff --git a/odin/configuration-nvidia.nix b/odin/configuration-nvidia.nix
index 0b7ed7f..67e5a13 100644
--- a/odin/configuration-nvidia.nix
+++ b/odin/configuration-nvidia.nix
@@ -13,6 +13,12 @@
     # };
   };
 
+  services.displayManager.sddm = {
+    enable = true;
+    autoNumlock = true;
+    theme = "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
+  };
+
   hardware.nvidia.prime = {
     offload.enable = false;
     sync.enable = true;