1 files changed, 7 insertions, 6 deletions

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)}
     '';