ficd/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved merge conflict

Browse source
This commit is contained in:
Daniel Fichtinger 2025-06-13 15:43:05 -04:00
commit 110b65e396
31 changed files with 1662 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

23
.config/fish/config.fish
View file

@ -1,15 +1,14 @@
if status is-login
if not set -q __sourced_profile
set -x __sourced_profile 1
exec bash -c "\
test -e /etc/profile && source /etc/profile
test -e $HOME/.bash_profile && source $HOME/.bash_profile
exec fish --login
"
end
# if status is-login
# if not set -q __sourced_profile
# set -x __sourced_profile 1
# exec bash -c "\
# test -e /etc/profile && source /etc/profile
# test -e $HOME/.bash_profile && source $HOME/.bash_profile
# exec fish --login
# "
# end
set -e __sourced_profile
end
# end
if status is-interactive
# source ~/.config/fish/custom_cd.fish
@ -23,5 +22,7 @@ if status is-interactive
set -gx COLORTERM truecolor
set -gx TERM xterm-256color
end
end
set -gx EDITOR kak