diff --git a/flake.nix b/flake.nix index ec75400..5eea5ad 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ agenix.inputs.darwin.follows = ""; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixos-hardware.inputs.nixpkgs.follows = "nixpkgs"; nixvim.url = "git+https://git.alejandr0angul0.dev/alejandro-angulo/nixvim-config?ref=main"; # nixvim.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/systems/x86_64-linux/framework/default.nix b/systems/x86_64-linux/framework/default.nix index 28303d5..64c9fc0 100644 --- a/systems/x86_64-linux/framework/default.nix +++ b/systems/x86_64-linux/framework/default.nix @@ -1,4 +1,9 @@ -{ inputs, pkgs, lib, ... }: +{ + inputs, + pkgs, + lib, + ... +}: { imports = [ # Include the results of the hardware scan. @@ -25,7 +30,6 @@ hardware.audio.enable = true; hardware.bluetooth.enable = true; - hardware.tlp.enable = true; # system.zfs.enable = true; apps.yubikey.enable = true; @@ -38,6 +42,9 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + + services.fwupd.enable = true; virtualisation = { docker = { diff --git a/systems/x86_64-linux/framework/hardware-configuration.nix b/systems/x86_64-linux/framework/hardware-configuration.nix index c328bc9..4400243 100644 --- a/systems/x86_64-linux/framework/hardware-configuration.nix +++ b/systems/x86_64-linux/framework/hardware-configuration.nix @@ -1,31 +1,42 @@ -# 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, pkgs, modulesPath, ... }: +{ + config, + lib, + modulesPath, + ... +}: { -# 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 = [ ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - fileSystems."/" = - { device = "UUID=00a14ad6-5635-4b54-b7e2-a35943639bb8"; - fsType = "bcachefs"; - }; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "thunderbolt" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/66E9-291D"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/" = { + device = "UUID=00a14ad6-5635-4b54-b7e2-a35943639bb8"; + fsType = "bcachefs"; + }; - swapDevices = [ {device = "/dev/disk/by-label/SWAP";} ]; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/66E9-291D"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; -# nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -# hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + swapDevices = [ { device = "/dev/disk/by-label/SWAP"; } ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }