From 19805a3c6bb33a18b1d0eb58606ea4bcb812128c Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Thu, 27 Jun 2024 11:08:17 -0500 Subject: [PATCH] move sound into a common module --- hosts/_common/components/audio.nix | 8 ++++++++ hosts/gpdPocket3/configuration.nix | 5 +---- hosts/h002/configuration.nix | 5 +---- hosts/joe/configuration.nix | 5 +---- 4 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 hosts/_common/components/audio.nix diff --git a/hosts/_common/components/audio.nix b/hosts/_common/components/audio.nix new file mode 100644 index 00000000..c8f31bfb --- /dev/null +++ b/hosts/_common/components/audio.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + hardware.pulseaudio.package = pkgs.pulseaudioFull; + environment.systemPackages = [ pkgs.pavucontrol ]; +} diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix index d8ec33cf..1dd43378 100644 --- a/hosts/gpdPocket3/configuration.nix +++ b/hosts/gpdPocket3/configuration.nix @@ -13,6 +13,7 @@ (settings.hostsDir + "/_common/components/ssh.nix") (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") + (settings.hostsDir + "/_common/components/audio.nix") (settings.hostsDir + "/_common/components/home_manager.nix") (settings.hostsDir + "/_common/components/gnome_wayland.nix") (settings.hostsDir + "/_common/components/docker.nix") @@ -34,10 +35,6 @@ environment.shellAliases = { wifi = "nmtui"; }; - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; environment.systemPackages = with pkgs; [ # [Laptop] Battery status diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix index 2360e1ba..73bd1c6d 100644 --- a/hosts/h002/configuration.nix +++ b/hosts/h002/configuration.nix @@ -11,6 +11,7 @@ (settings.hostsDir + "/_common/components/neovim.nix") (settings.hostsDir + "/_common/components/ssh.nix") (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") + (settings.hostsDir + "/_common/components/audio.nix") (settings.hostsDir + "/_common/components/home_manager.nix") (settings.hostsDir + "/_common/components/docker.nix") (settings.hostsDir + "/_common/components/nebula.nix") @@ -35,10 +36,6 @@ environment.shellAliases = { wifi = "nmtui"; }; - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; environment.systemPackages = with pkgs; [ nvtopPackages.full ]; diff --git a/hosts/joe/configuration.nix b/hosts/joe/configuration.nix index b2fb302d..f9422b49 100644 --- a/hosts/joe/configuration.nix +++ b/hosts/joe/configuration.nix @@ -13,6 +13,7 @@ (settings.hostsDir + "/_common/components/ssh.nix") (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix") (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") + (settings.hostsDir + "/_common/components/audio.nix") (settings.hostsDir + "/_common/components/home_manager.nix") (settings.hostsDir + "/_common/components/gnome_xorg.nix") (settings.hostsDir + "/_common/components/docker.nix") @@ -31,10 +32,6 @@ environment.shellAliases = { wifi = "nmtui"; }; - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.package = pkgs.pulseaudioFull; environment.systemPackages = with pkgs; [ nvtopPackages.full ];