From f45bda09dee060d6e3fbdc1c767727a259cc114a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20W=C3=BChr?= Date: Thu, 22 Feb 2024 10:30:07 +0100 Subject: [PATCH] Remove bash, add fish --- .gitmodules | 3 -- dotconf/bash_profile | 11 ------- dotconf/bashrc | 55 --------------------------------- dotconf/oh-my-bash | 1 - dotconf/profile | 28 ----------------- fish/config.fish | 27 ++++++++++++++++ dotconf/gitconfig => git/config | 2 +- dotconf/gitignore => git/ignore | 0 install.conf.yaml | 15 +++++---- 9 files changed, 35 insertions(+), 107 deletions(-) delete mode 100644 dotconf/bash_profile delete mode 100644 dotconf/bashrc delete mode 160000 dotconf/oh-my-bash delete mode 100644 dotconf/profile create mode 100644 fish/config.fish rename dotconf/gitconfig => git/config (98%) rename dotconf/gitignore => git/ignore (100%) diff --git a/.gitmodules b/.gitmodules index dca3142..1af14d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/dotconf/bash_profile b/dotconf/bash_profile deleted file mode 100644 index 7872597..0000000 --- a/dotconf/bash_profile +++ /dev/null @@ -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 diff --git a/dotconf/bashrc b/dotconf/bashrc deleted file mode 100644 index db361f3..0000000 --- a/dotconf/bashrc +++ /dev/null @@ -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 diff --git a/dotconf/oh-my-bash b/dotconf/oh-my-bash deleted file mode 160000 index d556831..0000000 --- a/dotconf/oh-my-bash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d55683133b6be49d1b649b3bc292285038a2e2eb diff --git a/dotconf/profile b/dotconf/profile deleted file mode 100644 index 6da6f52..0000000 --- a/dotconf/profile +++ /dev/null @@ -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 diff --git a/fish/config.fish b/fish/config.fish new file mode 100644 index 0000000..6e654e8 --- /dev/null +++ b/fish/config.fish @@ -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 diff --git a/dotconf/gitconfig b/git/config similarity index 98% rename from dotconf/gitconfig rename to git/config index e48b939..000ff62 100644 --- a/dotconf/gitconfig +++ b/git/config @@ -56,7 +56,7 @@ [push] default = current [core] - excludesfile = ~/.gitignore + excludesfile = ~/.config/git/ignore editor = vim [commit] verbose = true diff --git a/dotconf/gitignore b/git/ignore similarity index 100% rename from dotconf/gitignore rename to git/ignore diff --git a/install.conf.yaml b/install.conf.yaml index 231788f..2300d45 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -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 -