Merge branch 'master' of https://gitlab.com/sagev9000/dotfiles
This commit is contained in:
commit
39213f4565
|
@ -22,7 +22,9 @@ function ww {
|
|||
ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-)
|
||||
}
|
||||
|
||||
alias cat="bat"
|
||||
if command -v bat; then
|
||||
alias cat="bat"
|
||||
fi
|
||||
export FZF_DEFAULT_COMMAND='fd --type f'
|
||||
alias fzf="fzf --preview 'bat --style=numbers --color=always {}'"
|
||||
|
||||
|
|
16
.zshrc
16
.zshrc
|
@ -1,5 +1,7 @@
|
|||
source ~/.zsh_local
|
||||
source /usr/share/doc/fzf/examples/completion.zsh
|
||||
if test -f /usr/share/doc/fzf/examples/completion.zsh &> /dev/null; then
|
||||
source /usr/share/doc/fzf/examples/completion.zsh
|
||||
fi
|
||||
|
||||
HISTFILE=~/.histfile
|
||||
HISTSIZE=10000
|
||||
|
@ -51,7 +53,7 @@ function SetTtyColors() {
|
|||
echo -en "\e]P7""d7d7d7" #yellow 8
|
||||
echo -en "\e]P8""7b7b7b" #darkblue 9
|
||||
echo -en "\e]P9""6f6fff" #blue 10
|
||||
echo -en "\e]PA""55ff55" #darkmagenta11
|
||||
echo -en "\e]PA""55ff55" #darkmagenta 11
|
||||
echo -en "\e]PB""ffed8b" #magenta 12
|
||||
echo -en "\e]PC""5555ff" #darkcyan 13
|
||||
echo -en "\e]PD""ff6eff" #cyan 14
|
||||
|
@ -80,6 +82,12 @@ function getdot {
|
|||
cd -
|
||||
}
|
||||
|
||||
eval "$(starship init zsh)"
|
||||
source ~/.cargo/env
|
||||
if which starship &> /dev/null; then
|
||||
eval "$(starship init zsh)"
|
||||
fi
|
||||
|
||||
if test -f ~/.cargo/env; then
|
||||
source ~/.cargo/env
|
||||
fi
|
||||
|
||||
source ~/.shell_aliases
|
||||
|
|
5
copy.sh
5
copy.sh
|
@ -5,6 +5,9 @@ moving_files="$(find $SCRIPT_DIR -mindepth 1 -maxdepth 1 -type f -not -name "cop
|
|||
moving_files=$(echo -e "$moving_files\n$(find $SCRIPT_DIR/.vim/colors/ -mindepth 1)")
|
||||
moving_files=$(echo -e "$moving_files\n$(find $SCRIPT_DIR/.config/ -mindepth 1)")
|
||||
|
||||
mkdir -p $HOME/.vim/user/
|
||||
touch $HOME/.vim/user/files.vim
|
||||
|
||||
home_files=""
|
||||
for f in $moving_files; do
|
||||
home_file="$HOME$(echo $f | sed "s@$SCRIPT_DIR@@")"
|
||||
|
@ -55,7 +58,7 @@ if [[ "$1" == "--install" ]]; then
|
|||
if command -v cargo; then
|
||||
cargo install bat
|
||||
fi
|
||||
sh -c "$(curl -fsSL https://starship.rs/install.sh)"
|
||||
curl -sS https://starship.rs/install.sh | sh
|
||||
echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
|
||||
echo "You may wish to install fzf"
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue