From fcddd3ba06088e235243d41395e40fd9e0107a76 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Tue, 1 Oct 2024 06:02:50 -0700 Subject: modules: move shared pc modules from desktop to pc --- modules/desktop/hardware/bluetooth.nix | 19 ------------------- modules/desktop/hardware/cpu.nix | 21 --------------------- modules/desktop/hardware/default.nix | 14 -------------- modules/desktop/hardware/tpm.nix | 18 ------------------ modules/desktop/hardware/usb.nix | 10 ---------- modules/desktop/hardware/yubikey.nix | 18 ------------------ 6 files changed, 100 deletions(-) delete mode 100644 modules/desktop/hardware/bluetooth.nix delete mode 100644 modules/desktop/hardware/cpu.nix delete mode 100644 modules/desktop/hardware/default.nix delete mode 100644 modules/desktop/hardware/tpm.nix delete mode 100644 modules/desktop/hardware/usb.nix delete mode 100644 modules/desktop/hardware/yubikey.nix (limited to 'modules/desktop/hardware') diff --git a/modules/desktop/hardware/bluetooth.nix b/modules/desktop/hardware/bluetooth.nix deleted file mode 100644 index 9737504..0000000 --- a/modules/desktop/hardware/bluetooth.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: -{ - boot.kernelParams = [ "btusb" ]; - services.blueman.enable = true; - - hardware.bluetooth = { - enable = true; - powerOnBoot = true; - package = pkgs.bluez5-experimental; - disabledPlugins = [ "sap" ]; - # hsphfpd.enable = true; - - settings.General = { - JustWorksRepairing = "always"; - MultiProfile = "multiple"; - Experimental = true; - }; - }; -} diff --git a/modules/desktop/hardware/cpu.nix b/modules/desktop/hardware/cpu.nix deleted file mode 100644 index 1ac3a27..0000000 --- a/modules/desktop/hardware/cpu.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, config, ... }: -{ - environment.systemPackages = [ pkgs.amdctl ]; - - powerManagement = { - enable = true; - cpuFreqGovernor = "performance"; - }; - - boot = { - kernelModules = [ - # "kvm-amd" - "amd-pstate" - "zenpower" - "msr" - ]; - - kernelParams = [ "amd_iommu=on" ]; - extraModulePackages = [ config.boot.kernelPackages.zenpower ]; - }; -} diff --git a/modules/desktop/hardware/default.nix b/modules/desktop/hardware/default.nix deleted file mode 100644 index 167e7c7..0000000 --- a/modules/desktop/hardware/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - imports = [ - ./cpu.nix - ./bluetooth.nix - ./usb.nix - ./tpm.nix - ./yubikey.nix - ]; - - hardware = { - enableRedistributableFirmware = true; - enableAllFirmware = true; - }; -} diff --git a/modules/desktop/hardware/tpm.nix b/modules/desktop/hardware/tpm.nix deleted file mode 100644 index b84551e..0000000 --- a/modules/desktop/hardware/tpm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -{ - security.tpm2 = { - enable = true; - applyUdevRules = true; - abrmd.enable = true; - tctiEnvironment.enable = true; - pkcs11.enable = true; - }; - - environment.systemPackages = with pkgs; [ - tpm2-tools - tpm2-tss - tpm2-abrmd - ]; - - boot.kernelModules = [ "uhid" ]; -} diff --git a/modules/desktop/hardware/usb.nix b/modules/desktop/hardware/usb.nix deleted file mode 100644 index f697761..0000000 --- a/modules/desktop/hardware/usb.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - usbutils - lm_sensors - pciutils - ]; - - boot.kernelParams = [ "usbcore.autosuspend=-1" ]; -} diff --git a/modules/desktop/hardware/yubikey.nix b/modules/desktop/hardware/yubikey.nix deleted file mode 100644 index 6bd4a5c..0000000 --- a/modules/desktop/hardware/yubikey.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, ... }: -{ - hardware.gpgSmartcards.enable = true; - - services = { - pcscd.enable = true; - udev.packages = [ pkgs.yubikey-personalization ]; - }; - - environment.systemPackages = with pkgs; [ - yubikey-manager - yubikey-manager-qt - yubikey-personalization - yubikey-personalization-gui - yubico-piv-tool - yubioath-flutter - ]; -} -- cgit v1.2.3