From 608deed2aaa88f88cb9230b9132294581b63bbab Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 5 Apr 2022 16:47:35 -0700 Subject: sound: add a new module This is the start of yet another refactoring of the configuration. Sound configuration is moving to a module, and we enable it as needed at the host level. It takes care of configuring pipewire and install the packages needed too. This module is applied to the laptop and the desktop. --- hosts/carmel/default.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'hosts/carmel') diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index 0234e90..ecc8362 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -1,13 +1,13 @@ { config, pkgs, hostname, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ../common/desktop - # In order to unlock the root disk remotely - ../common/system/boot-ssh.nix - ]; + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./sound.nix + ../common/desktop + # In order to unlock the root disk remotely + ../common/system/boot-ssh.nix + ]; boot = { # get an IP address on boot, so we can unlock the root disk remotely @@ -27,13 +27,11 @@ networks = { enp9s0 = { matchConfig.Name = "enp9s0"; - networkConfig = { - DHCP = "yes"; - }; + networkConfig = { DHCP = "yes"; }; extraConfig = '' - [DHCPv4] - UseDNS=yes - UseDomains=yes + [DHCPv4] + UseDNS=yes + UseDomains=yes ''; }; }; -- cgit 1.4.1