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

merge conflicts

Browse source
This commit is contained in:
pika 2024-08-02 13:22:30 +02:00
parent 374e5e3cf8
commit 667118794c
2 changed files with 25 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

48
config.fish
View file

@ -1,17 +1,17 @@
if status is-interactive
# ─< Commands to run in interactive sessions can go here >──────────────
function _source
if test -d $HOME/.config/fish/init/
source $HOME/.config/fish/init/setup.fish
# ────────────────────────────────────< setup some stuff >────────────────────────────────────
upin
# dep_fisher
else
notify-send "no fish config.."
end
if test -e $HOME/.config/fish/aliases.fish
source $HOME/.config/fish/aliases.fish
end
if test -d $HOME/.config/fish/init/
source $HOME/.config/fish/init/setup.fish
# ────────────────────────────────────< setup some stuff >────────────────────────────────────
upin
# dep_fisher
else
notify-send "no fish config.."
end
if test -e $HOME/.config/fish/aliases.fish
source $HOME/.config/fish/aliases.fish
end
end
end
@ -25,15 +25,15 @@ end
# ────────────────────────────────────────< sources >──────────────────────────────────────
function _source
if test -d $HOME/.config/fish/init/
source $HOME/.config/fish/init/setup.fish
# ────────────────────────────────────< setup some stuff >────────────────────────────────────
upin
# dep_fisher
source $HOME/.config/fish/init/setup.fish
# ────────────────────────────────────< setup some stuff >────────────────────────────────────
upin
# dep_fisher
else
notify-send "no fish config.."
notify-send "no fish config.."
end
if test -e $HOME/.config/fish/aliases.fish
source $HOME/.config/fish/aliases.fish
source $HOME/.config/fish/aliases.fish
end
end
@ -45,18 +45,18 @@ set -p EDITOR (which nvim)
# ─< z stands for Zoxide >──────────────────────────────────────────────────────────────────
function _zox
if command -v zoxide >/dev/null 2>&1
zoxide init fish | source
zoxide init fish | source
end
end
# ─< set colorscheme for bobthefish >───────────────────────────────────────────────────────
function _bobfish
if test -d $HOME/.config/fish/functions/bobthefish/
source $HOME/.config/fish/functions/bobthefish/*.fish
set -g theme_nerd_fonts yes
set -g defaults_user (echo $USER)
# available options: dark, light, solarized(-dark/-light), base16(-dark/-light), zenburn, gruvbox(-light), dracula, nord, catppuccin-(latte/frappe/macchiato/mocha)
set -g theme_color_scheme catppuccin-mocha
source $HOME/.config/fish/functions/bobthefish/*.fish
set -g theme_nerd_fonts yes
set -g defaults_user (echo $USER)
# available options: dark, light, solarized(-dark/-light), base16(-dark/-light), zenburn, gruvbox(-light), dracula, nord, catppuccin-(latte/frappe/macchiato/mocha)
set -g theme_color_scheme catppuccin-mocha
end
end
@ -68,7 +68,7 @@ if command -v oh-my-posh >/dev/null 2>&1
# oh-my-posh init fish --config ~/.config/fish/themes/zen.toml | source
else
_bobfish
curl -s https://ohmyposh.dev/install.sh | bash -s -- -d /usr/bin/
curl -s https://ohmyposh.dev/install.sh | sudo bash -s -- -d /usr/bin/
end
function main