Skip to content

Commit

Permalink
Update 3/12/18
Browse files Browse the repository at this point in the history
  • Loading branch information
mikekreeki committed Dec 3, 2018
1 parent 638801a commit aaa873c
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 46 deletions.
40 changes: 2 additions & 38 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,2 @@
# OS
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db

# BUNDLER
vendor/bundle/

# RVM
.rvmrc
.ruby-gemset

# POW
.powrc
.powenv

# GIT
.git-wtfrc

# VIM
.swp
*.swp
tags
.smartgf_tags
.smartgf_tags_date

# RAILS
.env
config/mongoid.yml
config/database.yml

# JS
.tern-project
vim/console
.excluded.zsh
8 changes: 7 additions & 1 deletion .nvimrc
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Plug 'jreybert/vimagit'
Plug 'idanarye/vim-merginal'
Plug 'lambdalisue/gina.vim'
Plug 'danishprakash/vim-githubinator'
Plug 'AGhost-7/critiq.vim'

" Building, Linters, Test Runners
Plug 'w0rp/ale'
Expand All @@ -81,7 +82,7 @@ Plug 'janko-m/vim-test'

" Ruby Integration
Plug 'AmaiSaeta/vim-ruby-sinatra', { 'for': 'ruby' }
Plug 'AndrewRadev/splitjoin.vim', { 'for': 'ruby' }
" Plug 'AndrewRadev/splitjoin.vim', { 'for': 'ruby' }
Plug 'keith/rspec.vim', { 'for': 'ruby' }
Plug 'slim-template/vim-slim', { 'for': 'ruby' }
Plug 'tpope/vim-bundler', { 'for': 'ruby' }
Expand Down Expand Up @@ -239,6 +240,11 @@ noremap ^ <nop>
noremap $ <nop>
noremap ^ <nop>
" Save/quit via leader
nnoremap <Leader>w :w<CR>
nnoremap <Leader>wq :wq<CR>
nnoremap <Leader>q :q<CR>
" Bubble single lines
nmap <Up> [e
nmap <Down> ]e
Expand Down
1 change: 1 addition & 0 deletions .zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ source ~/.dotfiles/.functions.zsh
source ~/.dotfiles/.exports.zsh
source ~/.dotfiles/.setopt.zsh
source ~/.dotfiles/.custom.zsh
source ~/.dotfiles/.excluded.zsh
source ~/.dotfiles/mikekreeki.zsh-theme

WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
Expand Down
14 changes: 7 additions & 7 deletions com.googlecode.iterm2.plist
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
<integer>1</integer>
</dict>
<key>NSWindow Frame NSFontPanel</key>
<string>91 1074 467 77 0 0 3440 1417 </string>
<string>15 225 467 77 0 0 1440 877 </string>
<key>NSWindow Frame Preferences</key>
<string>127 444 606 456 0 0 1440 900 </string>
<key>NSWindow Frame ProfilesPanel</key>
Expand All @@ -293,13 +293,13 @@
<key>NSWindow Frame SUUpdateAlert</key>
<string>1410 787 620 392 0 0 3440 1440 </string>
<key>NSWindow Frame SessionsPreferences</key>
<string>630 10 606 469 0 0 2560 1417 </string>
<string>914 10 606 469 0 0 3440 1417 </string>
<key>NSWindow Frame SharedPreferences</key>
<string>528 321 796 486 0 0 3440 1417 </string>
<string>384 305 796 486 0 0 1440 877 </string>
<key>NSWindow Frame UKCrashReporter</key>
<string>534 4 592 584 0 0 1440 900 </string>
<string>608 316 592 584 0 0 3440 1440 </string>
<key>NSWindow Frame iTerm Window 0</key>
<string>0 0 3440 1440 0 0 3440 1417 </string>
<string>0 0 1440 900 0 0 1440 877 </string>
<key>New Bookmarks</key>
<array>
<dict>
Expand Down Expand Up @@ -1134,7 +1134,7 @@
<key>SUHasLaunchedBefore</key>
<true/>
<key>SULastCheckTime</key>
<date>2018-10-11T09:23:21Z</date>
<date>2018-12-03T16:46:07Z</date>
<key>SavePasteHistory</key>
<false/>
<key>ShowBookmarkName</key>
Expand Down Expand Up @@ -8665,7 +8665,7 @@
<key>findRegex_iTerm</key>
<false/>
<key>iTerm Version</key>
<string>3.2.3beta2</string>
<string>3.2.6beta4</string>
<key>kCommandHistoryHasEverBeenUsed</key>
<true/>
</dict>
Expand Down

0 comments on commit aaa873c

Please sign in to comment.