diff --git a/flake.nix b/flake.nix index fd0ec4b..699ac6a 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,10 @@ # url = "github:kaylorben/nixcord"; #}; + nix-hardware-stable-nixos = { + url = "github:NixOS/nixos-hardware/master"; + }; + sops-nix-stable-nixos = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; diff --git a/nodes/hosts/group.nix b/nodes/hosts/group.nix index 01c59e8..e3bcfda 100644 --- a/nodes/hosts/group.nix +++ b/nodes/hosts/group.nix @@ -7,4 +7,5 @@ nixy = { deploy.local = true; }; + nixwork = {}; } diff --git a/nodes/hosts/nixwork/configuration.nix b/nodes/hosts/nixwork/configuration.nix index e837664..9ffe568 100644 --- a/nodes/hosts/nixwork/configuration.nix +++ b/nodes/hosts/nixwork/configuration.nix @@ -2,15 +2,16 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ ... }: +{ inputs, ... }: { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + inputs.nixos-hardware.nixosModules.framework-16-7040-amd ./programs/sof-firmware.nix # Not working yet. - #./services/fprintd.nix + ./services/fprintd.nix ./services/touchpad.nix ./system/bootloader.nix ./system/filesystems.nix diff --git a/nodes/hosts/nixwork/hardware-configuration.nix b/nodes/hosts/nixwork/hardware-configuration.nix index 5dc85ef..d64516b 100644 --- a/nodes/hosts/nixwork/hardware-configuration.nix +++ b/nodes/hosts/nixwork/hardware-configuration.nix @@ -1,14 +1,26 @@ # 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") ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_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.enp193s0f3u1.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.xpadneo.enable = true; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nodes/hosts/nixwork/services/fprintd.nix b/nodes/hosts/nixwork/services/fprintd.nix index 290efe6..5dd3041 100644 --- a/nodes/hosts/nixwork/services/fprintd.nix +++ b/nodes/hosts/nixwork/services/fprintd.nix @@ -1,5 +1,3 @@ { pkgs, ...}: { services.fprintd.enable = true; - services.fprintd.tod.enable = true; - services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix-550a; }