fix: removed .profile madness

This commit is contained in:
Tobias Reisinger 2020-01-08 14:19:52 +01:00
parent 1ea7c2ab0d
commit f85afea0e4
3 changed files with 12 additions and 12 deletions

View file

@ -18,7 +18,7 @@ shopt -s checkwinsize
PS1="$PURPLE\u$nc@$BLUE\H$nc:$GREEN\w$YELLOW"'$(__git_ps1)'"$nc\\n$GREEN\$$nc "
export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:~/bin
export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
if [ -f /usr/share/git/completion/git-prompt.sh ]; then
source /usr/share/git/completion/git-prompt.sh
@ -26,4 +26,7 @@ else
function __git_ps1() { echo ""; };
fi
[ -f $HOME/.profile ] && source $HOME/.profile
# set PATH so it includes user's private bin if it exists
[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc

View file

@ -1,5 +1,3 @@
[ -f $HOME/.profile ] && source $HOME/.profile
# Enable colors and change prompt:
autoload -U colors && colors
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}
@ -40,5 +38,12 @@ echo -ne '\e[1 q' # Use beam shape cursor on startup.
autoload edit-command-line; zle -N edit-command-line
bindkey '^e' edit-command-line
export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin
# set PATH so it includes user's private bin if it exists
[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
# Load zsh-syntax-highlighting; should be last.
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null

View file

@ -1,14 +1,6 @@
export VIMINIT='source ~/.config/vim/vimrc'
export PASSWORD_STORE_GENERATED_LENGTH='64'
# set PATH so it includes user's private bin if it exists
[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH"
PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH"
[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc
if [ -x "$(command -v gpgconf)" ]; then
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
gpgconf --launch gpg-agent