diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/essentials/git/config | 7 | ||||
| -rw-r--r-- | config/essentials/shell/aliases.sh | 2 | ||||
| -rw-r--r-- | config/essentials/shell/functions.sh | 2 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 2 | ||||
| -rw-r--r-- | config/home/.bashrc | 4 | ||||
| -rw-r--r-- | config/home/.zshenv | 4 | ||||
| -rw-r--r-- | config/theme/fontconfig/fonts.conf | 3 |
7 files changed, 16 insertions, 8 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 diff --git a/config/home/.bashrc b/config/home/.bashrc index de7659a..312500d 100644 --- a/config/home/.bashrc +++ b/config/home/.bashrc @@ -2,9 +2,11 @@ SHELL=/bin/bash PATH=$HOME/bin:$PATH color1="\[\033[35m\]" color2="\[\033[36m\]" +color3="\[\033[40m\]" +color4="\[\033[38m\]" bold="\[\033[1m\]" reset="\[\033[0m\]" -PS1="${color1}${bold} [\\u${reset}@${color2}${bold}\\h]${reset} \\w " +PS1="${color1}${bold} ${color3}\\u${reset}${color3}${color4}@${color2}${bold}\\h${reset}${color3} \\w${reset} " HISTFILE= . $HOME/.config/shell/aliases.sh . $HOME/.config/shell/functions.sh diff --git a/config/home/.zshenv b/config/home/.zshenv index d33fbd7..e8021ec 100644 --- a/config/home/.zshenv +++ b/config/home/.zshenv @@ -1,6 +1,6 @@ #!/bin/zsh -export EDITOR="emacsclient -t" -export VISUAL="emacsclient -t -c -a emacs" +export EDITOR="emacsclient -nw -q" +export VISUAL="emacsclient -nw -q" export BROWSER="librewolf" export VIEWER="zathura" diff --git a/config/theme/fontconfig/fonts.conf b/config/theme/fontconfig/fonts.conf index 8681e4e..625dd34 100644 --- a/config/theme/fontconfig/fonts.conf +++ b/config/theme/fontconfig/fonts.conf @@ -16,7 +16,8 @@ <alias> <family>monospace</family> <prefer> - <family>JetBrains Mono</family> + <family>JetBrains Mono</family> + <family>JetBrains Mono NerdFont</family> <family>Joy Pixels</family> </prefer> </alias> |