diff options
| -rw-r--r-- | bash/.bash_profile | 8 | ||||
| -rw-r--r-- | bash/.bashrc | 2 | ||||
| -rw-r--r-- | bash/.profile | 51 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | zsh/.zshenv | 55 |
5 files changed, 38 insertions, 80 deletions
diff --git a/bash/.bash_profile b/bash/.bash_profile index ab5dfcc..515cf94 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,3 +1,7 @@ -. ~/.profile +#!/bin/bash -if [[ $- == *i* ]]; then . ~/.bashrc; fi
\ No newline at end of file +# shellcheck disable=1091 +. "$HOME/.zshenv" + +# shellcheck disable=1090 +if [[ $- == *i* ]]; then . ~/.bashrc; fi diff --git a/bash/.bashrc b/bash/.bashrc index 7d454d7..fa713b3 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -30,8 +30,10 @@ alias dcu="docker context use" if [[ $- == *i* ]] && [ -d "$BASHCOMPDIR" ]; then for f in "$BASHCOMPDIR"/*; do + # shellcheck disable=1090 source "$f" done fi +# shellcheck disable=1090 command -v starship >/dev/null 2>&1 && source <(starship init bash) diff --git a/bash/.profile b/bash/.profile deleted file mode 100644 index 2a4c4b8..0000000 --- a/bash/.profile +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# https://wiki.archlinux.org/title/XDG_Base_Directory -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache -export XDG_DATA_HOME=$HOME/.local/share -export XDG_STATE_HOME=$HOME/.local/state -export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/"$UID"} - -export ZDOTDIR=$XDG_CONFIG_HOME/zsh -export BASH_COMPLETION_USER_DIR=$XDG_DATA_HOME/bash-completion/completions -export LESSHISTFILE=$XDG_STATE_HOME/lesshst -export WGETRC=$XDG_CONFIG_HOME/wgetrc - -export EDITOR="$( command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi )" -export BROWSER="$( command -v chromium 2>/dev/null || command -v firefox )" -export TERMINAL="alacritty" -export MANPAGER="sh -c 'col -bx | bat -l man -p'" -export MANROFFOPT="-c" -export STARSHIP_LOG="error" -export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || exa --tree --icons --git-ignore {} || tree -C {}" -export FZF_DEFAULT_COMMAND="fd --type f || git ls-tree -r --name-only HEAD || rg --files || find ." -export FZF_DEFAULT_OPTS='--exit-0 --select-1 --bind "q:abort,ctrl-y:preview-up,ctrl-e:preview-down,ctrl-u:preview-half-page-up,ctrl-d:preview-half-page-down,ctrl-b:preview-page-up,ctrl-f:preview-page-down,alt-up:half-page-up,alt-down:half-page-down"' -export FZF_CTRL_T_COMMAND=$FZF_DEFAULT_COMMAND -export FZF_CTRL_T_OPTS="--min-height 30 --preview-window down:60% --preview-window noborder --preview '($FZF_PREVIEW_COMMAND) 2> /dev/null'" - -export PATH=$PATH:$HOME/.local/bin - -# rust -export RUSTUP_HOME=$XDG_DATA_HOME/rustup -export CARGO_HOME=$XDG_DATA_HOME/cargo -export PATH=$PATH:$CARGO_HOME/bin - -# go -export GOPATH=$XDG_DATA_HOME/go -export PATH=$PATH:$GOPATH/bin - -# npm -export npm_config_userconfig=$XDG_CONFIG_HOME/npm/config -export npm_config_cache=$XDG_CACHE_HOME/npm -export npm_config_prefix=$XDG_DATA_HOME/npm -export PATH=$PATH:$npm_config_prefix/bin - -# dotnet -export DOTNET_CLI_HOME=$XDG_DATA_HOME/dotnet -export PATH=$PATH:$DOTNET_CLI_HOME/tools - -# texlive -export TEXMFHOME=$XDG_DATA_HOME/texmf -export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var -export TEXMFCONFIG=$XDG_CONFIG_HOME/texlive/texmf-config diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 66ef0d5..5628c0d 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,3 +1,5 @@ +#!/bin/zsh + export HYPHEN_INSENSITIVE="true" export DISABLE_UPDATE_PROMPT="true" export DISABLE_AUTO_TITLE="true" diff --git a/zsh/.zshenv b/zsh/.zshenv index 6d11944..f865eb2 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,20 +1,21 @@ -#!/usr/bin/env bash +#!/bin/sh +# shellcheck disable=2155 # https://wiki.archlinux.org/title/XDG_Base_Directory -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache -export XDG_DATA_HOME=$HOME/.local/share -export XDG_STATE_HOME=$HOME/.local/state -export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/"$UID"} +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_STATE_HOME="$HOME/.local/state" +export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/run/user/$(id -u "$USER")}" -export ZDOTDIR=$XDG_CONFIG_HOME/zsh -export BASH_COMPLETION_USER_DIR=$XDG_DATA_HOME/bash-completion/completions -export LESSHISTFILE=$XDG_STATE_HOME/lesshst -export WGETRC=$XDG_CONFIG_HOME/wgetrc +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" +export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash-completion/completions" +export LESSHISTFILE="$XDG_STATE_HOME/lesshst" +export WGETRC="$XDG_CONFIG_HOME/wgetrc" # Misc export EDITOR="$(command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi)" -export BROWSER="$(command -v chromium 2>/dev/null || command -v firefox)" +export BROWSER="$(command -v firefox || command -v chromium 2>/dev/null)" export TERMINAL="alacritty" export MANPAGER="sh -c 'col -bx | bat -l man -p'" export MANROFFOPT="-c" @@ -22,31 +23,31 @@ export STARSHIP_LOG="error" export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || exa --tree --icons --git-ignore {} || tree -C {}" export FZF_DEFAULT_COMMAND="fd --type f || git ls-tree -r --name-only HEAD || rg --files || find ." export FZF_DEFAULT_OPTS='--exit-0 --select-1 --bind "ctrl-q:abort,ctrl-y:preview-up,ctrl-e:preview-down,ctrl-u:preview-half-page-up,ctrl-d:preview-half-page-down,ctrl-b:preview-page-up,ctrl-f:preview-page-down,alt-up:half-page-up,alt-down:half-page-down"' -export FZF_CTRL_T_COMMAND=$FZF_DEFAULT_COMMAND +export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS="--min-height 30 --preview-window down:60% --preview-window noborder --preview '($FZF_PREVIEW_COMMAND) 2> /dev/null'" -export PATH=$PATH:$HOME/.local/bin +export PATH="$PATH:$HOME/.local/bin" # rust -export RUSTUP_HOME=$XDG_DATA_HOME/rustup -export CARGO_HOME=$XDG_DATA_HOME/cargo -export PATH=$PATH:$CARGO_HOME/bin +export RUSTUP_HOME="$XDG_DATA_HOME/rustup" +export CARGO_HOME="$XDG_DATA_HOME/cargo" +export PATH="$PATH:$CARGO_HOME/bin" # go -export GOPATH=$XDG_DATA_HOME/go -export PATH=$PATH:$GOPATH/bin +export GOPATH="$XDG_DATA_HOME/go" +export PATH="$PATH:$GOPATH/bin" # npm -export npm_config_userconfig=$XDG_CONFIG_HOME/npm/config -export npm_config_cache=$XDG_CACHE_HOME/npm -export npm_config_prefix=$XDG_DATA_HOME/npm -export PATH=$PATH:$npm_config_prefix/bin +export npm_config_userconfig="$XDG_CONFIG_HOME/npm/config" +export npm_config_cache="$XDG_CACHE_HOME/npm" +export npm_config_prefix="$XDG_DATA_HOME/npm" +export PATH="$PATH:$npm_config_prefix/bin" # dotnet -export DOTNET_CLI_HOME=$XDG_DATA_HOME/dotnet -export PATH=$PATH:$DOTNET_CLI_HOME/tools +export DOTNET_CLI_HOME="$XDG_DATA_HOME/dotnet" +export PATH="$PATH:$DOTNET_CLI_HOME/tools" # texlive -export TEXMFHOME=$XDG_DATA_HOME/texmf -export TEXMFVAR=$XDG_CACHE_HOME/texlive/texmf-var -export TEXMFCONFIG=$XDG_CONFIG_HOME/texlive/texmf-config +export TEXMFHOME="$XDG_DATA_HOME/texmf" +export TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var" +export TEXMFCONFIG="$XDG_CONFIG_HOME/texlive/texmf-config" |