diff --git a/flake.nix b/flake.nix index 5f5e61b..5e35a81 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,7 @@ inputs.disko.nixosModules.disko inputs.stylix.nixosModules.stylix inputs.nixvim.nixosModules.nixvim - inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.nixos-hardware.nixosModules.framework-13-7040-amd ./hosts/Lenni ./pkgs ]; diff --git a/hosts/Lenni/default.nix b/hosts/Lenni/default.nix index 7355bfa..6229c86 100644 --- a/hosts/Lenni/default.nix +++ b/hosts/Lenni/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./auto-cpufreq.nix + #./auto-cpufreq.nix ./backlight.nix ./hardware-configuration.nix #./disko.nix diff --git a/hosts/Lenni/hardware-configuration.nix b/hosts/Lenni/hardware-configuration.nix index 0197924..6d4c1f3 100644 --- a/hosts/Lenni/hardware-configuration.nix +++ b/hosts/Lenni/hardware-configuration.nix @@ -1,22 +1,20 @@ # 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, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { - device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840"; + { device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840"; fsType = "btrfs"; options = [ "subvol=@" ]; }; @@ -24,12 +22,16 @@ boot.initrd.luks.devices."luks-a2f76baf-2f27-42a4-ae48-1963c566a9ab".device = "/dev/disk/by-uuid/a2f76baf-2f27-42a4-ae48-1963c566a9ab"; fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/2A99-D7CC"; + { device = "/dev/disk/by-uuid/2A99-D7CC"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; + fileSystems."/mnt/nfs" = + { device = "/nix/store/8zm9gh07p3rx8b3vqiwa1qb7zsml17sk-auto.nfs"; + fsType = "autofs"; + }; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -37,8 +39,9 @@ # 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.wlp166s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp195s0f3u1c2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }