This commit is contained in:
ari committed 2026-09-20 20:32:33 -04:00
1 parent 8cb5978f3a
commit 7a3d64e645
16 files changed
+55 -106

No files matched your search

+3 -3
View File
@@ -12,8 +12,8 @@ hardware/
├── default.nix # imports + fwupd + enableAllFirmware
├── amdgpu.nix # skyg.nixos.common.hardware.amdgpu — amdgpu driver + ROCm ICD
├── nvidia.nix # skyg.nixos.common.hardware.nvidia — driver + container toolkit
├── sound.nix # skyg.nixos.common.hardware.sound — PipeWire ALSA/JACK + rtkit
├── pipewire.nix # skyg.nixos.common.hardware.pipewire — full PipeWire stack
├── pipewire.nix # skyg.nixos.common.hardware.pipewire — full PipeWire stack (ALSA/JACK/pulse + rtkit)
├── bluetooth.nix # skyg.nixos.common.hardware.bluetooth — BR/EDR-only bluetooth
├── fan2go.nix # skyg.nixos.common.hardware.fan2go — fan2go curve-based fan control
├── fancontrol.nix # skyg.nixos.common.hardware.fancontrol — lm_sensors fancontrol
├── laptop-power.nix # skyg.nixos.common.hardware.laptop-power-mgr — lid events + power mgmt
@@ -25,8 +25,8 @@ hardware/
```
skyg.nixos.common.hardware.amdgpu.enable
skyg.nixos.common.hardware.nvidia.enable
skyg.nixos.common.hardware.sound.enable
skyg.nixos.common.hardware.pipewire.enable
skyg.nixos.common.hardware.bluetooth.enable
skyg.nixos.common.hardware.fan2go.{enable,dbPath}
skyg.nixos.common.hardware.fancontrol.{enable,configName}
skyg.nixos.common.hardware.laptop-power-mgr.enable
@@ -0,0 +1,17 @@
{ lib
, config
, ...
}:
let
cfg = config.skyg.nixos.common.hardware.bluetooth;
in
{
options.skyg.nixos.common.hardware.bluetooth = with lib; {
enable = mkEnableOption "bluetooth, BR/EDR only (BLE disabled)";
};
config = lib.mkIf cfg.enable {
hardware.bluetooth.enable = true;
hardware.bluetooth.settings.General.ControllerMode = "bredr";
};
}
+1 -1
View File
@@ -3,8 +3,8 @@
imports = [
./fan2go.nix
./fancontrol.nix
./sound.nix
./pipewire.nix
./bluetooth.nix
./laptop-power.nix
./nvidia.nix
./amdgpu.nix
+6 -4
View File
@@ -7,7 +7,7 @@ let
in
{
options.skyg.nixos.common.hardware.pipewire = with lib; {
enable = mkEnableOption "pipewire";
enable = mkEnableOption "pipewire audio stack";
};
config = lib.mkIf cfg.enable {
@@ -15,13 +15,15 @@ in
security.rtkit.enable = true;
services.pipewire = {
enable = true;
audio.enable = true;
wireplumber.enable = true;
pulse.enable = true;
alsa.enable = true;
alsa.support32Bit = true;
jack.enable = true;
systemWide = false;
socketActivation = true;
};
services.jack = {
alsa.enable = true;
};
services.jack.alsa.enable = true;
};
}
-25
View File
@@ -1,25 +0,0 @@
{ lib
, config
, ...
}:
let
cfg = config.skyg.nixos.common.hardware.sound;
in
{
options.skyg.nixos.common.hardware.sound = with lib; {
enable = mkEnableOption "sound";
};
config = lib.mkIf cfg.enable {
services.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
alsa.enable = true;
alsa.support32Bit = true;
jack.enable = true;
};
services.jack = {
alsa.enable = true;
};
};
}