Merge branch 'master' of https://gitlab.com/keanegit/dotfiles

bash/.bash_profile

@@ -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

bash/.bashrc

@@ -7,6 +7,7 @@ alias ls='ls --color=auto'
 alias vlime='sbcl --load ~/.vim/plugins/vlime/lisp/start-vlime.lisp'
 PS1='[\u@\h \W]\$ '
 
+alias screenfetch='clear && screenfetch -t'
 export DISPLAY=:0
 export LIBGL_ALWAYS_INDIRECT=1
 export FZF_DEFAULT_COMMAD="find -L"