From db5b95e9835913f9194fd1a79f9257ac13407145 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Thu, 4 Apr 2024 20:05:08 -0400
Subject: [PATCH] nix: Prefer let-in over with

Fixes an issue where it's possible to write code that the linter thinks
is valid since with; is used.
---
 modules/desktop.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 44eac8ae..e575a5e3 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -1,10 +1,11 @@
 { pkgs, config, lib, ... }:
 
 let
-  inherit (lib) mkEnableOption mkIf;
+  inherit (lib) mkEnableOption mkIf mkMerge;
   inherit (pkgs.xfce) thunar-volman exo;
   inherit (pkgs) glib;
   inherit (config.modules.system) username;
+  inherit (cfg) japanese bloat wine;
 
   theme = "monokai";
   opacity = 0.95;
@@ -19,7 +20,7 @@ in
     wine = mkEnableOption "wine support";
   };
 
-  config = with cfg; {
+  config = {
     hardware.opengl.driSupport32Bit = mkIf wine true;
 
     programs = {