From 5dc4dfee1119332a54a6e7abc23545c9e0e730a9 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Tue, 21 May 2024 11:34:41 -0400 Subject: [PATCH] Dirty --- hosts/kim/default.nix | 4 +--- hosts/kim/hardware-configuration.nix | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix index 529becd..bd101e0 100644 --- a/hosts/kim/default.nix +++ b/hosts/kim/default.nix @@ -12,12 +12,10 @@ inputs.nixpkgs.lib.nixosSystem { lix-module.nixosModules.default home-manager.nixosModules.home-manager sops-nix.nixosModules.sops + ./hardware-configuration.nix ../../modules/common ../../modules/nixos { - imports = [ - ./hardware-configuration.nix - ]; # something with overlays, I don't get those yet. # Hardware diff --git a/hosts/kim/hardware-configuration.nix b/hosts/kim/hardware-configuration.nix index e75ab6a..e82cc5d 100644 --- a/hosts/kim/hardware-configuration.nix +++ b/hosts/kim/hardware-configuration.nix @@ -1,12 +1,12 @@ -{ inputs, globals, config, lib, pkgs, modulesPath, ... }: -with inputs; +{ config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - # boot.loader.grub.device = "/dev/vda"; + boot.loader.grub.device = "/dev/vda"; services.xserver.videoDrivers = [ "amdgpu" ]; # TODO: I use wayland, do I need this? hardware.enableRedistributableFirmware = true; powerManagement.cpuFreqGovernor = "performance"; @@ -26,6 +26,6 @@ with inputs; swapDevices = [ ]; - nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = true; }