Update and clean up modules

nixos-modules/desktop/default.nix

@@ -6,7 +6,6 @@
   imports = [
     ./desktop-environment.nix
     ./greeter.nix
-    ./hardware.nix
     ./office-suite.nix
     ./security.nix
     ./video.nix

nixos-modules/desktop/greeter.nix

@@ -9,9 +9,6 @@
     defaultSession = "sway";
   };
 
-  # Enable touchpad support.
-  services.libinput.enable = true;
-
   services.xserver = {
     enable = true;
     desktopManager.xterm.enable = false;

nixos-modules/desktop/hardware.nix

@@ -1,60 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}:
-
-{
-
-  services.blueman.enable = true;
-
-  # Enable sound.
-  nixpkgs.config.pulseaudio = true;
-
-  services.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-  };
-  security.rtkit.enable = true;
-
-  hardware = {
-    graphics = {
-      enable = true;
-      enable32Bit = true;
-      extraPackages = with pkgs; [
-        intel-compute-runtime
-        intel-media-driver
-        libvdpau-va-gl
-        vaapiVdpau
-      ];
-
-    };
-    acpilight.enable = true;
-    bluetooth = {
-      enable = true;
-      package = pkgs.bluez;
-    };
-    logitech.wireless = {
-      enable = true;
-      enableGraphical = true;
-    };
-  };
-
-  services.hardware.bolt.enable = true;
-  services.udisks2.enable = true;
-  services.upower.enable = config.powerManagement.enable;
-
-  programs.light.enable = true;
-  programs.adb.enable = true;
-
-  services.fprintd = {
-    enable = true;
-    package = pkgs.fprintd-tod;
-    tod = {
-      enable = true;
-      driver = pkgs.libfprint-2-tod1-vfs0090;
-    };
-  };
-}

nixos-modules/desktop/security.nix

@@ -1,4 +1,6 @@
 {
+  config,
+  lib,
   ...
 }:
 
@@ -6,7 +8,7 @@
   services.pcscd.enable = true;
 
   # Make pam accept both password and fingerprint
-  security.pam.services.swaylock.rules.auth = {
+  security.pam.services.swaylock.rules.auth = lib.mkIf config.services.fprintd.enable {
     fprintd.order = 11601;
     unix.args = [ "nullok" ];
   };