George Sakkis avatar George Sakkis committed a69a499

Misc fixes

Comments (0)

Files changed (2)

-source ~/.bash/aliases
-
 export LESS=FSRX
 export PATH="/usr/local/bin:/usr/local/sbin:$HOME/.local/bin:$PATH"
-export PS1="\w$ "
+#export PS1="\w$ "
 export EDITOR="nano"
 
-source ~/.bash/completion_scripts/git_completion
+#source ~/.bash/completion_scripts/git_completion
 
 # use .localrc for settings specific to one system
 if [ -f ~/.localrc ]; then
   source ~/.localrc
 fi
+
+if [ -f ~/.bash_aliases ]; then
+  source ~/.bash_aliases
+fi
 #git clone git://github.com/sjl/oh-my-zsh ~/lib/oh-my-zsh
 
 #rm ~/.bash_profile
-ln -sf "$HOME/lib/dotfiles/bashrc" "$HOME/.bashrc"
-ln -sf "$HOME/lib/dotfiles/zshrc" "$HOME/.zshrc"
+ln -sf "$HOME/.local/lib/dotfiles/bashrc" "$HOME/.bashrc"
+ln -sf "$HOME/.local/lib/dotfiles/zshrc" "$HOME/.zshrc"
 ln -sf "$HOME/.local/lib/dotfiles/ackrc" "$HOME/.ackrc"
 ln -sf "$HOME/.local/lib/dotfiles/hgrc" "$HOME/.hgrc"
+ln -sf "$HOME/.local/lib/dotfiles/hgignore" "$HOME/.hgignore"
 ln -sf "$HOME/.local/lib/dotfiles/gitconfig" "$HOME/.gitconfig"
+ln -sf "$HOME/.local/lib/dotfiles/gitignore" "$HOME/.gitignore"
 ln -sf "$HOME/.local/lib/dotfiles/screenrc" "$HOME/.screenrc"
 #ln -s "$HOME/.local/lib/dotfiles/vim" "$HOME/.vim"
 #ln -s "$HOME/.local/lib/dotfiles/vim/vimrc" "$HOME/.vimrc"
 
 # hg extensions
 mkdir -p ~/.local/lib/hg
-hg clone bb://Bill_Barry/hgattic "$HOME/.local/lib/hg/hgattic"
-hg clone bb://ccaughie/hgcollapse/ "$HOME/.local/lib/hg/hgcollapse"
-hg clone bb://durin42/histedit/ "$HOME/.local/lib/hg/histedit"
+#hg clone bb://Bill_Barry/hgattic "$HOME/.local/lib/hg/hgattic"
+#hg clone bb://ccaughie/hgcollapse/ "$HOME/.local/lib/hg/hgcollapse"
+#hg clone bb://durin42/histedit/ "$HOME/.local/lib/hg/histedit"
 
 #git clone git://github.com/jelmer/dulwich.git "$HOME/.local/lib/dulwich"
 #hg clone bb://durin42/hg-git/ "$HOME/.local/lib/hg/hg-git"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.