From 1f5fd6dba444ef0faef7e0799a205183c6ceb9af Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sat, 13 Jan 2024 17:50:48 +0530 Subject: config sync --- hardware/thinkpad-e14/default.nix | 114 +++++++++++++++++++++++ hardware/thinkpad-e14/hardware-configuration.nix | 114 ----------------------- 2 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 hardware/thinkpad-e14/default.nix delete mode 100644 hardware/thinkpad-e14/hardware-configuration.nix (limited to 'hardware/thinkpad-e14') diff --git a/hardware/thinkpad-e14/default.nix b/hardware/thinkpad-e14/default.nix new file mode 100644 index 0000000..20a864a --- /dev/null +++ b/hardware/thinkpad-e14/default.nix @@ -0,0 +1,114 @@ +{ config, lib, pkgs, modulesPath, ... }: +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + services.fwupd.enable = true; + + # 2-Sep-2023, Bug: https://nixpk.gs/pr-tracker.html?pr=252605 + boot.kernelPackages = pkgs.linuxPackages_6_6; + boot.initrd = { + availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usb_storage" + "thunderbolt" + "sd_mod" + ]; + kernelModules = [ ]; + }; + boot.kernelModules = [ + "kvm-intel" + "rtw88_8822ce" + "sd_mod" + "snd-seq" + "snd-rawmidi" + "uinput" + "v4l2loopback" + "acpi_call" + ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ + acpi_call + ]; + boot.kernelParams = [ + "i8042.nopnp=1" + "pci=nocrs" + "acpi_backlight=native" + "i915.enable_dpcd_backlight=1" + "i915.force_probe=46a8" + ]; + boot.extraModprobeConfig = '' + options snd slots=snd-hda-intel + options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + ''; + boot.supportedFilesystems = [ "ntfs" ]; + # boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + services.throttled.enable = true; + + services.udev = { + packages = [ + pkgs.android-udev-rules + pkgs.platformio-core.udev + ]; + }; + + hardware = { + enableAllFirmware = true; + cpu.intel.updateMicrocode = true; + # firmware = with pkgs; [ wireless-regdb rtw88-firmware ]; + }; + + nixpkgs.config.packageOverrides = pkgs: { + vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; + }; + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + extraPackages = with pkgs; [ + intel-media-driver + vaapiIntel + vaapiVdpau + libvdpau-va-gl + # intel-ocl + intel-media-driver + intel-gmmlib + vulkan-tools + mesa.drivers + ]; + }; + + # Bootloader + boot.loader = { + systemd-boot = { + enable = true; + configurationLimit = 30; + }; + timeout = 1; + efi.canTouchEfiVariables = true; + }; + + # File system + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/17ac9757-d710-4456-9a94-7b6086a35638"; + fileSystems = { + "/" = { + device = "/dev/mapper/crypted"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-label/boot"; + fsType = "vfat"; + }; + }; + swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + networking.useDHCP = lib.mkDefault true; + powerManagement = { + enable = true; + cpuFreqGovernor = lib.mkDefault "powersave"; + }; +} diff --git a/hardware/thinkpad-e14/hardware-configuration.nix b/hardware/thinkpad-e14/hardware-configuration.nix deleted file mode 100644 index 20a864a..0000000 --- a/hardware/thinkpad-e14/hardware-configuration.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - services.fwupd.enable = true; - - # 2-Sep-2023, Bug: https://nixpk.gs/pr-tracker.html?pr=252605 - boot.kernelPackages = pkgs.linuxPackages_6_6; - boot.initrd = { - availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "thunderbolt" - "sd_mod" - ]; - kernelModules = [ ]; - }; - boot.kernelModules = [ - "kvm-intel" - "rtw88_8822ce" - "sd_mod" - "snd-seq" - "snd-rawmidi" - "uinput" - "v4l2loopback" - "acpi_call" - ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - boot.kernelParams = [ - "i8042.nopnp=1" - "pci=nocrs" - "acpi_backlight=native" - "i915.enable_dpcd_backlight=1" - "i915.force_probe=46a8" - ]; - boot.extraModprobeConfig = '' - options snd slots=snd-hda-intel - options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" - ''; - boot.supportedFilesystems = [ "ntfs" ]; - # boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - - services.throttled.enable = true; - - services.udev = { - packages = [ - pkgs.android-udev-rules - pkgs.platformio-core.udev - ]; - }; - - hardware = { - enableAllFirmware = true; - cpu.intel.updateMicrocode = true; - # firmware = with pkgs; [ wireless-regdb rtw88-firmware ]; - }; - - nixpkgs.config.packageOverrides = pkgs: { - vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; }; - }; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - # intel-ocl - intel-media-driver - intel-gmmlib - vulkan-tools - mesa.drivers - ]; - }; - - # Bootloader - boot.loader = { - systemd-boot = { - enable = true; - configurationLimit = 30; - }; - timeout = 1; - efi.canTouchEfiVariables = true; - }; - - # File system - boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/17ac9757-d710-4456-9a94-7b6086a35638"; - fileSystems = { - "/" = { - device = "/dev/mapper/crypted"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-label/boot"; - fsType = "vfat"; - }; - }; - swapDevices = [{ device = "/dev/disk/by-label/swap"; }]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - networking.useDHCP = lib.mkDefault true; - powerManagement = { - enable = true; - cpuFreqGovernor = lib.mkDefault "powersave"; - }; -} -- cgit v1.3.1