From 4df75562a806cd69beec58353228c6d032511edd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 27 Sep 2024 09:44:47 +0200 Subject: [PATCH] clean up hardware option configured by nixos facter --- nixos-modules/bluetooth/default.nix | 15 --------------- nixos-modules/default.nix | 1 - systems/kuraokami/default.nix | 1 - systems/omoikane/default.nix | 1 - systems/omoikane/hardware.nix | 17 ----------------- 5 files changed, 35 deletions(-) delete mode 100644 nixos-modules/bluetooth/default.nix diff --git a/nixos-modules/bluetooth/default.nix b/nixos-modules/bluetooth/default.nix deleted file mode 100644 index 8f0beb2..0000000 --- a/nixos-modules/bluetooth/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config, lib, ... }: - -let - cfg = config.jopejoe1.bluetooth; -in -{ - options.jopejoe1.bluetooth = { - enable = lib.mkEnableOption "Enable Bluetooth"; - }; - - config = lib.mkIf cfg.enable { - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - }; -} diff --git a/nixos-modules/default.nix b/nixos-modules/default.nix index d0086be..8e7528f 100644 --- a/nixos-modules/default.nix +++ b/nixos-modules/default.nix @@ -5,7 +5,6 @@ ./asf ./audio ./auto-update - ./bluetooth ./boot ./doc ./events diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index ea5e8c7..e3e87be 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -28,7 +28,6 @@ enable = true; sennheiser-hd-660s = true; }; - bluetooth.enable = true; local.enable = true; nix.enable = true; plasma.enable = true; diff --git a/systems/omoikane/default.nix b/systems/omoikane/default.nix index 285964a..daa6e9e 100644 --- a/systems/omoikane/default.nix +++ b/systems/omoikane/default.nix @@ -20,7 +20,6 @@ audio = { enable = true; }; - bluetooth.enable = true; local.enable = true; nix.enable = true; plasma.enable = true; diff --git a/systems/omoikane/hardware.nix b/systems/omoikane/hardware.nix index 68d7fef..ca76a1a 100644 --- a/systems/omoikane/hardware.nix +++ b/systems/omoikane/hardware.nix @@ -9,20 +9,6 @@ }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "thunderbolt" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ "amdgpu" ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - fileSystems."/" = { device = "/dev/disk/by-uuid/6842a9de-c5fd-4648-b3b8-f76e56633825"; fsType = "ext4"; @@ -45,8 +31,5 @@ options = [ "compression=zstd" ]; }; - swapDevices = [ ]; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }