Remove bash, add fish
This commit is contained in:
parent
e211e968a5
commit
f45bda09de
9 changed files with 35 additions and 107 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -2,6 +2,3 @@
|
|||
path = dotbot
|
||||
url = https://github.com/anishathalye/dotbot
|
||||
ignore = dirty
|
||||
[submodule "dotconf/oh-my-bash"]
|
||||
path = dotconf/oh-my-bash
|
||||
url = https://github.com/ohmybash/oh-my-bash.git
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
# .bash_profile -*- mode: sh -*-
|
||||
|
||||
# Load login settings and environment variables
|
||||
if [[ -f ~/.profile ]]; then
|
||||
source ~/.profile
|
||||
fi
|
||||
|
||||
# Load interactive settings
|
||||
if [[ -f ~/.bashrc ]]; then
|
||||
source ~/.bashrc
|
||||
fi
|
|
@ -1,55 +0,0 @@
|
|||
case $- in
|
||||
*i*) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
export OSH=~/.oh-my-bash
|
||||
|
||||
OSH_THEME="powerline-naked"
|
||||
OMB_USE_SUDO=true
|
||||
|
||||
completions=(
|
||||
git
|
||||
composer
|
||||
ssh
|
||||
docker
|
||||
docker-compose
|
||||
go
|
||||
makefile
|
||||
pip3
|
||||
system
|
||||
)
|
||||
|
||||
aliases=(
|
||||
general
|
||||
ls
|
||||
)
|
||||
|
||||
plugins=(
|
||||
git
|
||||
bashmarks
|
||||
)
|
||||
|
||||
source "$OSH"/oh-my-bash.sh
|
||||
|
||||
export LANG=de_DE.UTF-8
|
||||
|
||||
if [ ! -S ~/.ssh/ssh_auth_sock ]; then
|
||||
eval `ssh-agent`
|
||||
ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock
|
||||
fi
|
||||
export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
|
||||
ssh-add -l > /dev/null || ssh-add
|
||||
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
alias c="composer"
|
||||
alias dc="docker compose"
|
||||
alias gu="gitup"
|
||||
|
||||
[ ! -z "$(which direnv)" ] && eval "$(direnv hook bash)"
|
||||
|
||||
for f in ~/.bashrc.d/*
|
||||
do
|
||||
source "$f"
|
||||
done
|
|
@ -1 +0,0 @@
|
|||
Subproject commit d55683133b6be49d1b649b3bc292285038a2e2eb
|
|
@ -1,28 +0,0 @@
|
|||
function __source() {
|
||||
if [ -f "$1" ]; then
|
||||
source "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
function __path() {
|
||||
if [ -d "$1" ] ; then
|
||||
PATH="$1:$PATH"
|
||||
fi
|
||||
}
|
||||
|
||||
if [ -n "$BASH_VERSION" ]; then
|
||||
__source "$HOME/.bashrc"
|
||||
fi
|
||||
|
||||
__path "$HOME/bin"
|
||||
__path "$HOME/.local/bin"
|
||||
__path "$HOME/go/bin"
|
||||
__path "/usr/local/go/bin"
|
||||
__path "$HOME/.local/share/JetBrains/Toolbox/scripts"
|
||||
__path "$HOME/.config/composer/vendor/bin"
|
||||
|
||||
__source "$HOME/.cargo/env"
|
||||
__source "$HOME/.asdf/asdf.sh"
|
||||
|
||||
unset __source
|
||||
unset __path
|
27
fish/config.fish
Normal file
27
fish/config.fish
Normal file
|
@ -0,0 +1,27 @@
|
|||
# Skips non-existing and already known paths
|
||||
fish_add_path \
|
||||
~/.local/bin \
|
||||
~/.cargo/bin \
|
||||
~/.config/composer/vendor/bin \
|
||||
~/go/bin \
|
||||
/usr/local/go/bin
|
||||
|
||||
abbr -a -- c composer
|
||||
abbr -a -- dc docker compose
|
||||
abbr -a -- gu gitup
|
||||
abbr -a -- q pueue
|
||||
|
||||
alias j z
|
||||
alias jj zz
|
||||
|
||||
if test -r ~/.asdf/asdf.fish
|
||||
source ~/.asdf/asdf.fish
|
||||
end
|
||||
|
||||
if test -x "$(which starship)"
|
||||
starship init fish | source
|
||||
end
|
||||
|
||||
if test -x "$(which direnv)"
|
||||
direnv hook fish | source
|
||||
end
|
|
@ -56,7 +56,7 @@
|
|||
[push]
|
||||
default = current
|
||||
[core]
|
||||
excludesfile = ~/.gitignore
|
||||
excludesfile = ~/.config/git/ignore
|
||||
editor = vim
|
||||
[commit]
|
||||
verbose = true
|
|
@ -5,14 +5,13 @@
|
|||
- clean: ["~"]
|
||||
|
||||
- create:
|
||||
- ~/.bashrc.d
|
||||
|
||||
- shell:
|
||||
- git submodule update --init --recursive
|
||||
- ~/.config/fish
|
||||
- ~/.config/git
|
||||
|
||||
- link:
|
||||
~/:
|
||||
prefix: '.'
|
||||
path: dotconf/*
|
||||
~/.config/git:
|
||||
path: git/**
|
||||
glob: true
|
||||
~/.config/fish:
|
||||
path: fish/**
|
||||
glob: true
|
||||
|
||||
|
|
Loading…
Reference in a new issue