mirror of
				https://github.com/NixOS/nixos-hardware.git
				synced 2025-11-04 09:17:14 +08:00 
			
		
		
		
	lenovo: minor cosmetic changes
This commit is contained in:
		@@ -1,10 +1,8 @@
 | 
				
			|||||||
# NOTE: this doesn't inherit from the `general.nix`
 | 
					 | 
				
			||||||
# as z510 is not a ThinkPad
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{ config, pkgs, ... }:
 | 
					{ config, pkgs, ... }:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  hardware.cpu.intel.updateMicrocode = true;
 | 
					  hardware.cpu.intel.updateMicrocode = true;
 | 
				
			||||||
  
 | 
					
 | 
				
			||||||
  # see https://github.com/NixOS/nixpkgs/issues/18356
 | 
					  # see https://github.com/NixOS/nixpkgs/issues/18356
 | 
				
			||||||
  # found buggy driver with method https://wiki.ubuntu.com/DebuggingKernelSuspend
 | 
					  # found buggy driver with method https://wiki.ubuntu.com/DebuggingKernelSuspend
 | 
				
			||||||
  boot.blacklistedKernelModules = [ "nouveau" ];
 | 
					  boot.blacklistedKernelModules = [ "nouveau" ];
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,3 @@
 | 
				
			|||||||
{ ... }:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  boot.kernelModules = mkDefault [ "kvm-intel" ];
 | 
					  boot.kernelModules = mkDefault [ "kvm-intel" ];
 | 
				
			||||||
  services.xserver.videoDrivers = [ "intel" ];
 | 
					  services.xserver.videoDrivers = [ "intel" ];
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,8 @@
 | 
				
			|||||||
{ pkgs, lib, ... }:
 | 
					{ lib, pkgs, ... }:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
with lib;
 | 
					let
 | 
				
			||||||
 | 
					  inherit (lib) mkDefault;
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  hardware.trackpoint = mkDefault {
 | 
					  hardware.trackpoint = mkDefault {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,11 +6,22 @@
 | 
				
			|||||||
  boot = {
 | 
					  boot = {
 | 
				
			||||||
    kernelParams = [
 | 
					    kernelParams = [
 | 
				
			||||||
      # Kernel GPU Savings Options (NOTE i915 chipset only)
 | 
					      # Kernel GPU Savings Options (NOTE i915 chipset only)
 | 
				
			||||||
      "drm.debug=0" "drm.vblankoffdelay=1" "i915.semaphores=1" "i915.modeset=1"
 | 
					      "drm.debug=0"
 | 
				
			||||||
      "i915.use_mmio_flip=1" "i915.powersave=1" "i915.enable_ips=1"
 | 
					      "drm.vblankoffdelay=1"
 | 
				
			||||||
      "i915.disable_power_well=1" "i915.enable_hangcheck=1"
 | 
					      "i915.semaphores=1"
 | 
				
			||||||
      "i915.enable_cmd_parser=1" "i915.fastboot=0" "i915.enable_ppgtt=1"
 | 
					      "i915.modeset=1"
 | 
				
			||||||
      "i915.reset=0" "i915.lvds_use_ssc=0" "i915.enable_psr=0" "vblank_mode=0"
 | 
					      "i915.use_mmio_flip=1"
 | 
				
			||||||
 | 
					      "i915.powersave=1"
 | 
				
			||||||
 | 
					      "i915.enable_ips=1"
 | 
				
			||||||
 | 
					      "i915.disable_power_well=1"
 | 
				
			||||||
 | 
					      "i915.enable_hangcheck=1"
 | 
				
			||||||
 | 
					      "i915.enable_cmd_parser=1"
 | 
				
			||||||
 | 
					      "i915.fastboot=0"
 | 
				
			||||||
 | 
					      "i915.enable_ppgtt=1"
 | 
				
			||||||
 | 
					      "i915.reset=0"
 | 
				
			||||||
 | 
					      "i915.lvds_use_ssc=0"
 | 
				
			||||||
 | 
					      "i915.enable_psr=0"
 | 
				
			||||||
 | 
					      "vblank_mode=0"
 | 
				
			||||||
      "i915.i915_enable_rc6=1"
 | 
					      "i915.i915_enable_rc6=1"
 | 
				
			||||||
    ];
 | 
					    ];
 | 
				
			||||||
    blacklistedKernelModules = [
 | 
					    blacklistedKernelModules = [
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,10 +1,10 @@
 | 
				
			|||||||
{ config, pkgs, ... }:
 | 
					{ config, pkgs, ... }:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  imports =
 | 
					  imports = [
 | 
				
			||||||
    [ ../lib/kernel-version.nix
 | 
					    ../lib/kernel-version.nix
 | 
				
			||||||
      ./general-intel.nix
 | 
					    ./general-intel.nix
 | 
				
			||||||
    ];
 | 
					  ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ## BEGIN from generated hardware-configuration
 | 
					  ## BEGIN from generated hardware-configuration
 | 
				
			||||||
  ## Probably better to just use a freshly generated hardware.configuration.nix
 | 
					  ## Probably better to just use a freshly generated hardware.configuration.nix
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,5 +15,5 @@
 | 
				
			|||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # video card
 | 
					  # video card
 | 
				
			||||||
  services.xserver.videoDrivers = ["ati"];
 | 
					  services.xserver.videoDrivers = [ "ati" ];
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  boot = {
 | 
					  boot = {
 | 
				
			||||||
    kernelModules = [ "tp_smapi" ];
 | 
					    kernelModules = [ "tp_smapi" ];
 | 
				
			||||||
    extraModulePackages = [ config.boot.kernelPackages.tp_smapi ];
 | 
					    extraModulePackages = with config.boot.kernelPackages; [ tp_smapi ];
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # hard disk protection if the laptop falls
 | 
					  # hard disk protection if the laptop falls
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user