Commit Graph

229 Commits

Author SHA1 Message Date
Nick Nisi
d3735ced21 Added git update shortcut
update fetches from the upstream remote and then rebases
upstream branch onto the current branch.
2013-04-22 11:04:40 -05:00
Nick Nisi
8023146a9b added config to renumber tmux panes automatically 2013-04-21 20:36:44 -05:00
Nick Nisi
19ee3adfec Various changes
+ added hist to show most used commands
+ changed vim colorscheme back to my own
+ added g() function thanks to r00k
2013-04-13 07:54:58 -05:00
Nick Nisi
fc7dd3d96d Removing grunt-completion from zshrc 2013-04-10 20:20:43 -05:00
Nick Nisi
30550b99c6 fixing style issue with tmux 2013-04-10 20:20:22 -05:00
Nick Nisi
dc95ad3d9c updating tmux.conf, prompt info 2013-04-02 20:18:11 -05:00
Nick Nisi
1438093127 Cleaning up tmux.conf styles
+ Removing hard-coded background colors
+ removed -z mapping for 1.8 zoom support
+ changed colors up a bit
2013-04-01 16:20:43 -05:00
Nick Nisi
a2deda1107 Removing git function 2013-03-16 06:59:44 -05:00
Nick Nisi
beb96d9169 Added a few new bundles to vim
+ aded css-color
+ added gitgutter to show dirty parts of a file (naughty!)
2013-03-16 06:44:05 -05:00
Nick Nisi
2f9658ebc4 Added psqlrc for postgres cli config 2013-03-16 06:42:43 -05:00
Nick Nisi
e5b562d5d3 updating stylesheet, added completion for grunt 2013-02-17 15:44:05 -06:00
Nick Nisi
d23254e3a0 Added clear search on <esc> and cleaned up vimrc
+ mapped <esc> to also clear highlighted search
+ cleaned up unused mappings, comments, etc. from the vimrc
2013-02-10 09:45:45 -06:00
Nick Nisi
6377243b5a gitconfig updates 2013-02-06 10:26:10 -06:00
Nick Nisi
f233096c60 Fixing issues with gitconfig 2013-02-05 21:15:40 -06:00
Nick Nisi
99343b27a7 new commands, updated gitconfig
+ e opens $EDITOR (thanks @holman)
+ h is same as 'c' but in home directory (thanks @holman)
+ updated gitconfig
2013-02-05 20:47:16 -06:00
Nick Nisi
fd79fe70c1 Adding gbrt tool to view info about git branches 2013-01-24 09:35:32 -06:00
Nick Nisi
048449e07b Added battery indicator script to tmux config 2013-01-18 12:35:18 -06:00
Nick Nisi
2d0d336828 Updating vimrc. Removing vitality plugin, added abbr for template 2013-01-18 12:33:10 -06:00
Nick Nisi
741b0f97d4 Reversed order of commits for git day
It makes more sense for the commits to show in chronological order,
starting with the oldest.
2013-01-11 10:50:09 -06:00
Nick Nisi
b1b0395195 added reattach-to-user-namespace back in 2013-01-10 22:48:44 -06:00
Nick Nisi
1f98b03092 Added 11:59PM to --after. Thanks to @nickashley for the find! 2013-01-10 12:19:34 -06:00
Nick Nisi
9f13997cf2 [git] added day alias to show what i did today
It doesn't exactly work, since it is including commits from yesterday,
so it is a WIP
2013-01-10 12:06:45 -06:00
Nick Nisi
a80c5a4ccd Updating which script is used for git-completion 2013-01-07 19:27:12 -06:00
Nick Nisi
43d51d674d Default completion to files
This way, completion still works for aliases
2013-01-07 08:44:11 -06:00
Nick Nisi
2503b7ebf9 Added ~/.dotfiles/bin to path
Also removed zsh/lib dir and moved files up a dir
2013-01-07 08:29:01 -06:00
Nick Nisi
b3ea8102d6 renaming bin to applescripts 2013-01-06 18:47:54 -06:00
Nick Nisi
18171a6c76 adding shortcut to Gstatus fugitive call 2013-01-06 09:08:06 -06:00
Nick Nisi
98aed9c9a5 Added setting to close NERDTree on file open 2013-01-04 07:49:28 -06:00
Nick Nisi
2d584117ad [vim] adding vimux and zencoding plugins 2013-01-03 08:22:06 -06:00
Nick Nisi
ae445f6aac Merge pull request #2 from nicknisi/vundle
Replacing pathogen with vundle
2012-12-21 06:41:59 -08:00
Nick Nisi
28089c9eba adding bundles 2012-12-20 10:14:50 -06:00
Nick Nisi
2213b78583 Updating some stuff [lazy commit] 2012-12-20 10:14:11 -06:00
Nick Nisi
5cc67b2273 Added bundle directory to gitignore 2012-12-16 21:19:56 -06:00
Nick Nisi
59906a5fbb Added vundle bundles 2012-12-16 21:19:24 -06:00
Nick Nisi
3fc8e20f3a removing git submodules 2012-12-16 20:59:53 -06:00
Nick Nisi
a6e5dd3fc4 [vim] added a few abbreviations 2012-12-16 20:22:02 -06:00
Nick Nisi
12317411c6 Added vimux 2012-12-07 11:19:46 -06:00
Nick Nisi
19c29c86c3 adding syntastic back in 2012-12-06 13:19:35 -06:00
Nick Nisi
874ed208b8 adding scratch back. issue with submodules 2012-12-06 13:18:32 -06:00
Nick Nisi
2e76187609 removing Scratch 2012-12-06 13:17:43 -06:00
Nick Nisi
e772d13003 vim plugin updates 2012-12-06 13:16:16 -06:00
Nick Nisi
144449b864 Merge pull request #1 from nicknisi/theme-updates
Theme updates
2012-12-05 13:41:23 -08:00
Nick Nisi
dfcc4fc448 added remap for . to work in vieual mode 2012-12-05 15:39:55 -06:00
Nick Nisi
b77d955121 Added new Scratch vim plugin to enable a scratch pad 2012-12-05 12:10:33 -06:00
Nick Nisi
b4f8fc3565 Swapping spotify for rdio 2012-11-27 20:33:15 -06:00
Nick Nisi
00e8245f77 removing unread mail count from tmux pane 2012-11-15 10:11:22 -06:00
Nick Nisi
f2fb73da33 fixing smart tab completion 2012-11-15 10:09:04 -06:00
Nick Nisi
d3d161011d Added pretty git log (glog) alias to gitconfig as git l 2012-11-13 08:09:06 -06:00
Nick Nisi
46f35b225b Added .vimrc.local to global gitignore 2012-11-13 08:08:38 -06:00
Nick Nisi
614cb0642b Added smart mapping for tab-completion
via http://vim.wikia.com/wiki/Smart_mapping_for_tab_completion
2012-11-13 07:46:05 -06:00