From ff7f7e8532dd1edb23b255f01d20f9c9a12cc8a9 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Tue, 24 Aug 2021 10:01:49 +0200
Subject: [PATCH] Remove unused services

---
 home.nix         | 24 ++++++++++++------------
 nixos/base.nix   |  4 ----
 nixos/intel.nix  |  7 +++++++
 nixos/nvidia.nix | 10 ++++++++--
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/home.nix b/home.nix
index d4a2ffe..e53e56b 100644
--- a/home.nix
+++ b/home.nix
@@ -179,23 +179,23 @@ in
   programs.home-manager.enable = true;
 
   services = {
-    blueman-applet.enable = true;
+    # blueman-applet.enable = true;
     caffeine.enable = true;
-    cbatticon.enable = true;
+    # cbatticon.enable = true;
     gnome-keyring.enable = true;
-    network-manager-applet.enable = true;
+    # network-manager-applet.enable = true;
     playerctld.enable = true;
     # poweralertd.enable = true;
   };
 
-  xsession = {
-    enable = true;
-    numlock.enable = true;
-    initExtra = ''
-      ## Touchpad
-      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
-      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
-    '';
-  };
+  # xsession = {
+  #   enable = true;
+  #   numlock.enable = true;
+  #   initExtra = ''
+  #     ## Touchpad
+  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
+  #     ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
+  #   '';
+  # };
 
 }
diff --git a/nixos/base.nix b/nixos/base.nix
index 9f6b5aa..7821651 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -67,10 +67,6 @@
     #   nvidiaWayland = true;
     # };
     desktopManager.gnome.enable = true;
-    displayManager.sddm = {
-      enable = true;
-      autoNumlock = true;
-    };
     windowManager.bspwm.enable = true;
 
     # Configure keymap in X11
diff --git a/nixos/intel.nix b/nixos/intel.nix
index 5b1352d..68fa685 100644
--- a/nixos/intel.nix
+++ b/nixos/intel.nix
@@ -20,6 +20,13 @@
     intel-media-driver
   ];
 
+  services.xserver = {
+    displayManager.gdm = {
+      enable = true;
+      wayland = true;
+    };
+  };
+
   # This runs only Intel and nvidia does not drain power.
   ##### disable nvidia for a very nice battery life.
   hardware.nvidiaOptimus.disable = true;
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
index caf22ec..9599222 100644
--- a/nixos/nvidia.nix
+++ b/nixos/nvidia.nix
@@ -10,7 +10,7 @@
       ./base.nix
     ];
 
-  boot.initrd.kernelModules = ["i915"];
+  boot.initrd.kernelModules = [ "i915" ];
 
   hardware.cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware;
 
@@ -21,8 +21,14 @@
     intel-media-driver
   ];
 
+  services.xserver = {
+    videoDrivers = [ "nvidia" ];
+    displayManager.sddm = {
+      enable = true;
+      autoNumlock = true;
+    };
+  };
 
-  services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia.prime = {
     offload.enable = false;
     sync.enable = true;