From 8f2d8a73009b4ad23c18ec157ec1658af85992f0 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 7 Jun 2024 20:17:28 +0200
Subject: commandline/zsh: remove some 'with'

---
 common/commandline/zsh.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'common')

diff --git a/common/commandline/zsh.nix b/common/commandline/zsh.nix
index d1fdee7..aba2d94 100644
--- a/common/commandline/zsh.nix
+++ b/common/commandline/zsh.nix
@@ -4,12 +4,13 @@ inputs: {
   pkgs,
   ...
 }:
-with inputs.self.lib.theme; let
+let
+  inherit (inputs.self.lib.theme) fgEscapeCode;
   dominantEscapeCode = fgEscapeCode config.theme.colors.dominant;
 in {
   nixpkgs.overlays = [
-    (final: prev: {
-      zsh = prev.zsh.overrideAttrs (old: {
+    (_final: prev: {
+      zsh = prev.zsh.overrideAttrs (_old: {
         configureFlags = [
           "--enable-maildir-support"
           "--enable-multibyte"
@@ -26,7 +27,7 @@ in {
   programs.zsh = {
     enable = true;
 
-    interactiveShellInit = with lib; ''
+    interactiveShellInit = ''
       source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
       is4 && xsource "${pkgs.grml-zsh-config}/etc/zsh/keephack"
 
@@ -43,8 +44,8 @@ in {
       }
 
       # Grml's ZSH config overrides less variables
-      export ${concatStringsSep " "
-        (mapAttrsToList
+      export ${lib.concatStringsSep " "
+        (lib.mapAttrsToList
           (variable: value: "${variable}=\"${value}\"")
           config.programs.less.envVariables)}
     '';
-- 
cgit v1.2.3