From 3d51ed4106012ecdccba587a60c0aa62a11bbd70 Mon Sep 17 00:00:00 2001 From: kenny Date: Sun, 29 Jun 2025 15:01:29 +0300 Subject: [PATCH] Corrected duplicate calls to boot.stuff --- hosts/puter/hardware-configuration.nix | 43 +++++++++++--------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/hosts/puter/hardware-configuration.nix b/hosts/puter/hardware-configuration.nix index 500d413..08f2742 100644 --- a/hosts/puter/hardware-configuration.nix +++ b/hosts/puter/hardware-configuration.nix @@ -1,34 +1,31 @@ # 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, - ... -}: { - imports = [(modulesPath + "/installer/scan/not-detected.nix")]; +{ config, lib, pkgs, modulesPath, ... }: { + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel" "wl"]; - boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; fileSystems."/" = { device = "/dev/disk/by-uuid/19a0aa4c-8d49-4545-9ed6-cd4a952f9353"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-08992355-1404-44dc-9bb4-fd32f1d0b62d".device = "/dev/disk/by-uuid/08992355-1404-44dc-9bb4-fd32f1d0b62d"; + boot.initrd.luks.devices."luks-08992355-1404-44dc-9bb4-fd32f1d0b62d".device = + "/dev/disk/by-uuid/08992355-1404-44dc-9bb4-fd32f1d0b62d"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/F54E-7011"; fsType = "vfat"; - options = ["fmask=0022" "dmask=0022"]; + options = [ "fmask=0022" "dmask=0022" ]; }; - swapDevices = [{device = "/dev/disk/by-uuid/c9b7b195-d072-4574-8e39-a5e4f90ca84d";}]; + swapDevices = + [{ device = "/dev/disk/by-uuid/c9b7b195-d072-4574-8e39-a5e4f90ca84d"; }]; # 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 @@ -43,11 +40,12 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc"; + boot.initrd.luks.devices."luks-d27fc6c5-7edd-4c18-ab70-3ca02a28abcc".device = + "/dev/disk/by-uuid/d27fc6c5-7edd-4c18-ab70-3ca02a28abcc"; nixpkgs.config.packageOverrides = pkgs: { intel-vaapi-driver = - pkgs.intel-vaapi-driver.override {enableHybridCodec = true;}; + pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; hardware.opengl = { @@ -59,7 +57,7 @@ ]; }; - environment.sessionVariables = {LIBVA_DRIVER_NAME = "iHD";}; + environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; hardware.facetimehd = { enable = true; @@ -76,12 +74,7 @@ ''; # This goes in the extraConfig section IdleAction=ignore }; - environment.systemPackages = with pkgs; [ - mbpfan - thermald - ]; + environment.systemPackages = with pkgs; [ mbpfan thermald ]; - boot.kernelModules = ["wl"]; - boot.blacklistedKernelModules = ["b43" "ssb" "brcmfmac" "brcmsmac" "bcma"]; - boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; + boot.blacklistedKernelModules = [ "b43" "ssb" "brcmfmac" "brcmsmac" "bcma" ]; }