diff options
| author | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-12-13 00:02:58 +0100 |
|---|---|---|
| committer | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-12-13 00:02:58 +0100 |
| commit | a19c00b5b086a03ed40e55ff898799ffff96f895 (patch) | |
| tree | ec18b3c02cab7f17574d1168f7a40693ae610cc6 | |
| parent | 6b44e39caba17672bf32960f5829597d9fa544b1 (diff) | |
| parent | f09fce4ff51ff3e26a4d77b23ca34950c9162fc0 (diff) | |
Merge branch 'main' of db:dotfiles
| -rw-r--r-- | config/essentials/shell/aliases.sh (renamed from config/essentials/zsh/aliases.sh) | 4 | ||||
| -rw-r--r-- | config/essentials/shell/functions.sh (renamed from config/essentials/zsh/functions.sh) | 2 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 4 | ||||
| -rw-r--r-- | config/home/.bashrc | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/config/essentials/zsh/aliases.sh b/config/essentials/shell/aliases.sh index 2e23010..157e7aa 100644 --- a/config/essentials/zsh/aliases.sh +++ b/config/essentials/shell/aliases.sh @@ -224,8 +224,8 @@ alias vb='vbm startvm' # quick config alias ez='$EDITOR ${ZDOTDIR:-~}/.zshrc' -alias eza='$EDITOR ${ZDOTDIR}/aliases.sh' -alias ezf='$EDITOR ${ZDOTDIR}/functions.zsh' +alias eza='$EDITOR $HOME/.config/shell/aliases.sh' +alias ezf='$EDITOR $HOME/.config/shell/functions.sh' alias eto='$EDITOR ~/sync/TODO' alias edw='$EDITOR ~/proj/suckless/dwm/config.def.h' alias edm='$EDITOR ~/proj/suckless/dmenu/config.def.h' diff --git a/config/essentials/zsh/functions.sh b/config/essentials/shell/functions.sh index b285e05..37e471c 100644 --- a/config/essentials/zsh/functions.sh +++ b/config/essentials/shell/functions.sh @@ -188,7 +188,7 @@ gpg_backup() { # $1: option # $2: output file (without .asc) - gpg_command() {gpg "$1" --armor > "$2".asc ; } + gpg_command() { gpg "$1" --armor > "$2".asc; } gpg_command --export-secret-keys "private" gpg_command --export "public" gpg_command --export-ownertrust "trust" diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 7b1f7a0..230de24 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -67,8 +67,8 @@ zle -N add-surround surround zle -N change-surround surround # Source files -. $ZDOTDIR/functions.sh -. $ZDOTDIR/aliases.sh +. $XDG_CONFIG_HOME/shell/functions.sh +. $XDG_CONFIG_HOME/shell/aliases.sh for file in /{etc,usr/lib}/os-release do [ -f "$file" ] && . "$file" && break diff --git a/config/home/.bashrc b/config/home/.bashrc index 33dbba4..de7659a 100644 --- a/config/home/.bashrc +++ b/config/home/.bashrc @@ -6,4 +6,5 @@ bold="\[\033[1m\]" reset="\[\033[0m\]" PS1="${color1}${bold} [\\u${reset}@${color2}${bold}\\h]${reset} \\w " HISTFILE= -. $HOME/.config/zsh/aliases.sh +. $HOME/.config/shell/aliases.sh +. $HOME/.config/shell/functions.sh |