dotfiles

my shiny new dotfiles
git clone git://git.jakekoroman.com/dotfiles
Log | Files | Refs | README

commit 9db0b82a2c6135e6ee930a6e3e63f13ce7d87cbb
parent c30b634c04752449e2d9e11857ebb5bf2bd76cad
Author: Jake Koroman <jakekoroman@proton.me>
Date:   Fri, 20 Sep 2024 10:13:09 -0400

add fish support for guix environments.

Diffstat:
M.config/fish/config.fish | 11++++++++++-
A.config/fish/external-functions/fenv.fish | 36++++++++++++++++++++++++++++++++++++
A.config/fish/external-functions/fenv.main.fish | 39+++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish @@ -1,5 +1,14 @@ if status is-interactive - # Commands to run in interactive sessions can go here fish_vi_key_bindings set -g fish_greeting end + +set fish_function_path $fish_function_path $__fish_config_dir/external-functions + +# setup guix env if guix is on the system +if test -e $HOME/.guix-profile + set GUIX_PROFILE $HOME/.guix-profile + fenv . $GUIX_PROFILE/etc/profile +else + echo hi +end diff --git a/.config/fish/external-functions/fenv.fish b/.config/fish/external-functions/fenv.fish @@ -0,0 +1,36 @@ +# The MIT License (MIT) + +# Copyright (c) 2015 Derek Willian Stavis + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +function fenv -d "Run bash scripts and import variables modified by them" + if count $argv >/dev/null + if string trim -- $argv | string length -q + fenv.main $argv + return $status + end + return 0 + else + echo (set_color red)'error:' (set_color normal)'parameter missing' + echo (set_color cyan)'usage:' (set_color normal)'fenv <bash command>' + return 23 # EINVAL + end +end diff --git a/.config/fish/external-functions/fenv.main.fish b/.config/fish/external-functions/fenv.main.fish @@ -0,0 +1,39 @@ +# The MIT License (MIT) + +# Copyright (c) 2015 Derek Willian Stavis + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +function fenv.main + bash -c "$argv && env -0 >&31" 31>| while read -l -z env_var + set -l kv (string split -m 1 = $env_var); or continue + # Skip read-only variables + contains $kv[1] _ SHLVL PWD; and continue + string match -rq '^BASH_.*%%$' $kv[1]; and continue + # Variable + # - is not defined + # - OR variable differs + # - OR variable is not exported + if not set -q $kv[1]; or test "$$kv[1]" != $kv[2]; or not set -qx $kv[1] + set -gx $kv + end + end + return $pipestatus[1] +end