diff --git a/flake.nix b/flake.nix index 5e0e5702..6c6f66af 100644 --- a/flake.nix +++ b/flake.nix @@ -31,16 +31,16 @@ nixosConfigurations = { - # # Framework 13 with AMD Ryzen 7640U and 32GB RAM. - # lavaridge = nixpkgs-unstable.lib.nixosSystem { - # system = "x86_64-linux"; - # modules = [ - # nixos-hardware.nixosModules.framework-13-7040-amd - # home-manager-unstable.nixosModules.home-manager - # ./hosts/lavaridge - # ./desktop/gnome - # ]; - # }; + # Framework 13 with AMD Ryzen 7640U and 32GB RAM. + lavaridge = nixpkgs-unstable.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + nixos-hardware.nixosModules.framework-13-7040-amd + home-manager-unstable.nixosModules.home-manager + ./hosts/lavaridge + ./desktop/gnome + ]; + }; # T440p with i5-4210M and 16GB RAM. rustboro = nixpkgs-unstable.lib.nixosSystem { diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index 17b243c7..55af9b92 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -24,16 +24,14 @@ powerManagement.powertop.enable = true; - { - services.fwupd.enable = true; - # we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware - services.fwupd.package = (import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz"; - sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk"; - }) { - inherit (pkgs) system; - }).fwupd; - } + services.fwupd.enable = true; + # we need fwupd 1.9.7 to downgrade the fingerprint sensor firmware + services.fwupd.package = (import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/bb2009ca185d97813e75736c2b8d1d8bb81bde05.tar.gz"; + sha256 = "sha256:003qcrsq5g5lggfrpq31gcvj82lb065xvr7bpfa8ddsw8x4dnysk"; + }) { + inherit (pkgs) system; + }).fwupd; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/hosts/lavaridge/hardware-configuration.nix b/hosts/lavaridge/hardware-configuration.nix index 42b0c6a5..6b5790c2 100644 --- a/hosts/lavaridge/hardware-configuration.nix +++ b/hosts/lavaridge/hardware-configuration.nix @@ -7,4 +7,32 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/2a76d315-37f9-406d-b1b2-01fee209139a"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7BC8-F615"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # 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 + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp193s0f3u1c2.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }