From 2862aa7aa9b77060c7d68af7dc28760599b6f719 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 22 Aug 2024 21:26:47 +0200 Subject: [PATCH] removed nixos-hardware --- flake.nix | 3 --- hosts/default.nix | 3 --- hosts/vali/hermit/configuration.nix | 1 + hosts/vali/hermit/hardware-configuration.nix | 7 ++++++- modules/system/nix/module.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 3724c82..9405cef 100644 --- a/flake.nix +++ b/flake.nix @@ -39,9 +39,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Hardware for my laptop - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - # Hyprland, my main compositor hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; diff --git a/hosts/default.nix b/hosts/default.nix index 6d5ed71..a45fb9d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -38,7 +38,6 @@ in { ./vali/temperance ../modules inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default ]; }; @@ -49,8 +48,6 @@ in { ./vali/hermit ../modules inputs.home-manager.nixosModules.home-manager - # inputs.lix-module.nixosModules.default - inputs.nixos-hardware.nixosModules.dell-xps-15-7590-nvidia ]; }; } diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index a3ce472..ff1352d 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -13,6 +13,7 @@ programs.kdeconnect.enable = true; programs.dconf.enable = true; boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; + services.thermald.enable = true; modules = { system = { diff --git a/hosts/vali/hermit/hardware-configuration.nix b/hosts/vali/hermit/hardware-configuration.nix index 76ffc17..261257c 100644 --- a/hosts/vali/hermit/hardware-configuration.nix +++ b/hosts/vali/hermit/hardware-configuration.nix @@ -15,6 +15,7 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel"]; + boot.kernelParams = ["mem_sleep_default=deep"]; boot.extraModulePackages = []; fileSystems."/" = { @@ -32,7 +33,8 @@ # swapDevices = # [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; } # ]; - + # Earlier font setup + console.earlySetup = true; # 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 @@ -40,6 +42,9 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.wlp59s0.useDHCP = lib.mkDefault true; + # Enable firmware updates via `fwupdmgr`. + services.fwupd.enable = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index fdd101e..559275a 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -55,7 +55,7 @@ # Let the system decide the number of max jobs # based on available system specs. Usually this is # the same as the number of cores your CPU has. - max-jobs = "auto"; + max-jobs = 2; # If set, Nix will perform builds in a sandboxed environment # that it will set up automatically for each build.