diff --git a/.gvimrc b/.gvimrc index 76f0c71..17d6972 100644 --- a/.gvimrc +++ b/.gvimrc @@ -1 +1,8 @@ -colorscheme slate \ No newline at end of file +set guifont=SF\ Mono:h13 +set linespace=3 + +if has("gui_macvim") + macmenu &File.Open\.\.\. key= + nnoremap :Files +endif + diff --git a/.vimrc b/.vimrc index 602386f..905d170 100644 --- a/.vimrc +++ b/.vimrc @@ -1,5 +1,61 @@ -inoremap jk +set nocompatible +filetype off + +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +Plugin 'VundleVim/Vundle.vim' +Plugin 'tpope/vim-sensible' +Plugin 'scrooloose/nerdtree' +Plugin 'danilo-augusto/vim-afterglow' +Plugin 'junegunn/fzf.vim' +Plugin 'ycm-core/YouCompleteMe' +Plugin 'elixir-editors/vim-elixir' +Plugin 'slashmili/alchemist.vim' +Plugin 'mattn/emmet-vim' +Plugin 'scrooloose/nerdcommenter' +Plugin 'tpope/vim-fugitive' +Plugin 'jeffkreeftmeijer/vim-numbertoggle' +Plugin 'mhinz/vim-mix-format' + +call vundle#end() + +set rtp+=/usr/local/opt/fzf + +map :NERDTreeToggle +nnoremap K :YcmCompleter GoTo +nnoremap :YcmCompleter RefactorRename + +nnoremap :Files filetype plugin indent on syntax on +colorscheme afterglow +set autoindent +set hlsearch +set number +set relativenumber +set shiftwidth=4 +set tabstop=4 +set scrolloff=5 +set sidescrolloff=5 +set ignorecase +set smartcase + +let g:mapleader="," +let g:mix_format_on_save = 1 +let g:NERDDefaultAlign = 'left' +let g:NERDCommentEmptyLines = 1 + autocmd BufNewFile,BufRead *.md setlocal ft=markdown +autocmd FileType elixir setlocal shiftwidth=2 tabstop=2 + +" Add optional packages. +" +" The matchit plugin makes the % command work better, but it is not backwards +" compatible. +" The ! means the package won't be loaded right away but when plugins are +" loaded during initialization. +if has('syntax') && has('eval') + packadd! matchit +endif diff --git a/.zshrc b/.zshrc index 9db057d..236c3ce 100644 --- a/.zshrc +++ b/.zshrc @@ -9,6 +9,9 @@ source $ZSH/oh-my-zsh.sh # Use Homebrew bin before defaults export PATH="/usr/local/bin:$PATH" +# Use ~/bin +export PATH="/Users/shadowfacts/bin:$PATH" + # command line tools alias fuck='$(thefuck $(fc -ln -1))' @@ -19,30 +22,51 @@ alias git=hub alias python=python3 alias pip=pip3 -alias oldruby="/usr/local/bin/ruby" -alias ruby="/usr/local/Cellar/ruby/2.3.1/bin/ruby" +alias oldruby="/usr/bin/ruby" +alias ruby="/usr/local/opt/ruby/bin/ruby" + +# Erlang/Elixir persistent shell history +export ERL_AFLAGS="-kernel shell_history enabled" # lazily load nvm -export NVM_DIR=~/.nvm +# export NVM_DIR=~/.nvm #. $(brew --prefix nvm)/nvm.sh -nvm() { - unset -f nvm - . $(brew --prefix nvm)/nvm.sh - nvm "$@" -} +# nvm() { +# unset -f nvm +# unset -f node +# unset -f npm +# unset -f yarn +# . $(brew --prefix nvm)/nvm.sh +# nvm "$@" +# } -node() { - unset -f node - . $(brew --prefix nvm)/nvm.sh - node "$@" -} +# node() { +# unset -f nvm +# unset -f node +# unset -f npm +# unset -f yarn +# . $(brew --prefix nvm)/nvm.sh +# node "$@" +# } -npm() { - unset -f npm - . $(brew --prefix nvm)/nvm.sh - npm "$@" -} +# npm() { +# unset -f nvm +# unset -f node +# unset -f npm +# unset -f yarn +# . $(brew --prefix nvm)/nvm.sh +# npm "$@" +# } + +# yarn() { +# unset -f nvm +# unset -f node +# unset -f npm +# unset -f yarn +# . $(brew --prefix nvm)/nvm.sh +# yarn "$@" +# } # Go up N directories up() { @@ -85,3 +109,4 @@ ca() { # default file openings alias -s ipr=open +alias -s xcodeproj=open diff --git a/iterm2_settings/com.googlecode.iterm2.plist b/iterm2_settings/com.googlecode.iterm2.plist index a6a864d..77abc96 100644 --- a/iterm2_settings/com.googlecode.iterm2.plist +++ b/iterm2_settings/com.googlecode.iterm2.plist @@ -14,6 +14,8 @@ 0 AppleSmoothFixedFontsSizeThreshold 1 + AppleWindowTabbingMode + manual CopyLastNewline CopySelection @@ -954,6 +956,8 @@ 2EC9E0B9-0B43-4156-BD32-9BAE92818C3B DisableFullscreenTransparency + DisableWindowSizeSnap + HideMenuBarInFullscreen HideScrollbar @@ -975,17 +979,15 @@ HotkeyModifiers 524288 JobName - + LoadPrefsFromCustomFolder NSFontPanelAttributes 1, 0 NSNavLastRootDirectory - ~/dotfiles/iterm2_settings + ~/Misc NSNavPanelExpandedSizeForOpenMode {712, 448} - NSNavPanelExpandedSizeForSaveMode - {712, 448} NSQuotedKeystrokeBinding NSRepeatCountBinding @@ -1001,7 +1003,7 @@ gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA - DIAIgAlRMSNAczGdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP + DIAIgAlRMSNAc7Gdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA @@ -1023,21 +1025,17 @@ 1 NSWindow Frame NSFontPanel - 699 171 722 386 0 0 2560 1418 - NSWindow Frame SessionsPreferences - 1815 992 599 388 0 0 2560 1418 + 597 163 445 77 0 0 2560 1417 + NSWindow Frame SUUpdateAlert + 970 768 620 392 0 0 2560 1417 NSWindow Frame SharedPreferences - 1339 457 796 473 0 0 2560 1417 - NSWindow Frame UKCrashReporter - 230 834 592 584 0 0 2560 1418 + 263 680 916 404 0 0 2560 1417 NSWindow Frame iTerm Window 0 - 1281 5 1277 704 0 0 2560 1417 + 0 1054 2560 364 0 0 2560 1417 NSWindow Frame iTerm Window 1 - 1914 49 605 1348 0 0 2560 1417 + 1280 0 1280 708 0 0 2560 1417 NSWindow Frame iTerm Window 2 - 1 711 1277 704 0 0 2560 1417 - NSWindow Frame iTerm Window 3 - 406 112 570 340 0 0 2560 1418 + 406 112 570 387 0 0 2560 1417 New Bookmarks @@ -1279,12 +1277,14 @@ Red Component 1 + Blend + 0.050000000000000003 Blinking Cursor Blur Blur Radius - 6.0933990323604057 + 30 Bold Color Blue Component @@ -1337,6 +1337,8 @@ Red Component 1 + Cursor Type + 2 Custom Command No Custom Directory @@ -1678,7 +1680,7 @@ Non-ASCII Anti Aliased Normal Font - Hack-Regular 12 + SFMono-Medium 12 Only The Default BG Color Uses Transparency Open Toolbelt @@ -1694,7 +1696,7 @@ Screen -1 Scrollback Lines - 1000 + 0 Selected Text Color Blue Component @@ -1721,12 +1723,27 @@ Sync Title + Tab Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.0 + Red Component + 0.0 + Tags Terminal Type xterm-256color + Thin Strokes + 4 Transparency - 0.38721494805589762 + 0.17131979695431471 Unlimited Scrollback Use Bold Font @@ -1737,12 +1754,14 @@ Use Non-ASCII Font + Use Tab Color + Vertical Spacing 1 Visual Bell Window Type - 12 + 0 Working Directory /Users/shadowfacts @@ -1986,13 +2005,15 @@ 1 Blend - 0.5 + 0.050000000000000003 + Blink Allowed + Blinking Cursor Blur Blur Radius - 8.4044356757614214 + 30 Bold Color Blue Component @@ -2002,6 +2023,8 @@ Red Component 1 + Bound Hosts + Character Encoding 4 Close Sessions On End @@ -2045,6 +2068,8 @@ Red Component 1 + Cursor Type + 2 Custom Command No Custom Directory @@ -2067,19 +2092,25 @@ 0.73333334922790527 Guid - BBA40974-E175-470C-993E-04C5A06540F6 + B8BD8C7A-BD99-45BB-AF3C-AFD8261666E9 Has Hotkey Hide After Opening Horizontal Spacing 1 + HotKey Activated By Modifier + + HotKey Alternate Shortcuts + HotKey Characters - +   HotKey Characters Ignoring Modifiers HotKey Key Code 49 + HotKey Modifier Activation + 0 HotKey Modifier Flags 524288 HotKey Window Animates @@ -2089,7 +2120,7 @@ HotKey Window Dock Click Action 0 HotKey Window Floats - + HotKey Window Reopens On Activation Idle Code @@ -2406,7 +2437,7 @@ Non-ASCII Anti Aliased Normal Font - Hack-Regular 12 + SFMono-Medium 12 Only The Default BG Color Uses Transparency Open Toolbelt @@ -2418,11 +2449,11 @@ Right Option Key Sends 0 Rows - 25 + 24 Screen -1 Scrollback Lines - 1000 + 0 Selected Text Color Blue Component @@ -2455,10 +2486,12 @@ Terminal Type xterm-256color + Thin Strokes + 4 Transparency - 0.20099738261421318 + 0.17131979695431471 Unlimited Scrollback - + Use Bold Font Use Bright Bold @@ -2476,15 +2509,748 @@ Working Directory /Users/shadowfacts + + ASCII Anti Aliased + + Ambiguous Double Width + + Ansi 0 Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.18516387045383453 + Color Space + Calibrated + Green Component + 0.31187343597412109 + Red Component + 0.86319804191589355 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.34956708550453186 + Color Space + Calibrated + Green Component + 0.72796010971069336 + Red Component + 0.4953155517578125 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.33330309391021729 + Color Space + Calibrated + Green Component + 1 + Red Component + 1 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.95439493656158447 + Color Space + Calibrated + Green Component + 0.5593646764755249 + Red Component + 0.36131119728088379 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.8724982738494873 + Color Space + Calibrated + Green Component + 0.0 + Red Component + 0.85993486642837524 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.90620243549346924 + Color Space + Calibrated + Green Component + 0.80894219875335693 + Red Component + 0.46985334157943726 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.87325406074523926 + Color Space + Calibrated + Green Component + 0.87323927879333496 + Red Component + 0.87326538562774658 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.22728368639945984 + Color Space + Calibrated + Green Component + 0.74517852067947388 + Red Component + 0.42215383052825928 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.17477142810821533 + Color Space + Calibrated + Green Component + 0.84370553493499756 + Red Component + 0.90125834941864014 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.98854875564575195 + Color Space + Calibrated + Green Component + 0.43700402975082397 + Red Component + 0.14857380092144012 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.63734370470046997 + Color Space + Calibrated + Green Component + 0.0 + Red Component + 0.62816643714904785 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.85317325592041016 + Color Space + Calibrated + Green Component + 0.69714248180389404 + Red Component + 0.22037386894226074 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.69611632823944092 + Color Space + Calibrated + Green Component + 0.69610452651977539 + Red Component + 0.69612538814544678 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.33335328102111816 + Color Space + Calibrated + Green Component + 0.3333476185798645 + Red Component + 0.33335760235786438 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.39245116710662842 + Color Space + Calibrated + Green Component + 0.49785429239273071 + Red Component + 0.88458710908889771 + + BM Growl + + Background Color + + Alpha Component + 1 + Blue Component + 0.24313725490196078 + Color Space + sRGB + Green Component + 0.23921568627450981 + Red Component + 0.23529411764705882 + + Background Image Location + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.0 + Color Space + Calibrated + Green Component + 0.0 + Red Component + 1 + + Blend + 0.050000000000000003 + Blinking Cursor + + Blur + + Blur Radius + 30 + Bold Color + + Blue Component + 1 + Green Component + 1 + Red Component + 1 + + Bound Hosts + + Character Encoding + 4 + Close Sessions On End + + Columns + 80 + Command + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.42266941070556641 + Color Space + Calibrated + Green Component + 0.42266225814819336 + Red Component + 0.42267489433288574 + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + 1 + Color Space + Calibrated + Green Component + 0.91000000000000003 + Red Component + 0.65000000000000002 + + Cursor Text Color + + Blue Component + 1 + Green Component + 1 + Red Component + 1 + + Cursor Type + 2 + Custom Command + No + Custom Directory + No + Default Bookmark + No + Description + Default + Disable Window Resizing + + Flashing Bell + + Foreground Color + + Blue Component + 0.73333334922790527 + Green Component + 0.73333334922790527 + Red Component + 0.73333334922790527 + + Guid + 319D63B3-8BBD-4C3B-B2D9-DC2DCF75D46B + Has Hotkey + + Hide After Opening + + Horizontal Spacing + 1 + Idle Code + 0 + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0x2d-0x40000 + + Action + 11 + Text + 0x1f + + 0x32-0x40000 + + Action + 11 + Text + 0x00 + + 0x33-0x40000 + + Action + 11 + Text + 0x1b + + 0x34-0x40000 + + Action + 11 + Text + 0x1c + + 0x35-0x40000 + + Action + 11 + Text + 0x1d + + 0x36-0x40000 + + Action + 11 + Text + 0x1e + + 0x37-0x40000 + + Action + 11 + Text + 0x1f + + 0x38-0x40000 + + Action + 11 + Text + 0x7f + + 0xf700-0x220000 + + Action + 10 + Text + [1;2A + + 0xf700-0x240000 + + Action + 10 + Text + [1;5A + + 0xf700-0x260000 + + Action + 10 + Text + [1;6A + + 0xf700-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x41 + + 0xf701-0x220000 + + Action + 10 + Text + [1;2B + + 0xf701-0x240000 + + Action + 10 + Text + [1;5B + + 0xf701-0x260000 + + Action + 10 + Text + [1;6B + + 0xf701-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x42 + + 0xf702-0x220000 + + Action + 10 + Text + [1;2D + + 0xf702-0x240000 + + Action + 10 + Text + [1;5D + + 0xf702-0x260000 + + Action + 10 + Text + [1;6D + + 0xf702-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x44 + + 0xf703-0x220000 + + Action + 10 + Text + [1;2C + + 0xf703-0x240000 + + Action + 10 + Text + [1;5C + + 0xf703-0x260000 + + Action + 10 + Text + [1;6C + + 0xf703-0x280000 + + Action + 11 + Text + 0x1b 0x1b 0x5b 0x43 + + 0xf704-0x20000 + + Action + 10 + Text + [1;2P + + 0xf705-0x20000 + + Action + 10 + Text + [1;2Q + + 0xf706-0x20000 + + Action + 10 + Text + [1;2R + + 0xf707-0x20000 + + Action + 10 + Text + [1;2S + + 0xf708-0x20000 + + Action + 10 + Text + [15;2~ + + 0xf709-0x20000 + + Action + 10 + Text + [17;2~ + + 0xf70a-0x20000 + + Action + 10 + Text + [18;2~ + + 0xf70b-0x20000 + + Action + 10 + Text + [19;2~ + + 0xf70c-0x20000 + + Action + 10 + Text + [20;2~ + + 0xf70d-0x20000 + + Action + 10 + Text + [21;2~ + + 0xf70e-0x20000 + + Action + 10 + Text + [23;2~ + + 0xf70f-0x20000 + + Action + 10 + Text + [24;2~ + + 0xf729-0x20000 + + Action + 10 + Text + [1;2H + + 0xf729-0x40000 + + Action + 10 + Text + [1;5H + + 0xf72b-0x20000 + + Action + 10 + Text + [1;2F + + 0xf72b-0x40000 + + Action + 10 + Text + [1;5F + + + Link Color + + Alpha Component + 1 + Blue Component + 0.67800000000000005 + Color Space + Calibrated + Green Component + 0.27000000000000002 + Red Component + 0.023 + + Mouse Reporting + + Name + Copy of Default + Non Ascii Font + Monaco 12 + Non-ASCII Anti Aliased + + Normal Font + SFMono-Regular 12 + Only The Default BG Color Uses Transparency + + Open Toolbelt + + Option Key Sends + 2 + Prompt Before Closing 2 + + Right Option Key Sends + 0 + Rows + 24 + Screen + -1 + Scrollback Lines + 0 + Selected Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Selection Color + + Blue Component + 1 + Green Component + 0.8353000283241272 + Red Component + 0.70980000495910645 + + Send Code When Idle + + Shortcut + A + Silence Bell + + Sync Title + + Tab Color + + Alpha Component + 1 + Blue Component + 0.0 + Color Space + sRGB + Green Component + 0.0 + Red Component + 0.0 + + Tags + + Terminal Type + xterm-256color + Transparency + 0.0 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Use Italic Font + + Use Non-ASCII Font + + Use Tab Color + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/shadowfacts + NoSyncHaveWarnedAboutPasteConfirmationChange NoSyncInstallationId - 43BCE7FE-0993-4F61-8102-5BC2CEDFF0B7 - NoSyncTimeOfFirstLaunchOfVersionWithTip - 503773527.37371099 - NoSyncTipsDisabled + AAC8F95F-94B5-4677-A839-411C2719881F + NoSyncNeverRemindPrefsChangesLostForFile + NoSyncNeverRemindPrefsChangesLostForFile_selection + 0 + NoSyncPermissionToShowTip + + NoSyncTimeOfFirstLaunchOfVersionWithTip + 550546067.45925105 PointerActions Button,1,1,, @@ -2523,27 +3289,31 @@ PromptOnQuit SUEnableAutomaticChecks - + SUFeedAlternateAppNameKey iTerm SUFeedURL - https://iterm2.com/appcasts/final.xml?shard=78 + https://iterm2.com/appcasts/final.xml?shard=80 SUHasLaunchedBefore + SULastCheckTime + 2018-10-05T16:41:16Z SUSendProfileInfo ShowBookmarkName ShowFullScreenTabBar + ShowMetalFPSmeter + ShowPaneTitles + StretchTabsToFillBar + TabStyle - 0 + 1 TabViewType 0 - UKCrashReporterLastCrashReportDate - 1488576256 UseBorder WindowNumber @@ -2552,12 +3322,14 @@ /-+\~_. findIgnoreCase_iTerm + findMode_iTerm + 0 findRegex_iTerm iTerm Version - 3.1.beta.5 + 3.2.2 kCPKSelectionViewPreferredModeKey - 7 + 1 kCPKSelectionViewShowHSBTextFieldsKey