From 77518cf80982a27df0870a513f21933ebd437aa8 Mon Sep 17 00:00:00 2001 From: Ruben Del Rio Date: Mon, 12 Aug 2019 09:45:08 -0400 Subject: [PATCH] Another update I guess --- .gitignore | 1 + Theme - Afterglow | 1 + bash/bash_profile | 1 + git/gitconfig | 2 +- iterm/com.googlecode.iterm2.plist | 774 +++++++++++++++++++++++++++++- profile/profile | 1 + 6 files changed, 766 insertions(+), 14 deletions(-) create mode 160000 Theme - Afterglow diff --git a/.gitignore b/.gitignore index 930bf78..8d3a908 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.tmPreferences.cache *.stTheme.cache *.sublime-workspace +*/.git Package Control.sublime-settings Package Control.merged-ca-bundle diff --git a/Theme - Afterglow b/Theme - Afterglow new file mode 160000 index 0000000..8e5ffbf --- /dev/null +++ b/Theme - Afterglow @@ -0,0 +1 @@ +Subproject commit 8e5ffbfe1e7453377fb8302d7d2f4be69c322e40 diff --git a/bash/bash_profile b/bash/bash_profile index 9520588..abba999 100644 --- a/bash/bash_profile +++ b/bash/bash_profile @@ -32,6 +32,7 @@ alias 1='project' alias dockerip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'" alias webcam-fix='sudo killall AppleCameraAssistant; sudo killall VDCAssistant' alias docker-purge='docker stop $(docker ps -aq)' +alias dokku='~/.dokku/contrib/dokku_client.sh' # Git commands alias gs='git status ' diff --git a/git/gitconfig b/git/gitconfig index 87fd8c5..6cf5e26 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -30,7 +30,7 @@ short = true branch = false #disabled because powerline already shows this [rerere] - enabled = true + enabled = 1 autoupdate = true # Lets git remember how merge conflicts are solved [filter "lfs"] diff --git a/iterm/com.googlecode.iterm2.plist b/iterm/com.googlecode.iterm2.plist index 8012d62..9b56d9c 100644 --- a/iterm/com.googlecode.iterm2.plist +++ b/iterm/com.googlecode.iterm2.plist @@ -6,6 +6,8 @@ AllowClipboardAccess + AlternateMouseScroll + AnimateDimming AppleAntiAliasingThreshold @@ -471,6 +473,8 @@ FsTabDelay 1 + HapticFeedbackForEsc + HiddenAFRStrokeThickness 0.0 HiddenAdvancedFontRendering @@ -513,6 +517,8 @@ NSColorPanelMode 0 + NSColorPickerPreferredRGBEntryMode + 2 NSNavLastRootDirectory ~/Desktop NSNavPanelExpandedSizeForOpenMode @@ -529,6 +535,11 @@ NSScrollViewShouldScrollUnderTitlebar + NSSplitView Subview Frames NSColorPanelSplitView + + 0.000000, 0.000000, 224.000000, 263.000000, NO, NO + 0.000000, 264.000000, 224.000000, 43.000000, NO, NO + NSTableView Columns v2 KeyBingingTable YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS @@ -557,26 +568,32 @@ TB Is Shown 1 + NSWindow Frame NSColorPanel + 0 120 224 280 0 0 1440 878 NSWindow Frame NSFontPanel 1576 31 1018 280 1440 -180 1920 1058 NSWindow Frame Preferences 772 699 606 456 0 0 1920 1177 NSWindow Frame SUAutomaticUpdateAlert - 1027 320 616 174 0 0 1920 1177 + 412 538 616 174 0 0 1440 878 NSWindow Frame SharedPreferences - 2286 -30 918 512 1440 -180 1920 1058 + 2286 53 770 429 1440 -180 1920 1058 NSWindow Frame iTerm Window 0 - 2492 -109 570 427 1440 -180 1920 1058 + 44 446 570 427 0 0 1440 878 NSWindow Frame iTerm Window 1 - 2256 55 570 427 1440 -180 1920 1058 + 0 601 570 427 0 0 1680 1028 NSWindow Frame iTerm Window 2 - 2521 439 570 427 1440 -180 1920 1058 + 0 601 570 427 0 0 1680 1028 NSWindow Frame iTerm Window 3 - 833 302 1018 1115 0 0 2560 1417 + 1 600 570 427 0 0 1680 1028 NSWindow Frame iTerm Window 4 - 1172 47 745 1131 0 0 1920 1178 + 842 0 836 1028 0 0 1680 1028 NSWindow Frame iTerm Window 5 - 208 118 570 426 0 0 1680 1027 + 842 57 836 971 0 0 1680 1028 + NSWindow Frame iTerm Window 6 + 675 316 570 427 0 0 1680 1028 + NSWindow Frame iTerm Window 7 + 0 46 1680 982 0 0 1680 1028 New Bookmarks @@ -849,7 +866,7 @@ Hide After Opening Horizontal Spacing - 0.89999997615814209 + 0.90000000000000002 Idle Code 0 Initial Text @@ -1327,7 +1344,7 @@ Use Italic Font Vertical Spacing - 1.1000000238418579 + 1.1000000000000001 Visual Bell Window Type @@ -2061,16 +2078,737 @@ /Users/rubendelrio + NoSyncAllAppVersions + + 3.3.0beta9 + 3.3.0beta16 + 3.3.0beta13 + NoSyncCommandHistoryHasEverBeenUsed + NoSyncFrame_SharedPreferences + + screenFrame + {{0, 0}, {1440, 900}} + topLeft + {398, 721} + NoSyncHaveWarnedAboutPasteConfirmationChange NoSyncInstallationId CCFC8451-ECA9-471B-8378-7C4BF3D3A750 + NoSyncLaunchExperienceControllerRunCount + 10 NoSyncNeverRemindPrefsChangesCopy + NoSyncNextAnnoyanceTime + 577724837.11496997 + NoSyncOnboardingWindowHasBeenShown + NoSyncPermissionToShowTip + NoSyncRecordedVariables + + 0 + + + isTerminal + + name + + nonterminalContext + 0 + + + 1 + + + isTerminal + + name + presentationName + nonterminalContext + 0 + + + isTerminal + + name + tmuxRole + nonterminalContext + 0 + + + isTerminal + + name + lastCommand + nonterminalContext + 0 + + + isTerminal + + name + profileName + nonterminalContext + 0 + + + isTerminal + + name + termid + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindowTitle + nonterminalContext + 0 + + + isTerminal + + name + id + nonterminalContext + 0 + + + isTerminal + + name + jobName + nonterminalContext + 0 + + + isTerminal + + name + columns + nonterminalContext + 0 + + + isTerminal + + name + tab.tmuxWindowTitle + nonterminalContext + 0 + + + isTerminal + + name + hostname + nonterminalContext + 0 + + + isTerminal + + name + tmuxClientName + nonterminalContext + 0 + + + isTerminal + + name + path + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindowTitleEval + nonterminalContext + 0 + + + isTerminal + + name + triggerName + nonterminalContext + 0 + + + isTerminal + + name + terminalIconName + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindowPane + nonterminalContext + 0 + + + isTerminal + + name + tmuxStatusRight + nonterminalContext + 0 + + + isTerminal + + name + mouseReportingMode + nonterminalContext + 0 + + + isTerminal + + name + name + nonterminalContext + 0 + + + isTerminal + + name + iterm2 + nonterminalContext + 4 + + + isTerminal + + name + tmuxPaneTitle + nonterminalContext + 0 + + + isTerminal + + name + rows + nonterminalContext + 0 + + + isTerminal + + name + username + nonterminalContext + 0 + + + isTerminal + + name + tty + nonterminalContext + 0 + + + isTerminal + + name + autoLogId + nonterminalContext + 0 + + + isTerminal + + name + badge + nonterminalContext + 0 + + + isTerminal + + name + tab.tmuxWindowName + nonterminalContext + 0 + + + isTerminal + + name + tab + nonterminalContext + 2 + + + isTerminal + + name + tmuxStatusLeft + nonterminalContext + 0 + + + isTerminal + + name + autoNameFormat + nonterminalContext + 0 + + + isTerminal + + name + autoName + nonterminalContext + 0 + + + isTerminal + + name + terminalWindowName + nonterminalContext + 0 + + + isTerminal + + name + creationTimeString + nonterminalContext + 0 + + + isTerminal + + name + commandLine + nonterminalContext + 0 + + + isTerminal + + name + jobPid + nonterminalContext + 0 + + + isTerminal + + name + pid + nonterminalContext + 0 + + + 16 + + + isTerminal + + name + currentTab.currentSession.presentationName + nonterminalContext + 0 + + + isTerminal + + name + currentTab.iterm2.localhostName + nonterminalContext + 0 + + + isTerminal + + name + style + nonterminalContext + 0 + + + isTerminal + + name + frame + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.pid + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.terminalIconName + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.terminalWindowName + nonterminalContext + 0 + + + isTerminal + + name + currentTab + nonterminalContext + 2 + + + isTerminal + + name + currentTab.currentSession + nonterminalContext + 0 + + + isTerminal + + name + currentTab.window + nonterminalContext + 0 + + + isTerminal + + name + titleOverride + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.name + nonterminalContext + 0 + + + isTerminal + + name + id + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.path + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.commandLine + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.hostname + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.tty + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.username + nonterminalContext + 0 + + + isTerminal + + name + iterm2 + nonterminalContext + 4 + + + isTerminal + + name + titleOverrideFormat + nonterminalContext + 0 + + + isTerminal + + name + currentTab.currentSession.jobName + nonterminalContext + 0 + + + 2 + + + isTerminal + + name + currentSession.terminalIconName + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindowTitle + nonterminalContext + 0 + + + isTerminal + + name + currentSession.presentationName + nonterminalContext + 0 + + + isTerminal + + name + iterm2.localhostName + nonterminalContext + 0 + + + isTerminal + + name + window + nonterminalContext + 0 + + + isTerminal + + name + window + nonterminalContext + 16 + + + isTerminal + + name + currentSession.tty + nonterminalContext + 0 + + + isTerminal + + name + currentSession.jobName + nonterminalContext + 0 + + + isTerminal + + name + currentSession.name + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindowName + nonterminalContext + 0 + + + isTerminal + + name + id + nonterminalContext + 0 + + + isTerminal + + name + titleOverride + nonterminalContext + 0 + + + isTerminal + + name + currentSession.username + nonterminalContext + 0 + + + isTerminal + + name + currentSession.path + nonterminalContext + 0 + + + isTerminal + + name + iterm2 + nonterminalContext + 4 + + + isTerminal + + name + titleOverrideFormat + nonterminalContext + 0 + + + isTerminal + + name + currentSession.hostname + nonterminalContext + 0 + + + isTerminal + + name + currentSession.terminalWindowName + nonterminalContext + 0 + + + isTerminal + + name + currentSession.pid + nonterminalContext + 0 + + + isTerminal + + name + tmuxWindow + nonterminalContext + 0 + + + isTerminal + + name + currentSession + nonterminalContext + 1 + + + isTerminal + + name + currentSession + nonterminalContext + 0 + + + 4 + + + isTerminal + + name + pid + nonterminalContext + 0 + + + isTerminal + + name + localhostName + nonterminalContext + 0 + + + isTerminal + + name + effectiveTheme + nonterminalContext + 0 + + + + NoSyncSearchHistory + + maste + master + branch + theme_dir + work + GIT_WORK_TREE + repo_dir + deploy + $deploy + NoSyncSuppressAnnyoingBellOffer NoSyncTimeOfFirstLaunchOfVersionWithTip @@ -2093,6 +2831,8 @@ PasteFromClipboard + PasteTabToStringTabStopSize + 4 PointerActions Button,1,1,, @@ -2145,11 +2885,13 @@ SUFeedAlternateAppNameKey iTerm SUFeedURL - https://iterm2.com/appcasts/testing.xml?shard=49 + https://iterm2.com/appcasts/testing_new.xml?shard=49 SUHasLaunchedBefore SULastCheckTime - 2017-11-27T19:23:04Z + 2019-08-05T14:40:33Z + SUUpdateRelaunchingMarker + SavePasteHistory Secure Input @@ -2162,6 +2904,8 @@ SmartPlacement + SoundForEsc + SplitPaneDimmingAmount 0.15314754155965957 SwitchTabModifier @@ -2186,6 +2930,8 @@ UseLionStyleFullscreen + VisualIndicatorForEsc + WebKitDefaultFontSize 11 WebKitStandardFont @@ -2198,10 +2944,12 @@ /-+\~_. findIgnoreCase_iTerm + findMode_iTerm + 0 findRegex_iTerm iTerm Version - 3.1.5 + 3.3.0beta16 kCPKSelectionViewPreferredModeKey 0 kCPKSelectionViewShowHSBTextFieldsKey diff --git a/profile/profile b/profile/profile index c8f62b3..6251703 100644 --- a/profile/profile +++ b/profile/profile @@ -1,3 +1,4 @@ +export DOKKU_HOST="e12m-dokku" export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm