From af67d04992a2916d0a4a8f0adbd62ce7621eeae3 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 29 May 2021 16:43:32 +0200 Subject: [PATCH] modules: hardware: move 'sound' --- machines/aramis/sound.nix | 2 +- modules/default.nix | 1 - modules/hardware/default.nix | 1 + modules/{ => hardware}/sound.nix | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename modules/{ => hardware}/sound.nix (92%) diff --git a/machines/aramis/sound.nix b/machines/aramis/sound.nix index 97537e3..f9dd1b0 100644 --- a/machines/aramis/sound.nix +++ b/machines/aramis/sound.nix @@ -1,6 +1,6 @@ { ... }: { - my.modules.sound = { + my.hardware.sound = { enable = true; pipewire = { diff --git a/modules/default.nix b/modules/default.nix index 81ece11..6094ddd 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,7 +10,6 @@ ./media.nix ./nix.nix ./packages.nix - ./sound.nix ./upower.nix ./users.nix ]; diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 773a6a7..292bd3c 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -6,5 +6,6 @@ ./bluetooth.nix ./ergodox.nix ./networking.nix + ./sound.nix ]; } diff --git a/modules/sound.nix b/modules/hardware/sound.nix similarity index 92% rename from modules/sound.nix rename to modules/hardware/sound.nix index 567a974..3a12843 100644 --- a/modules/sound.nix +++ b/modules/hardware/sound.nix @@ -1,9 +1,9 @@ { config, lib, ... }: let - cfg = config.my.modules.sound; + cfg = config.my.hardware.sound; in { - options.my.modules.sound = with lib; { + options.my.hardware.sound = with lib; { enable = mkEnableOption "sound configuration"; pipewire = {