dregil: Split X11 configuration

hosts/dregil/configuration.nix

@@ -16,6 +16,8 @@ in {
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     # <nixos-hardware/lenovo/legion/15ich>
+    ../../modules/wm/x.nix
+#    ../../modules/wm/xmonad.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
@@ -36,10 +38,6 @@ in {
     127.0.0.1 localhost dregil.localdomain dregil
   '';
 
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
   i18n = {
     extraLocaleSettings = { TIME_STYLE = "iso"; };
     supportedLocales =
@@ -48,40 +46,9 @@ in {
 
   console = {
     font = "Lat2-Terminus16";
-    #useXkbConfig = true; # use xkbOptions in tty.
     keyMap = "dvorak";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver = {
-    enable = true;
-    exportConfiguration = true;
-
-    # Configure keymap in X11
-    layout = "us";
-
-    xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
-
-    videoDrivers = [ "nvidia" ]; # "modesetting" ];
-
-    displayManager.lightdm = {
-      enable = true;
-      greeters.slick.enable = true;
-    };
-
-    desktopManager.xfce.enable = true;
-    desktopManager.gnome.enable = true;
-
-    # Enable touchpad support (enabled default in most desktopManager).
-    libinput = {
-      enable = true;
-      touchpad.disableWhileTyping = true;
-      touchpad.naturalScrolling = true;
-      mouse.naturalScrolling =
-        config.services.xserver.libinput.touchpad.naturalScrolling;
-    };
-  };
-
   fonts = {
     enableDefaultPackages = true;
     packages = with pkgs; [
@@ -147,6 +114,8 @@ in {
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
+  services.blueman.enable = true;
+
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];