summaryrefslogtreecommitdiff
path: root/config/essentials
diff options
context:
space:
mode:
Diffstat (limited to 'config/essentials')
-rw-r--r--config/essentials/git/config7
-rw-r--r--config/essentials/shell/aliases.sh2
-rw-r--r--config/essentials/shell/functions.sh2
-rw-r--r--config/essentials/zsh/.zshrc2
4 files changed, 9 insertions, 4 deletions
diff --git a/config/essentials/git/config b/config/essentials/git/config
index 90bab4f..fcf80db 100644
--- a/config/essentials/git/config
+++ b/config/essentials/git/config
@@ -3,5 +3,10 @@
[user]
email = raymaekers.luca@gmail.com
name = Raymaekers Luca
+ signingkey = 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D
[push]
- autoSetupRemote = true
+ autosetupremote = true
+[pull]
+ rebase = false
+[commit]
+ gpgsign = true
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index eed3fa0..99c49d8 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -140,7 +140,7 @@ alias ss4='ss -tln4p'
alias mdb='mariadb -u admin -ppass admindb'
alias mdbw='mariadb -h 0.0.0.0 -u padmin -pbulbizarre padmindb'
alias mdbwa='mariadb -h 10.3.50.5 -u padmin -pbulbizarre padmindb'
-alias tmux='tmux a || tmux'
+alias tmux='pgrep tmux && tmux attach || tmux new-session'
# ssh
alias sha='ssh-add'
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 37e471c..b699a86 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -110,7 +110,7 @@ __git_files() {
}
esc() {
- $EDITOR "$(which $1)"
+ eval "$EDITOR '$(which $1)'"
}
delfile() {
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 2223c67..99c65d7 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -153,7 +153,7 @@ command_not_found_handler () {
}
# prompt
-PS1=' %B%(#.%F{1}.%F{13})%n%b%f@%B%F{6}%m%b%f %3~ '
+PS1=' %K{16}%B%(#.%F{1}.%F{13})%n%b%f@%B%F{6}%m%b%f %3~%k '
RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)'
setopt prompt_subst