home: pavucontrol when gui enabled

2 files changed, 17 insertions, 10 deletions

diff --git a/modules/home-manager/personal/gui/default.nix b/modules/home-manager/personal/gui/default.nix
index 838e6cb..0dcf806 100644
--- a/modules/home-manager/personal/gui/default.nix
+++ b/modules/home-manager/personal/gui/default.nix
@@ -1,13 +1,19 @@
-{ config, lib, pkgs, ... }@extraArgs:
-
-let cfg = config.personal.gui;
+{
+  config,
+  lib,
+  pkgs,
+  ...
+} @ extraArgs: let
+  cfg = config.personal.gui;
 in {
-  imports = [ ./redshift.nix ./x ];
+  imports = [./redshift.nix ./x];
 
   options.personal.gui = {
-    enable = lib.mkEnableOption "GUI" // {
-      default = extraArgs.osConfig.personal.gui.enable or false;
-    };
+    enable =
+      lib.mkEnableOption "GUI"
+      // {
+        default = extraArgs.osConfig.personal.gui.enable or false;
+      };
   };
 
   config = lib.mkIf cfg.enable {
@@ -37,8 +43,9 @@ in {
       platformTheme = lib.mkDefault "gtk";
     };
 
-    home.packages = lib.optional config.dconf.enable pkgs.dconf
-      ++ [ pkgs.keepassxc ];
+    home.packages =
+      lib.optional config.dconf.enable pkgs.dconf
+      ++ (with pkgs; [keepassxc pavucontrol]);
     programs.firefox.enable = true;
   };
 }
diff --git a/modules/home-manager/personal/profiles.nix b/modules/home-manager/personal/profiles.nix
index 39d3ec2..44e8e5d 100644
--- a/modules/home-manager/personal/profiles.nix
+++ b/modules/home-manager/personal/profiles.nix
@@ -45,7 +45,7 @@ in {
     })
 
     (lib.mkIf cfg.multimedia {
-      home.packages = with pkgs; [pavucontrol transmission-gtk vlc];
+      home.packages = with pkgs; [transmission-gtk vlc];
       personal = {
         gui.enable = lib.mkForce true;
         firefox.webapps = [