From 7b234dfb19197c229aa4c8b578af2102d8857639 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 5 Apr 2024 07:04:22 -0400
Subject: [PATCH] chore: Add missing inherit

Also fixes an issue with mkMerge requiring things to be written
like this.
---
 modules/desktop.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index e575a5e3..0ebb4258 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -2,10 +2,9 @@
 
 let
   inherit (lib) mkEnableOption mkIf mkMerge;
-  inherit (pkgs.xfce) thunar-volman exo;
-  inherit (pkgs) glib;
   inherit (config.modules.system) username;
   inherit (cfg) japanese bloat wine;
+  inherit (builtins) attrValues;
 
   theme = "monokai";
   opacity = 0.95;
@@ -29,7 +28,9 @@ in
 
       thunar = {
         enable = true;
-        plugins = [ thunar-volman ];
+        plugins = attrValues {
+          inherit (pkgs.xfce) thunar-volman;
+        };
       };
     };
 
@@ -97,9 +98,10 @@ in
         ;
       }))
 
-      pulseaudio
-      exo
-      glib
+      (attrValues {
+        inherit (pkgs) pulseaudio glib;
+        inherit (pkgs.xfce) exo;
+      })
     ];
 
     services.greetd = {