From ba46b81e0ae398644ec6873105011b5a8e5b4027 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sat, 24 Aug 2024 14:01:58 +0800 Subject: [PATCH] wrapperPackages/dotfiles-wrapped: update envvar values --- .../wrapper-manager/dotfiles-wrapped/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configs/wrapper-manager/dotfiles-wrapped/default.nix b/configs/wrapper-manager/dotfiles-wrapped/default.nix index a92cf66f..9c5d28ac 100644 --- a/configs/wrapper-manager/dotfiles-wrapped/default.nix +++ b/configs/wrapper-manager/dotfiles-wrapped/default.nix @@ -1,7 +1,9 @@ # All of the programs with my outside dotfiles from # https://github.com/foo-dogsquared/dotfiles. Pretty nifty for me to have, # yeah? This should work on both NixOS and non-NixOS system considering that -# parts from the config are conditionally setting up NixGL wrapping. +# parts from the config are conditionally setting up NixGL wrapping. Though, +# you have to use NixOS systems in order to actually use it. We probably should +# have a specialized launcher for this. let sources = import ./npins; in @@ -22,6 +24,10 @@ let }; in { + # This wrapper needs runtime expansion which is not possible with binary + # wrappers. + build.isBinary = false; + nixgl.src = nixgl; wrappers.wezterm = lib.mkMerge [ @@ -48,13 +54,13 @@ in # Trying to create a portable Doom Emacs. wrappers.emacs = lib.mkMerge [ { - env.EMACSDIR.value = sources.doom-emacs; + env.EMACSDIR.value = builtins.toString sources.doom-emacs; env.DOOMDIR.value = getDotfiles "emacs"; - env.DOOMPROFILELOADFILE.value = "$XDG_CACHE_HOME/doom/profiles.el"; + env.DOOMPROFILELOADFILE.value = lib.escapeShellArg "$XDG_CACHE_HOME/doom/profiles.el"; # TODO: This will be removed in Doom Emacs 3.0 as far as I can tell so we'll # remove it once that happens. - env.DOOMLOCALDIR.value = "$XDG_CONFIG_HOME/emacs/"; + env.DOOMLOCALDIR.value = lib.escapeShellArg "$XDG_CONFIG_HOME/emacs/"; pathAdd = wrapperManagerLib.getBin [ sources.doom-emacs