Skip to content

Commit

Permalink
Update various bugs
Browse files Browse the repository at this point in the history
- Create gitignore to exclude var/ and vim/bundle folders
- Clean up global gitignore to be more consistent
- Adjust the ViM settings to be in the proper files, keybindings are
  with their particular plugins
- Fix typo in man page
- Change how bashrc is set up so root user gets pretty prompt as well as
  all other settings
  • Loading branch information
Newton committed Aug 4, 2014
1 parent bb88bef commit b14084c
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
var/
vim/bundle/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Typically software you buy comes with some sort of installer, why not your dotfiles? After setting up my dotfiles and installation for years, I decided to take a page from [some](https://github.com/necolas) [other](https://github.com/mathiasbynens) [people's](https://github.com/cowboy) [books](http://dotfiles.github.io) and set up a script that will configure my machine to run [ViM as an IDE](http://blog.sanctum.geek.nz/series/unix-as-ide/). Along the way, I figured how to get all of the necessary [Homebrew](http://braumeister.org) & [Node](https://www.npmjs.org) packages installed as well as some useful [Ruby gems](http://rubygems.org). Feel free to [poke around](https://github.com/chrisopedia/dotfiles/commits/master) the repository, [fork it](https://github.com/chrisopedia/dotfiles/fork) to make it your own, [suggest things](https://github.com/chrisopedia/dotfiles/issues?labels=feature+request) for me to include, [log a bug](https://github.com/chrisopedia/dotfiles/issues/new), or maybe checkout the [features list](#features) to see what's included.

[![Version 1.3.0](http://img.shields.io/badge/version-1.3.0-brightgreen.svg)](https://github.com/chrisopedia/bash/releases/tag/1.3.0) [![Stories in Ready](https://badge.waffle.io/chrisopedia/dotfiles.png?label=Ready)](http://waffle.io/chrisopedia/dotfiles)
[![Version 1.3.1](http://img.shields.io/badge/version-1.3.1-brightgreen.svg)](https://github.com/chrisopedia/bash/releases/tag/1.3.1) [![Stories in Ready](https://badge.waffle.io/chrisopedia/dotfiles.png?label=Ready)](http://waffle.io/chrisopedia/dotfiles)

## Installation

Expand Down
8 changes: 5 additions & 3 deletions conf/git/ignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# OS or Editor files
# OS or Editor files #
######################
._*
.DS_Store
Thumbs.db
Expand All @@ -23,6 +24,7 @@ Desktop.ini
*.sass-cache
*.sw?
*.vi
*.viminfo

# Compiled source #
###################
Expand All @@ -46,11 +48,11 @@ Desktop.ini
*.xz
*.lzma

#packing-only formats
# Packing-only formats
*.iso
*.tar

#package management formats
# Package management formats
*.dmg
*.xpi
*.gem
Expand Down
4 changes: 3 additions & 1 deletion conf/runcom/bash
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env bash

[ -n "$PS1" ] && source ~/.bash_profile
# http://superuser.com/a/2449900
[ -r "$PS1" ] && source ~/.bash_profile
# sudo ln -fs /usr/local/opt/dotfiles/conf/bash/profile /var/root/.bash_profile
5 changes: 3 additions & 2 deletions conf/runcom/vim
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ source ${HOME}/.vim/settings/bundles.vim
call vundle#end()

source ${HOME}/.vim/settings/general.vim
source ${HOME}/.vim/settings/display.vim
source ${HOME}/.vim/settings/theme.vim
source ${HOME}/.vim/settings/display.vim
source ${HOME}/.vim/settings/keyboard.vim
source ${HOME}/.vim/settings/search.vim
" CtrlP plugin
source ${HOME}/.vim/settings/ctrlp.vim
source ${HOME}/.vim/settings/keyboard.vim
2 changes: 1 addition & 1 deletion share/man/man1/dotfiles.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.\"
.TH "DOTFILES" 1 "JANUARY 2014" Unix "User Manuals"
.SH NAME
\fBdotfile\fR \- Installs all necessary configuration files for development
\fBdotfiles\fR \- Installs all necessary configuration files for development
.SH SYNOPSIS
\fBdotfiles\fR \-\-version
.br
Expand Down
8 changes: 7 additions & 1 deletion vim/settings/ctrlp.vim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let g:ctrlp_custom_ignore = {
\ 'file': '\.DS_Store$\|\.jpg$\|\.png$\|\.jpeg$\|\jpeg.gif$\|\.svg$\|\.class$\|\.iml$\|\.log$'
\ }
" set to 1 will put regex search by default
let g:ctrlp_regexp_search = 0
let g:ctrlp_regexp_search = 0
" set to 0 for results to show at top; set to 1 for results to show on bottom
let g:ctrlp_match_window_bottom = 0
" set to 0 for results matches to show top to bottom; set to 1 for matches to show bottom to top
Expand All @@ -19,3 +19,9 @@ let g:ctrlp_show_hidden = 1
" set to 1 to search by filename (as opposed to full path) as default
let g:ctrlp_by_filename = 0

" keyboard mappings
nnoremap <silent> \ :CtrlP<CR>
nnoremap <silent> <Tab> :CtrlPCurFile<CR>
nnoremap <silent> <space> :CtrlPBuffer<CR>
nnoremap <silent> <leader>m :CtrlPMRUFiles<CR>
nnoremap <silent> cv :CtrlPTag<CR>
11 changes: 4 additions & 7 deletions vim/settings/display.vim
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ if has("syntax")
syntax enable
" Set 256 color terminal support
set t_Co=256
" Set dark background
set background=dark
" Set colorscheme
hi Visual ctermbg=15 ctermfg=0
" Highlight current line
set cursorline
hi clear CursorLine
hi CursorLine cterm=underline term=underline gui=underline guibg=NONE
endif

if has("cmdline_info")
Expand Down Expand Up @@ -37,10 +38,6 @@ endif
" Enable line numbers
set number
hi LineNr ctermbg=NONE ctermfg=white
" Highlight current line
set cursorline
hi clear CursorLine
hi CursorLine cterm=underline term=underline gui=underline guibg=NONE

" Show 'invisible' characters
set list
Expand Down
2 changes: 1 addition & 1 deletion vim/settings/general.vim
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ let mapleader=","
" skip over a lot of screen lines. You can use gj and gk to move by screen
" lines.
"
set wrap
set wrap!
set linebreak
set nolist
set textwidth=0
Expand Down
6 changes: 0 additions & 6 deletions vim/settings/keyboard.vim
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,3 @@ nnoremap Y y$
vmap <Tab> >gv
vmap <S-Tab> <gv
" Ctrlp plugin
nnoremap <silent> \ :CtrlP<CR>
nnoremap <silent> <Tab> :CtrlPCurFile<CR>
nnoremap <silent> <space> :CtrlPBuffer<CR>
nnoremap <silent> <leader>m :CtrlPMRUFiles<CR>
nnoremap <silent> cv :CtrlPTag<CR>
1 change: 1 addition & 0 deletions vim/settings/wrap.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
map <leader>w :set nowrap!<CR>

0 comments on commit b14084c

Please sign in to comment.