diff --git a/modules/nixos/common/hardware/bluetooth.nix b/modules/nixos/common/hardware/bluetooth.nix new file mode 100644 index 0000000..2946799 --- /dev/null +++ b/modules/nixos/common/hardware/bluetooth.nix @@ -0,0 +1,7 @@ +{ ... }: { + + # enables support for Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + services.blueman.enable = true; +} diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 8e7ce89..2ef2e04 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -3,5 +3,19 @@ imports = [ ./fan2go.nix ./fancontrol.nix + ./sound.nix + ./bluetooth.nix ]; + # Firmware Updater + services.fwupd.enable = true; + # Enable all license firmware + hardware.enableAllFirmware = true; + + + + # Yubikey + services.yubikey-agent.enable = true; + + # Enable CUPS to print documents. + services.printing.enable = true; } diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix new file mode 100644 index 0000000..c2a336b --- /dev/null +++ b/modules/nixos/common/hardware/sound.nix @@ -0,0 +1,12 @@ +{ ... }: { + # Enable sound with pipewire. + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; +} diff --git a/modules/os/default.nix b/modules/os/default.nix index c806f52..b9ac6a3 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -14,7 +14,7 @@ (import ./containers/default.nix ({ user = user; } // containers)) - ] ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) + ] ++ (if enableNetworking then [ (import ./networking.nix { diff --git a/modules/os/hardware.nix b/modules/os/hardware.nix deleted file mode 100644 index b03cca8..0000000 --- a/modules/os/hardware.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ ... }: { - # Firmware Updater - services.fwupd.enable = true; - # Enable all license firmware - hardware.enableAllFirmware = true; - - # enables support for Bluetooth - hardware.bluetooth.enable = true; - hardware.bluetooth.powerOnBoot = true; - services.blueman.enable = true; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - sound.enable = true; - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - # Yubikey - services.yubikey-agent.enable = true; -}