diff --git a/.bashrc b/.bashrc index b89346b..5ef8333 100644 --- a/.bashrc +++ b/.bashrc @@ -1,17 +1,13 @@ -if [ -f ~/.git-completion.sh ]; then - source ~/.git-completion.sh -fi - -if [ -f ~/.git-prompt.sh ]; then - source ~/.git-prompt.sh -fi - if [ -f /etc/bash_completion ]; then source /etc/bash_completion fi +awsAutocomplete=$(which aws_completer) +if [ -n "${awsAutocomplete}" ]; then + complete -C "${awsAutocomplete}" aws +fi + export EDITOR=vim -export WEBIDE_JDK=/usr/lib/jvm/java-1.7.0-openjdk-amd64 GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWUNTRACKEDFILES=1 @@ -26,12 +22,23 @@ YELLOW="\[\033[1;33m\]" RESET="\[\033[0m\]" function set_bash_prompt() { - PS1="$GREEN\u@\h$RESET:$BLUE\w$MAGENTA$(__git_ps1 " (%s)")$YELLOW ⚡$RESET " + PS1="$GREEN\u@\h$RESET:$BLUE\w$MAGENTA$(__git_ps1 " (%s)")$RESET " } -PROMPT_COMMAND=set_bash_prompt +if [ "$(type -t __git_ps1)" = "function" ]; then + PROMPT_COMMAND=set_bash_prompt +else + PS1="$GREEN\u@\h$RESET:$BLUE\w$RESET " +fi alias ls='ls --color=auto' alias grep='grep --color=auto' alias egrep='egrep --color=auto' alias fgrep='fgrep --color=auto' + +# override for Debian's new idiotic quoting style in ls +export QUOTING_STYLE=literal + +# override executable directories weird blue on green color scheme +eval "$(dircolors)" +export LS_COLORS="${LS_COLORS}:ow=1;4;33" diff --git a/com.googlecode.iterm2.plist b/com.googlecode.iterm2.plist deleted file mode 100644 index 1babb29..0000000 --- a/com.googlecode.iterm2.plist +++ /dev/null @@ -1,1114 +0,0 @@ - - - - - AdjustWindowForFontSizeChange - - AllowClipboardAccess - - AnimateDimming - - AppleAntiAliasingThreshold - 1 - AppleScrollAnimationEnabled - 0 - AppleSmoothFixedFontsSizeThreshold - 1 - AppleWindowTabbingMode - manual - AutoHideTmuxClientSession - - CheckTestRelease - - ClosingHotkeySwitchesSpaces - - CommandSelection - - Control - 1 - CopyLastNewline - - CopySelection - - Default Bookmark Guid - 0CCB0077-B33D-4251-9DE8-1813F52241F7 - DimBackgroundWindows - - DimInactiveSplitPanes - - DimOnlyText - - DisableFullscreenTransparency - - EnableRendezvous - - FocusFollowsMouse - - FsTabDelay - 1 - GlobalKeyMap - - 0x9-0x40000 - - Action - 32 - Text - - - 0xd-0x100000 - - Action - 13 - Text - - - 0xf700-0x300000 - - Action - 7 - Text - - - 0xf701-0x300000 - - Action - 6 - Text - - - 0xf702-0x300000 - - Action - 2 - Text - - - 0xf702-0x320000 - - Action - 33 - Text - - - 0xf703-0x300000 - - Action - 0 - Text - - - 0xf703-0x320000 - - Action - 34 - Text - - - 0xf729-0x100000 - - Action - 5 - Text - - - 0xf72b-0x100000 - - Action - 4 - Text - - - 0xf72c-0x100000 - - Action - 9 - Text - - - 0xf72c-0x20000 - - Action - 9 - Text - - - 0xf72d-0x100000 - - Action - 8 - Text - - - 0xf72d-0x20000 - - Action - 8 - Text - - - - HiddenAFRStrokeThickness - 0.0 - HiddenAdvancedFontRendering - - HideActivityIndicator - - HideMenuBarInFullscreen - - HideScrollbar - - HideTab - - HighlightTabLabels - - HotKeyBookmark - 0CCB0077-B33D-4251-9DE8-1813F52241F7 - HotKeyTogglesWindow - - Hotkey - - HotkeyChar - 0 - HotkeyCode - 0 - HotkeyMigratedFromSingleToMulti - - HotkeyModifiers - 0 - IRMemory - 4 - JobName - - LeftCommand - 7 - LeftOption - 2 - LoadPrefsFromCustomFolder - - MaxVertically - - NSNavLastRootDirectory - ~ - NSNavPanelExpandedSizeForOpenMode - {712, 448} - NSQuotedKeystrokeBinding - - NSRepeatCountBinding - - NSScrollAnimationEnabled - - NSScrollViewShouldScrollUnderTitlebar - - NSTableView Columns v2 KeyBingingTable - - YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoK4HCA8aGxwdHh8gJjAxMlUkbnVsbNIJCgsOWk5TLm9iamVjdHNWJGNsYXNzogwN - gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm - aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz - ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA - DIAIgAlRMSNAc7AAAAAAANIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP - TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA - ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe - AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA - AAAAADoAAAAAAAAAAAAAAAAAAAFM - - NSTableView Sort Ordering v2 KeyBingingTable - - YnBsaXN0MDDUAQIDBAUGFBVYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA1VJG51bGzSCQoLDFpOUy5vYmplY3RzViRjbGFzc6CAAtIODxARWiRjbGFz - c25hbWVYJGNsYXNzZXNeTlNNdXRhYmxlQXJyYXmjEBITV05TQXJyYXlYTlNPYmplY3Rf - EA9OU0tleWVkQXJjaGl2ZXLRFhdVQXJyYXmAAQgRGiMtMjc7QUZRWFlbYGt0g4ePmKqt - swAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1 - - NSTableView Supports v2 KeyBingingTable - - NSToolbar Configuration com.apple.NSColorPanel - - TB Is Shown - 1 - - NSWindow Frame NSFontPanel - 551 285 725 386 0 0 1920 1057 - NSWindow Frame Preferences - 471 519 606 456 0 0 1920 1057 - NSWindow Frame SUUpdateAlert - 650 499 620 392 0 0 1920 1057 - NSWindow Frame SharedPreferences - 295 285 1016 512 0 0 1920 1057 - NSWindow Frame iTerm Window 0 - 1156 4 760 1053 0 0 1920 1057 - NSWindow Frame iTerm Window 1 - 721 402 585 475 0 0 1440 877 - NSWindow Frame iTerm Window 2 - 172 58 570 475 0 0 1440 877 - NeverWarnAboutShortLivedSessions_0CCB0077-B33D-4251-9DE8-1813F52241F7 - - New Bookmarks - - - ASCII Anti Aliased - - Allow Title Reporting - - Ambiguous Double Width - - Ansi 0 Color - - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 - - Ansi 1 Color - - Blue Component - 0.27557319402694702 - Green Component - 0.31238403916358948 - Red Component - 0.77041906118392944 - - Ansi 10 Color - - Blue Component - 0.40776142477989197 - Green Component - 0.8508719801902771 - Red Component - 0.39613959193229675 - - Ansi 11 Color - - Blue Component - 0.37709429860115051 - Green Component - 0.94213622808456421 - Red Component - 0.93323308229446411 - - Ansi 12 Color - - Blue Component - 1 - Green Component - 0.51354789733886719 - Red Component - 0.5000075101852417 - - Ansi 13 Color - - Blue Component - 0.89668166637420654 - Green Component - 0.38407832384109497 - Red Component - 0.86385005712509155 - - Ansi 14 Color - - Blue Component - 1 - Green Component - 1 - Red Component - 0.3333333432674408 - - Ansi 15 Color - - Blue Component - 1 - Green Component - 1 - Red Component - 1 - - Ansi 2 Color - - Blue Component - 0.3218308687210083 - Green Component - 0.61257100105285645 - Red Component - 0.29013499617576599 - - Ansi 3 Color - - Blue Component - 0.031790036708116531 - Green Component - 0.70981299877166748 - Red Component - 0.67099672555923462 - - Ansi 4 Color - - Blue Component - 0.80577254295349121 - Green Component - 0.45352429151535034 - Red Component - 0.43344211578369141 - - Ansi 5 Color - - Blue Component - 0.63202452659606934 - Green Component - 0.30584368109703064 - Red Component - 0.63405537605285645 - - Ansi 6 Color - - Blue Component - 0.73333334922790527 - Green Component - 0.7197340726852417 - Red Component - 0.19173985719680786 - - Ansi 7 Color - - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 - - Ansi 8 Color - - Blue Component - 0.35102984309196472 - Green Component - 0.35102984309196472 - Red Component - 0.35102984309196472 - - Ansi 9 Color - - Blue Component - 0.3333333432674408 - Green Component - 0.3333333432674408 - Red Component - 1 - - Automatically Log - - BM Growl - - Background Color - - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 - - Background Image Is Tiled - - Background Image Location - - Blend - 0.30000001192092896 - Blink Allowed - - Blinking Cursor - - Blur - - Blur Radius - 2 - Bold Color - - Blue Component - 1 - Green Component - 1 - Red Component - 1 - - Character Encoding - 4 - Close Sessions On End - - Columns - 80 - Command - - Cursor Color - - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 - - Cursor Text Color - - Blue Component - 1 - Green Component - 1 - Red Component - 1 - - Cursor Type - 2 - Custom Command - No - Custom Directory - Recycle - Default Bookmark - No - Disable Printing - - Disable Smcup Rmcup - - Disable Window Resizing - - Flashing Bell - - Foreground Color - - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 - - Guid - 0CCB0077-B33D-4251-9DE8-1813F52241F7 - Hide After Opening - - Horizontal Spacing - 1 - Idle Code - 0 - Initial Text - - 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 - - - Log Directory - - Minimum Contrast - 0.0 - Mouse Reporting - - Name - Default - Non Ascii Font - Monaco 12 - Non-ASCII Anti Aliased - - Normal Font - Monaco 12 - Option Key Sends - 2 - Prompt Before Closing 2 - 0 - Right Option Key Sends - 0 - Rows - 25 - Screen - -1 - Scrollback Lines - 100000 - Scrollback With Status Bar - - Scrollback in Alternate Screen - - 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 - - Semantic History - - action - best editor - editor - com.sublimetext.3 - text - - - Send Code When Idle - - Set Local Environment Vars - - Shortcut - T - Silence Bell - - Smart Cursor Color - - Smart Selection Rules - - - notes - Word bounded by whitespace - precision - low - regex - \S+ - - - notes - C++ namespace::identifier - precision - normal - regex - ([a-zA-Z0-9_]+::)+[a-zA-Z0-9_]+ - - - notes - Paths - precision - normal - regex - \~?/?([[:letter:][:number:]._-]+/+)+[[:letter:][:number:]._-]+/? - - - notes - Quoted string - precision - normal - regex - @?"(?:[^"\\]|\\.)*" - - - notes - Java/Python include paths - precision - normal - regex - ([[:letter:][:number:]._]+\.)+[[:letter:][:number:]._]+ - - - notes - mailto URL - precision - normal - regex - \bmailto:([a-z0-9A-Z_]+@)?([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\b - - - notes - Obj-C selector - precision - high - regex - @selector\([^)]+\) - - - notes - email address - precision - high - regex - \b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}\b - - - notes - HTTP URL - precision - very_high - regex - https?://([a-z0-9A-Z]+(:[a-zA-Z0-9]+)?@)?[a-z0-9A-Z]+(\.[a-z0-9A-Z]+)*((:[0-9]+)?)(/[a-zA-Z0-9;/\.\-_+%~?&@=#\(\)]*)? - - - notes - SSH URL - precision - very_high - regex - \bssh:([a-z0-9A-Z_]+@)?([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\b - - - notes - Telnet URL - precision - very_high - regex - \btelnet:([a-z0-9A-Z_]+@)?([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\b - - - Sync Title - - Tags - - Terminal Type - xterm-256color - Transparency - 0.0 - Triggers - - Unlimited Scrollback - - Use Bold Font - - Use Bright Bold - - Use Canonical Parser - - Use Italic Font - - Vertical Spacing - 1 - Visual Bell - - Window Type - 0 - Working Directory - /Users/tmont - - - NoSyncConfirmBeta - - NoSyncDoNotWarnBeforeMultilinePaste - - NoSyncDoNotWarnBeforeMultilinePaste_selection - 0 - NoSyncInstallationId - F6508B3C-D180-404F-A2DC-9902D53E6C88 - NoSyncNeverRemindPrefsChangesLostForFile - - NoSyncNeverRemindPrefsChangesLostForFile_selection - 0 - NoSyncPermissionToShowTip - - NoSyncTimeOfFirstLaunchOfVersionWithTip - 486666892.11394 - NoSyncTimeOfLastPromo - 484508826.030756 - NoSyncTimeOfLastPromoDownload - 486516134.719625 - OnlyWhenMoreTabs - - OpenArrangementAtStartup - - OpenBookmark - - OpenTmuxWindowsIn - 0 - PMPrintingExpandedStateForPrint2 - - PassOnControlClick - - PasteFromClipboard - - PasteTabToStringTabStopSize - 4 - PointerActions - - Button,1,1,, - - Action - kContextMenuPointerAction - - Button,2,1,, - - Action - kPasteFromClipboardPointerAction - - Gesture,ThreeFingerSwipeDown,, - - Action - kPrevWindowPointerAction - - Gesture,ThreeFingerSwipeLeft,, - - Action - kPrevTabPointerAction - - Gesture,ThreeFingerSwipeRight,, - - Action - kNextTabPointerAction - - Gesture,ThreeFingerSwipeUp,, - - Action - kNextWindowPointerAction - - - PrefsCustomFolder - /Users/tmont/code/settings - Print In Black And White - - PromptOnQuit - - QuitWhenAllWindowsClosed - - RightCommand - 8 - RightOption - 3 - SUEnableAutomaticChecks - - SUFeedAlternateAppNameKey - iTerm - SUFeedURL - https://iterm2.com/appcasts/final.xml?shard=41 - SUHasLaunchedBefore - - SULastCheckTime - 2018-03-10T00:10:28Z - SavePasteHistory - - ShowBookmarkName - - ShowPaneTitles - - SmartPlacement - - SplitPaneDimmingAmount - 0.40000000596046448 - SwitchTabModifier - 4 - SwitchWindowModifier - 6 - TabViewType - 0 - ThreeFingerEmulates - - TmuxDashboardLimit - 10 - TripleClickSelectsFullWrappedLines - - URLHandlersByGuid - - UseBorder - - UseCompactLabel - - UseLionStyleFullscreen - - WebKitDefaultFontSize - 11 - WebKitStandardFont - .Helvetica Neue DeskInterface - WindowNumber - - WindowStyle - 0 - WordCharacters - /-+\~_. - findIgnoreCase_iTerm - - findMode_iTerm - 0 - findRegex_iTerm - - iTerm Version - 3.1.5 - - diff --git a/datagrip-linux-settings.jar b/datagrip-linux-settings.jar new file mode 100644 index 0000000..db27ea2 Binary files /dev/null and b/datagrip-linux-settings.jar differ diff --git a/phpstorm.settings.linux.jar b/phpstorm.settings.linux.jar index 93ec689..8897e16 100644 Binary files a/phpstorm.settings.linux.jar and b/phpstorm.settings.linux.jar differ