From b5dc4b5ee348d04530d557fa0ec2d7f08180aa44 Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Mon, 11 Oct 2021 14:59:16 +0200 Subject: [PATCH] streamlined dell-specific imports Signed-off-by: Stefan Ellmauthaler --- machine/stel-xps/common/cpu/intel/default.nix | 15 --------------- .../common/cpu/intel/kaby-lake/default.nix | 8 -------- .../common/cpu/intel/sandy-bridge/default.nix | 9 --------- machine/stel-xps/common/pc/default.nix | 9 --------- machine/stel-xps/common/pc/laptop/acpi_call.nix | 10 ---------- machine/stel-xps/common/pc/laptop/default.nix | 11 ----------- .../stel-xps/common/pc/laptop/hdd/default.nix | 8 -------- machine/stel-xps/common/pc/laptop/ssd | 1 - machine/stel-xps/common/pc/ssd/default.nix | 9 --------- machine/stel-xps/dell-specific.nix | 17 ----------------- 10 files changed, 97 deletions(-) delete mode 100644 machine/stel-xps/common/cpu/intel/default.nix delete mode 100644 machine/stel-xps/common/cpu/intel/kaby-lake/default.nix delete mode 100644 machine/stel-xps/common/cpu/intel/sandy-bridge/default.nix delete mode 100644 machine/stel-xps/common/pc/default.nix delete mode 100644 machine/stel-xps/common/pc/laptop/acpi_call.nix delete mode 100644 machine/stel-xps/common/pc/laptop/default.nix delete mode 100644 machine/stel-xps/common/pc/laptop/hdd/default.nix delete mode 120000 machine/stel-xps/common/pc/laptop/ssd delete mode 100644 machine/stel-xps/common/pc/ssd/default.nix delete mode 100644 machine/stel-xps/dell-specific.nix diff --git a/machine/stel-xps/common/cpu/intel/default.nix b/machine/stel-xps/common/cpu/intel/default.nix deleted file mode 100644 index ad945f3..0000000 --- a/machine/stel-xps/common/cpu/intel/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd.kernelModules = [ "i915" ]; - - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; - - hardware.opengl.extraPackages = with pkgs; [ - vaapiIntel - vaapiVdpau - libvdpau-va-gl - intel-media-driver - ]; -} diff --git a/machine/stel-xps/common/cpu/intel/kaby-lake/default.nix b/machine/stel-xps/common/cpu/intel/kaby-lake/default.nix deleted file mode 100644 index e6a2d1c..0000000 --- a/machine/stel-xps/common/cpu/intel/kaby-lake/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - imports = [ ../. ]; - - boot.kernelParams = [ - "i915.enable_fbc=1" - "i915.enable_psr=2" - ]; -} diff --git a/machine/stel-xps/common/cpu/intel/sandy-bridge/default.nix b/machine/stel-xps/common/cpu/intel/sandy-bridge/default.nix deleted file mode 100644 index 682815c..0000000 --- a/machine/stel-xps/common/cpu/intel/sandy-bridge/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ ../. ]; - - # Enables RC6, RC6p and RC6pp. - # Last two are only available on Sandy Bridge CPUs (circa 2011). - boot.kernelParams = [ - "i915.enable_rc6=7" - ]; -} diff --git a/machine/stel-xps/common/pc/default.nix b/machine/stel-xps/common/pc/default.nix deleted file mode 100644 index 8864de1..0000000 --- a/machine/stel-xps/common/pc/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, lib, ... }: - -{ - boot.blacklistedKernelModules = lib.optionals (!config.hardware.enableRedistributableFirmware) [ - "ath3k" - ]; - - services.xserver.libinput.enable = lib.mkDefault true; -} diff --git a/machine/stel-xps/common/pc/laptop/acpi_call.nix b/machine/stel-xps/common/pc/laptop/acpi_call.nix deleted file mode 100644 index f8c17dc..0000000 --- a/machine/stel-xps/common/pc/laptop/acpi_call.nix +++ /dev/null @@ -1,10 +0,0 @@ -# acpi_call makes tlp work for newer thinkpads - -{ config, ... }: - -{ - boot = { - kernelModules = [ "acpi_call" ]; - extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; - }; -} diff --git a/machine/stel-xps/common/pc/laptop/default.nix b/machine/stel-xps/common/pc/laptop/default.nix deleted file mode 100644 index 9121b5f..0000000 --- a/machine/stel-xps/common/pc/laptop/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, lib, ... }: - -{ - imports = [ ../. ]; - - # Gnome 40 introduced a new way of managing power, without tlp. - # However, these 2 services clash when enabled simultaneously. - # https://github.com/NixOS/nixos-hardware/issues/260 - services.tlp.enable = lib.mkDefault ((lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") - || !config.services.power-profiles-daemon.enable); -} diff --git a/machine/stel-xps/common/pc/laptop/hdd/default.nix b/machine/stel-xps/common/pc/laptop/hdd/default.nix deleted file mode 100644 index 63f29d4..0000000 --- a/machine/stel-xps/common/pc/laptop/hdd/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ lib, ... }: - -{ - imports = [ ../../hdd ]; - - # Hard disk protection if the laptop falls: - services.hdapsd.enable = lib.mkDefault true; -} diff --git a/machine/stel-xps/common/pc/laptop/ssd b/machine/stel-xps/common/pc/laptop/ssd deleted file mode 120000 index e313834..0000000 --- a/machine/stel-xps/common/pc/laptop/ssd +++ /dev/null @@ -1 +0,0 @@ -../ssd \ No newline at end of file diff --git a/machine/stel-xps/common/pc/ssd/default.nix b/machine/stel-xps/common/pc/ssd/default.nix deleted file mode 100644 index 00922e6..0000000 --- a/machine/stel-xps/common/pc/ssd/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, ... }: - -{ - boot.kernel.sysctl = { - "vm.swappiness" = lib.mkDefault 1; - }; - - services.fstrim.enable = lib.mkDefault true; -} diff --git a/machine/stel-xps/dell-specific.nix b/machine/stel-xps/dell-specific.nix deleted file mode 100644 index bd838a6..0000000 --- a/machine/stel-xps/dell-specific.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, pkgs, ... }: - -{ - imports = [ - ./common/cpu/intel - ./common/pc/laptop - ./common/pc/laptop/ssd - ]; - - boot.kernelParams = [ "mem_sleep_default=deep" ]; - - # older version break wifi: - # - https://github.com/NixOS/nixos-hardware/issues/173 - boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.6") pkgs.linuxPackages_latest; - - services.thermald.enable = true; -}