diff --git a/system/hosts/drew-desktop/configuration.nix b/system/hosts/drew-desktop/configuration.nix index 068fdfa..8a31c91 100644 --- a/system/hosts/drew-desktop/configuration.nix +++ b/system/hosts/drew-desktop/configuration.nix @@ -187,5 +187,4 @@ # Enable the font directory for managing fonts # This doesn't seem to be needed though. # fonts.fontDir.enable = true; - } diff --git a/system/hosts/drew-desktop/hardware-configuration.nix b/system/hosts/drew-desktop/hardware-configuration.nix index d77f6e0..dae24b3 100644 --- a/system/hosts/drew-desktop/hardware-configuration.nix +++ b/system/hosts/drew-desktop/hardware-configuration.nix @@ -1,33 +1,48 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5F99-043D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/5F99-043D"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; - fileSystems."/home" = - { device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8"; - fsType = "ext4"; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8"; + fsType = "ext4"; + }; swapDevices = [ ]; @@ -48,7 +63,7 @@ enable32Bit = true; }; - services.xserver.videoDrivers = ["nvidia"]; + services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.beta; @@ -57,7 +72,7 @@ # Nvidia power management. Experimental, and can cause sleep/suspend to fail. # Enable this if you have graphical corruption issues or application crashes after waking - # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead + # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead # of just the bare essentials. powerManagement.enable = true; @@ -72,4 +87,14 @@ # Enable the nvidia-settings menu? nvidiaSettings = true; }; + + # Add a udev rule to prevent the mouse from waking the system. Note that it + # has two entries depending on whether it's plugged in or not. + # Bus 001 Device 009: ID 046d:c539 Logitech, Inc. Lightspeed Receiver + # Bus 001 Device 015: ID 046d:c08d Logitech, Inc. G502 LIGHTSPEED Wireless Gaming Mouse + # Note: Still seem to require `sudo udevadm trigger` or reconnecting the device after the change. + services.udev.extraRules = '' + ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c539", ATTR{power/wakeup}="disabled" + ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c08d", ATTR{power/wakeup}="disabled" + ''; }