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

fix merge error in fish conf

Browse source
This commit is contained in:
Tiago Sousa 2023-09-25 09:33:03 +01:00
parent c1e03f0140
commit 833119ab0a
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.config/fish/config.fish
View file

@ -16,12 +16,8 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'"
set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/tsousa/.ghcup/bin $PATH # ghcup-env
fish_add_path $HOME/.local/share/nvim/mason/bin/
fish_add_path $HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin
<<<<<<< HEAD
fish_add_path $HOME/.config/emacs/bin/
=======
fish_add_path $HOME/.cargo/bin/
fish_add_path $HOME/.config/emacs/bin
>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab
starship init fish | source

3
.config/fish/fish_variables
View file

@ -40,8 +40,5 @@ SETUVAR fish_pager_color_selected_background:\x1d
SETUVAR fish_pager_color_selected_completion:\x1d
SETUVAR fish_pager_color_selected_description:\x1d
SETUVAR fish_pager_color_selected_prefix:\x1d
<<<<<<< HEAD
SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
=======
SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin
>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab