fix: removed .profile madness
This commit is contained in:
parent
1ea7c2ab0d
commit
f85afea0e4
3 changed files with 12 additions and 12 deletions
7
.bashrc
7
.bashrc
|
@ -18,7 +18,7 @@ shopt -s checkwinsize
|
||||||
|
|
||||||
PS1="$PURPLE\u$nc@$BLUE\H$nc:$GREEN\w$YELLOW"'$(__git_ps1)'"$nc\\n$GREEN\$$nc "
|
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
|
if [ -f /usr/share/git/completion/git-prompt.sh ]; then
|
||||||
source /usr/share/git/completion/git-prompt.sh
|
source /usr/share/git/completion/git-prompt.sh
|
||||||
|
@ -26,4 +26,7 @@ else
|
||||||
function __git_ps1() { echo ""; };
|
function __git_ps1() { echo ""; };
|
||||||
fi
|
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
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
[ -f $HOME/.profile ] && source $HOME/.profile
|
|
||||||
|
|
||||||
# Enable colors and change prompt:
|
# Enable colors and change prompt:
|
||||||
autoload -U colors && colors
|
autoload -U colors && colors
|
||||||
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}
|
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
|
autoload edit-command-line; zle -N edit-command-line
|
||||||
bindkey '^e' 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.
|
# Load zsh-syntax-highlighting; should be last.
|
||||||
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
|
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
|
||||||
|
|
8
.profile
8
.profile
|
@ -1,14 +1,6 @@
|
||||||
export VIMINIT='source ~/.config/vim/vimrc'
|
export VIMINIT='source ~/.config/vim/vimrc'
|
||||||
|
|
||||||
export PASSWORD_STORE_GENERATED_LENGTH='64'
|
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
|
if [ -x "$(command -v gpgconf)" ]; then
|
||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
gpgconf --launch gpg-agent
|
gpgconf --launch gpg-agent
|
||||||
|
|
Loading…
Reference in a new issue