General update

README.md

@@ -24,17 +24,15 @@ To integrate *all* dotfiles in this repo:
 > 3. ./install
 
 ##Applications Configured
-* Vim \[ vim/vim/ => ~/.vim \]\[ vim/vimrc => ~/.vimrc \]\[ vim/fonts/\* => ~/.fonts \]
+* Vim \[ vim/vim/ => ~/.vim \]\[ vim/vimrc => ~/.vimrc \]
 * Git \[ git/gitconfig => ~/.gitconfig \]\[ git/gitignore => ~/.gitignore \]
+* Tmux \[ tmux/tmux.conf => ~/.tmux.conf \]
 
 ##To-Do
 * [ ] irssi config files
 * [ ] shell config files
 
-####Licenses
-Droid Monospace font licensed under the [Apache License, Version
-2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
-
+#Licenses
 Dotbot is (c) Anish Athalye, and licensed under the [MIT
 License](https://github.com/anishathalye/dotbot/blob/master/LICENSE.md).
 

bash/bashrc.wip

@@ -5,6 +5,11 @@ if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
 
+# Add Gems to path
+if which ruby >/dev/null && which gem >/dev/null; then
+     PATH="$(ruby -rubygems -e 'puts Gem.user_dir')/bin:$PATH"
+fi
+
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
 # export SYSTEMD_PAGER=
 

install.conf.yaml

@@ -4,17 +4,9 @@
      ~/.dotfiles: ''
      ~/.vim: vim/vim/
      ~/.vimrc: vim/vimrc
-     #~/.fonts/DroidSansMonoDottedPowerline.ttf:
-     #     create: true
-     #     path: vim/fonts/DroidFont.ttf
      ~/.gitconfig: git/gitconfig
      ~/.gitignore: git/gitignore
      ~/.tmux.conf: tmux/tmux.conf
 
 - shell:
      - [git submodule update --init --recursive, Installing submodules]
-<<<<<<< HEAD
-     # - [fc-cache -f ~/.fonts, Resetting font cache]
-=======
-       #     - [fc-cache -f ~/.fonts, Resetting font cache]
->>>>>>> e998cc17100c58876756e3f53304188cb0e22ca2

vim/README.md

@@ -4,8 +4,8 @@ My vim configuration is relatively straight forward.
 
 ###RC File
 * Word-wrap is set to 80 characters
-* Spaces not tabs; tab-length set to 5
-* Wild menu
+* Mappings to quickly edit dotfiles
+* Relative numbering, with mapping to quickly swap
 
 ###Directory
 Additionally, I have several extensions, as submodules, in .vim/bundle:
@@ -16,14 +16,9 @@ Additionally, I have several extensions, as submodules, in .vim/bundle:
   browser.
 * [Pathogen](https://github.com/tpope/vim-pathogen) to do the hard work.
 * [Templates](https://github.com/ap/vim-templates.git) for easy templates.
-
-###Font
-I prefer using the Droid Monospace font for powerline, which is bundled here for
-convenience.
+* [vimwiki](https://github.com/vimwiki/vimwiki) for info, diary and notes.
 
 ####To-Do
 * [ ] (Optional) Customize Airline more.
 * [ ] Consider adding [gist-vim](https://github.com/mattn/gist-vim) due to
   prevalence of Gist at work
-* [ ] Consider adding [vim-notes](https://github.com/xolox/vim-notes) and/or
-  [vimwiki](https://github.com/vimwiki/vimwiki) for notes