Merge branch 'master' of https://gitlab.com/keanegit/dotfiles
This commit is contained in:
commit
276853ba84
10 changed files with 654 additions and 2059 deletions
|
|
@ -0,0 +1,15 @@
|
|||
<<<<<<< HEAD
|
||||
=======
|
||||
#
|
||||
# ~/.bash_profile
|
||||
#
|
||||
# Get the aliases and functions
|
||||
[ -f $HOME/.bashrc ] && . $HOME/.bashrc
|
||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||
|
||||
export XDG_CONFIG_HOME="$HOME/.config"
|
||||
#export DISPLAY=:0
|
||||
export BROWSER=firefox
|
||||
export EDITOR=vim
|
||||
export TERM=screen-256color
|
||||
>>>>>>> 05f5a5326ea758311bda4cc4225cd0ce265b8ec0
|
||||
Loading…
Add table
Add a link
Reference in a new issue