flyingscorpio/setup-cockpit
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Regroup zsh and bash profile common items into one file

Browse source
This commit is contained in:
flyingscorpio@arch-desktop 2020-09-03 16:10:16 +02:00
parent aa167a09bd
commit 52582530b2
5 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dotfiles/bash/bash_profile
View file

@ -1,13 +1,10 @@
# ~/.bash_profile # ~/.bash_profile
# #
[[ -f ~/.bashrc ]] && . ~/.bashrc
[[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/bin:$PATH"
export PATH="$PATH:$HOME/.cargo/bin" export PATH="$PATH:$HOME/.cargo/bin"
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then [[ -f ~/.bashrc ]] && . ~/.bashrc
exec startx
fi # Load items that are common to bash and zsh
[[ -f ~/SetupCockpit/dotfiles/shell/profile ]] && . ~/SetupCockpit/dotfiles/shell/profile

2
dotfiles/shell/aliases
View file

@ -1,3 +1,5 @@
# aliases common to bash and zsh
alias lime2connect='ssh flyingscorpio@2px.info' alias lime2connect='ssh flyingscorpio@2px.info'
alias rm='rm -I --preserve-root' alias rm='rm -I --preserve-root'

7
dotfiles/shell/profile Normal file
View file

@ -0,0 +1,7 @@
# items common to ~/.bash_profile and ~/.zprofile
[[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
exec startx
fi

6
dotfiles/zsh/zprofile
View file

@ -3,7 +3,5 @@
[[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim" [[ -x /usr/bin/vim ]] && export EDITOR="/usr/bin/vim"
# Load items that are common to bash and zsh
if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then [[ -f ~/SetupCockpit/dotfiles/shell/profile ]] && source ~/SetupCockpit/dotfiles/shell/profile
exec startx
fi

4
dotfiles/zsh/zshrc
View file

@ -1,6 +1,10 @@
# ~/.zshrc # ~/.zshrc
# #
stty stop undef # Disable ctrl-s to freeze terminal
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
# Initialization code that may require console input (password prompts, [y/n] # Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below. # confirmations, etc.) must go above this block; everything else may go below.