From 591db450c474553869e2c358a7e6aa49ca33c9d8 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Tue, 8 Oct 2024 20:31:32 -0700 Subject: [PATCH] update hardware config --- hosts/desktop/configuration.nix | 2 +- hosts/desktop/hardware-configuration.nix | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 5c99e32..7eea280 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -162,7 +162,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - inputs.foundryvtt.nixosModules.foundryvtt + # inputs.foundryvtt.nixosModules.foundryvtt ]; # Enable OpenGL diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 5a392b1..aeddc69 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -8,10 +8,10 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "wl" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/5838d50d-e6e8-4ad2-a25e-524f4c46da35"; @@ -21,6 +21,18 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/2319-EE79"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home/nmarks/Games/steam" = + { device = "/dev/disk/by-uuid/e7ac46ce-edcb-4763-8717-a7c67de5c7f3"; + fsType = "ext4"; + }; + + fileSystems."/home/nmarks/Games/steam" = + { device = "/home/nmarks/Games/steam"; + fsType = "none"; + options = [ "bind" ]; }; swapDevices = @@ -32,8 +44,10 @@ # 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.enp34s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + # networking.interfaces.docker0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp11s0.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;