wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

Merge pull request #12252 from ilya-bobyr/fish-profile-source-once-and-fmt

Browse source 
nix-profile{,-daemon}.fish: Do not source twice, fmt
This commit is contained in:
mergify[bot] 2025-02-02 03:11:23 +00:00 • committed by GitHub
commit 63c0ea5702
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 76 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/nix-profile-daemon.fish.in
View file

@ -1,3 +1,13 @@
# Only execute this file once per shell.
if test -z "$HOME" || \
test -n "$__ETC_PROFILE_NIX_SOURCED"
exit
end
set --global __ETC_PROFILE_NIX_SOURCED 1
# Local helpers
function add_path --argument-names new_path function add_path --argument-names new_path
if type -q fish_add_path if type -q fish_add_path
# fish 3.2.0 or newer # fish 3.2.0 or newer
@ -10,13 +20,7 @@ function add_path --argument-names new_path
end end
end end
# Only execute this file once per shell. # Main configuration
if test -n "$__ETC_PROFILE_NIX_SOURCED"
exit
end
set __ETC_PROFILE_NIX_SOURCED 1
set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile" set --export NIX_PROFILES "@localstatedir@/nix/profiles/default $HOME/.nix-profile"
# Populate bash completions, .desktop files, etc # Populate bash completions, .desktop files, etc
@ -54,4 +58,6 @@ end
add_path "@localstatedir@/nix/profiles/default/bin" add_path "@localstatedir@/nix/profiles/default/bin"
add_path "$HOME/.nix-profile/bin" add_path "$HOME/.nix-profile/bin"
# Cleanup
functions -e add_path functions -e add_path

15
scripts/nix-profile.fish.in
View file

@ -1,3 +1,13 @@
# Only execute this file once per shell.
if test -z "$HOME" || test -z "$USER" || \
test -n "$__ETC_PROFILE_NIX_SOURCED"
exit
end
set --global __ETC_PROFILE_NIX_SOURCED 1
# Local helpers
function add_path --argument-names new_path function add_path --argument-names new_path
if type -q fish_add_path if type -q fish_add_path
# fish 3.2.0 or newer # fish 3.2.0 or newer
@ -10,7 +20,7 @@ function add_path --argument-names new_path
end end
end end
if test -n "$HOME" && test -n "$USER" # Main configuration
# Set up the per-user profile. # Set up the per-user profile.
@ -54,6 +64,7 @@ if test -n "$HOME" && test -n "$USER"
add_path "$NIX_LINK/bin" add_path "$NIX_LINK/bin"
set --erase NIX_LINK set --erase NIX_LINK
end
# Cleanup
functions -e add_path functions -e add_path