From 483ee7f0205e80e8d8d1af8f87d500f567f0a922 Mon Sep 17 00:00:00 2001 From: Roy Dumblauskas Date: Tue, 15 Apr 2025 21:58:02 -0500 Subject: [PATCH] require generation of hardware file --- nixos/hardware-configuration.nix | 26 +------------------------- nixos/home.nix | 2 +- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 60e6ce9..a40df93 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -1,25 +1 @@ -# 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, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - # 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.enp9s0f0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} +throw "Have you forgotten to run nixos-anywhere with `--generate-hardware-config nixos-generate-config ./hardware-configuration.nix`?" diff --git a/nixos/home.nix b/nixos/home.nix index 8184e2b..d1ae972 100644 --- a/nixos/home.nix +++ b/nixos/home.nix @@ -7,7 +7,7 @@ # Secret Management sops = { - age.keyFile = "/home/sysAdmin/.config/sops/age/keys.txt"; # No password! + age.keyFile = "./age/keys.txt"; # Make sure to gitignore, contains private key. defaultSopsFile = ./secrets/build.json; defaultSymlinkPath = "/run/user/1000/secrets";