From d735b392d4c9c41b3d50f134507888d64e290cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 10 Apr 2025 22:24:20 +0200 Subject: [PATCH] tungsten: include hardware configuration --- .../tungsten/nixos/hardware-configuration.nix | 13 +++++-------- .../tungsten/nixos/unfree-predicate.nix | 3 +++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nix/configurations/tungsten/nixos/hardware-configuration.nix b/nix/configurations/tungsten/nixos/hardware-configuration.nix index 32be11fa..21a64d5d 100644 --- a/nix/configurations/tungsten/nixos/hardware-configuration.nix +++ b/nix/configurations/tungsten/nixos/hardware-configuration.nix @@ -12,21 +12,18 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt"]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod"]; boot.initrd.kernelModules = ["dm-snapshot"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.kernelModules = ["kvm-intel" "wl"]; + boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp195s0f4u1u4.useDHCP = lib.mkDefault true; - # networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s20u2c2.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nix/configurations/tungsten/nixos/unfree-predicate.nix b/nix/configurations/tungsten/nixos/unfree-predicate.nix index 5557ee4d..5261d8c3 100644 --- a/nix/configurations/tungsten/nixos/unfree-predicate.nix +++ b/nix/configurations/tungsten/nixos/unfree-predicate.nix @@ -4,6 +4,9 @@ name = lib.getName pkg; in builtins.elem name [ + # wifi driver + "broadcom-sta" + "languagetool" "vscode"