recent changes on megaloman

2 files changed, 22 insertions, 28 deletions

diff --git a/bash/.bashrc b/bash/.bashrc
index f660181..8f522f3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -114,10 +114,27 @@ fi
 
 # MIGUELS CUSTOM ######################################################
 
+export GIT_PS1_SHOWCOLORHINTS=true
+export GIT_PS1_SHOWDIRTYSTATE=true
+export GIT_PS1_SHOWSTASHSTATE=true
+export GIT_PS1_SHOWUPSTREAM="verbose,name"
+export GIT_PS1_SHOWDIRTYSTATE=true
+export GIT_PS1_SHOWUNTRACKEDFILES=true
+#export PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$'
+#export PS1=''
+#export PROMPT_COMMAND='__git_ps1 "(%s)"'
+export PROMPT_COMMAND='__git_ps1 "\[\e[1;34m\]\u@\h\[\e[00m\]:\w" " \$ "'
+#export PROMPT_COMMAND="git status -sb"
+#export PS1="\\w\$(__git_ps1 '(%s)') \$ "
+#http://northernmost.org/blog/flush-bash_history-after-each-command/
+# append to the history file, don't overwrite it
+#shopt -s histappend
+#export PROMPT_COMMAND='history -a' #&&history -n'
+
 # bash vi mode
 set -o vi 
 
-export EDITOR=vi
+export EDITOR=vi 
 
 # usenet seriously? 
 # export NNTPSERVER="nntp.aioe.org"
@@ -153,13 +170,12 @@ export MC_SKIN=$HOME/.mc/solarized.ini
 #PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 #PS1="\[\033[1;30;44m\] \u@\h\[\033[0;34;43m\]█\[\033[1;30;43m\] \w\[\033[0;33;49m\]█\[\033[0m\] "
 
-#http://northernmost.org/blog/flush-bash_history-after-each-command/
-# append to the history file, don't overwrite it
-#shopt -s histappend
-export PROMPT_COMMAND='history -a' #&&history -n'
 #alias ghci='stack ghci 2>&1 | stack exec HsColour -- -tty'
 
 alias vi="nvim"
 alias vim="nvim"
 
-export PATH=$PATH:/home/miguel/.local/bin
+export PATH=/home/miguel/.local/bin:$PATH
+#alias feh="feh -."
+
+#export PATH="$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
diff --git a/bash/.profile b/bash/.profile
deleted file mode 100644
index c9db459..0000000
--- a/bash/.profile
+++ /dev/null
@@ -1,22 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	. "$HOME/.bashrc"
-    fi
-fi
-
-# set PATH so it includes user's private bin if it exists
-if [ -d "$HOME/bin" ] ; then
-    PATH="$HOME/bin:$PATH"
-fi