From 0bd415928c8b02aa5f0a8d53a8ff99974f05a208 Mon Sep 17 00:00:00 2001 From: chaos Date: Mon, 1 Apr 2024 18:18:10 +0200 Subject: [PATCH] make hardware profiles prettier --- profiles/base/hardware.nix | 23 ++++++++++++++++------- profiles/printing/printing.nix | 17 +++++++++++++++-- users/chaos.nix | 2 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/profiles/base/hardware.nix b/profiles/base/hardware.nix index 64fd3a6..e51b984 100644 --- a/profiles/base/hardware.nix +++ b/profiles/base/hardware.nix @@ -4,12 +4,21 @@ ... }: let inherit (lib.modules) mkIf; + + is_x86 = "${pkgs.system}" == "x86_64-linux"; in { - hardware.enableRedistributableFirmware = true; - hardware.enableAllFirmware = true; - hardware.cpu.intel.updateMicrocode = - mkIf ("${pkgs.system}" == "x86_64-linux") true; - hardware.cpu.amd.updateMicrocode = - mkIf ("${pkgs.system}" == "x86_64-linux") true; - hardware.wirelessRegulatoryDatabase = true; + hardware = { + enableAllFirmware = true; + enableRedistributableFirmware = true; + wirelessRegulatoryDatabase = true; + +ksm.enable = true; + + i2c.enable = true; + + cpu = { + intel.updateMicrocode = mkIf is_x86 true; + amd.updateMicrocode = mkIf is_x86 true; + }; + }; } diff --git a/profiles/printing/printing.nix b/profiles/printing/printing.nix index 50edad4..6b1eba5 100644 --- a/profiles/printing/printing.nix +++ b/profiles/printing/printing.nix @@ -1,4 +1,17 @@ {pkgs, ...}: { - services.printing.enable = true; - services.printing.drivers = with pkgs; [gutenprint hplip]; + services.avahi = { + enable = true; + nssmdns = true; + openFirewall = true; + }; + + services.printing = { + enable = true; + drivers = with pkgs; [gutenprint hplip]; + }; + + hardware.sane = { + enable = true; + openFirewall = true; + }; } diff --git a/users/chaos.nix b/users/chaos.nix index f089087..b5f03f5 100644 --- a/users/chaos.nix +++ b/users/chaos.nix @@ -13,6 +13,8 @@ "uinput" "audio" "rtkit" + "i2c" + "kvm" ]; openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZpvkllLt7HinNpisOx7hWT2br68UoCg0sXKTxHEeUB chaos@chaos"