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 = [ ... ];

hosts/dregil/hardware-configuration.nix

@@ -4,12 +4,19 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules =
-  boot.initrd.kernelModules = [ "dm-snapshot" "uas" "usbcore" "usb_storage" "vfat" "nls_cp437" "nls_iso8859_1" ];
+    [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [
+    "dm-snapshot"
+    "uas"
+    "usbcore"
+    "usb_storage"
+    "vfat"
+    "nls_cp437"
+    "nls_iso8859_1"
+  ];
   boot.initrd.luks.devices = {
     root = {
       device = "/dev/disk/by-uuid/bebf96d1-2a2b-412c-a5f0-f9ed5730a05f";
@@ -24,33 +31,31 @@
   boot.extraModulePackages = [ pkgs.linuxPackages.nvidia_x11 ];
   boot.kernelParams = [ "module_blacklist=i915" ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
+    device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "subvol=root" "compress=zstd" ];
+    options = [ "subvol=root" "compress=zstd" ];
-    };
+  };
 
-  fileSystems."/home" =
+  fileSystems."/home" = {
-    { device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
+    device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "subvol=home" "compress=zstd" ];
+    options = [ "subvol=home" "compress=zstd" ];
-    };
+  };
 
-  fileSystems."/nix" =
+  fileSystems."/nix" = {
-    { device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
+    device = "/dev/disk/by-uuid/a88ac058-e704-419e-ba7d-1d0ff4b6f654";
-      fsType = "btrfs";
+    fsType = "btrfs";
-      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+    options = [ "subvol=nix" "compress=zstd" "noatime" ];
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/786D-42D7";
+    device = "/dev/disk/by-uuid/786D-42D7";
-      fsType = "vfat";
+    fsType = "vfat";
-    };
+  };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/b8c224ad-095e-4a48-b5b2-a19451fdeb95";
+    [{ device = "/dev/disk/by-uuid/b8c224ad-095e-4a48-b5b2-a19451fdeb95"; }];
-      }
-    ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -62,22 +67,23 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 
   hardware.nvidia = {
-     nvidiaSettings = true;
+    nvidiaSettings = true;
-     nvidiaPersistenced = true;
+    nvidiaPersistenced = true;
 
-#    modesetting.enable = true;
+    #    modesetting.enable = true;
-     package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
-#    prime = {
+    #    prime = {
-#      offload.enable = true;
+    #      offload.enable = true;
-#
+    #
-#      intelBusId = "PCI:1:0:0";
+    #      intelBusId = "PCI:1:0:0";
-#      nvidiaBusId = "PCI:1:0:0";
+    #      nvidiaBusId = "PCI:1:0:0";
-#      intelBusId = "0@0:2:0";
+    #      intelBusId = "0@0:2:0";
-#      nvidiaBusId = "1@1:0:0";
+    #      nvidiaBusId = "1@1:0:0";
-#    };
+    #    };
   };
 
   hardware.opengl = {
@@ -87,4 +93,5 @@
   };
 
   hardware.keyboard.uhk.enable = true;
+  hardware.bluetooth.enable = true;
 }

modules/wm/gnome.nix

@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+
+}

modules/wm/x.nix

@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # Enable the X11 windowing system.
+  services = {
+    dbus = { enable = true; };
+
+    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;
+        mouse.naturalScrolling =
+          config.services.xserver.libinput.touchpad.naturalScrolling;
+      };
+    };
+  };
+}

modules/wm/xmonad.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+{
+  services = {
+    gnome.gnome-keyring.enable = true;
+    upower.enable = true;
+
+    xserver = {
+      windowManager.xmonad = {
+        enable = true;
+        enableContribAndExtras = true;
+      };
+    };
+  };
+
+  systemd.services.upower.enable = true;
+}