Updates

exalted · Jan 16, 2020 · 1c51922 · 1c51922
1 parent 6cd06dc
commit 1c51922
Show file tree

Hide file tree

Showing 18 changed files with 88 additions and 36 deletions.
diff --git a/software/atom/config.cson b/software/atom/config.cson
@@ -12,7 +12,6 @@
   "command-palette":
     preserveLastSearch: true
   core:
-    automaticallyUpdate: false
     disabledPackages: [
       "deprecation-cop"
       "image-view"
@@ -30,14 +29,16 @@
       "Thumbs.db"
       "desktop.ini"
       "node_modules"
+      "package-lock.json"
     ]
     projectHome: "/Users/ali/Development"
     telemetryConsent: "limited"
   editor:
+    fontFamily: "monaco"
     fontSize: 19
+    lineHeight: 1.7
     scrollPastEnd: true
     showIndentGuide: true
-    showInvisibles: true
   "exception-reporting":
     userId: "356841a2-c458-4982-b7b8-e162248d00d2"
   "find-and-replace":
@@ -49,9 +50,11 @@
   github:
     viewChangesForCurrentFileDiffPaneSplitDirection: "right"
   "highlight-selected":
+    hideHighlightOnSelectedWord: true
     highlightBackground: true
     lightTheme: true
-    minimumLength: 1
+    onlyHighlightWholeWords: false
+    showResultsOnScrollBar: true
   "indentation-indicator":
     spaceAfterColon: true
   "language-babel":
@@ -60,7 +63,14 @@
     panelHeight: 357
   "markdown-preview":
     useGitHubStyle: true
-  "one-dark-ui": {}
+  "one-dark-ui":
+    fontSize: 14
+  termination:
+    style: {}
+    toggles:
+      cloneTerminalPlus: false
+      cursorBlink: false
+      selectToCopy: false
   "tree-view":
     hideIgnoredNames: true
   welcome:

diff --git a/software/atom/packages.autogenerated b/software/atom/packages.autogenerated
@@ -12,10 +12,12 @@ ide-json
 ide-typescript
 intentions
 language-babel
+language-diff
 language-docker
 linter-eslint
 linter-ui-default
 multi-cursor
+open-in-sourcetree
 sort-lines
 teletype
 toggle-quotes
diff --git a/software/bash/aliases.bashrc b/software/bash/aliases.bashrc
@@ -5,6 +5,13 @@
 alias cd..='cd ..'
 
 
+##
+## Improvements ................................................................
+##
+
+alias cd='hash -r && cd'
+
+
 ##
 ## Handy aliases ...............................................................
 ##

diff --git a/software/bash/commands.bashrc b/software/bash/commands.bashrc
@@ -60,20 +60,16 @@ reset-open-with() {
   /System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user
 }
 
-alias balsamiq-agenda='open /Users/ali/Library/Mobile\ Documents/74ZAFF46HB~jp~informationarchitects~Writer/Documents/Balsamiq\ Agenda/0-Current.md -a /Applications/iA\ Writer\ Classic.app/'
-alias balsamiq-acetaia='browse "https://acetaia.balsamiq.com/#/u31-ali"'
-alias balsamiq-wiki='browse "https://balsamiq.atlassian.net/wiki/my/saved-for-later"'
+alias dns-flush='sudo killall -HUP mDNSResponder'
 
 alias balsamiq-ssh-jenkins-master='ssh ubuntu@ec2-46-137-119-50.eu-west-1.compute.amazonaws.com'
 
-alias balsamiq-db-acetaia-production='convox resources proxy acetaia-mysql --port 3319'
-alias balsamiq-db-bottega-production='convox resources proxy bottega-mysql --port 3329'
-alias balsamiq-db-swag-production='convox resources proxy swag-mysql --port 3339'
+alias balsamiq-db-acetaia-production='convox rack resources proxy acetaia-mysql --port 3319'
+alias balsamiq-db-bottega-production='convox rack resources proxy bottega-mysql --port 3329'
+alias balsamiq-db-swag-production='convox rack resources proxy swag-mysql --port 3339'
+
+alias balsamiq-ci-b.com='browse "https://jenkins.balsamiq.com/job/balsamiq.com/"'
 
 alias balsamiq-ci-acetaia='browse https://jenkins.balsamiq.com/job/Internal_Tools/job/acetaia-production/'
 alias balsamiq-ci-bottega='browse https://jenkins.balsamiq.com/job/Internal_Tools/job/bottega-production/'
 alias balsamiq-ci-swag='browse https://jenkins.balsamiq.com/job/Internal_Tools/job/swag-production/'
-
-alias balsamiq-ci-b.com='browse "https://jenkins.balsamiq.com/job/balsamiq.com/"'
-
-alias dns-flush='sudo killall -HUP mDNSResponder'
diff --git a/software/bash/paths.bashrc b/software/bash/paths.bashrc
@@ -14,4 +14,4 @@ export PATH="$PATH:/Users/ali/Development/dotfiles/software/bash/bin"
 ##
 
 # TODO: remove hard-coded path
-CDPATH=".:$HOME:/Users/ali/Development:/Users/ali/Development/balsamiq"
+CDPATH=".:$HOME:/Users/ali/Development:/Users/ali/Development/balsamiq:/Users/ali/Development/_downloads"
diff --git a/software/bash/prompt.bashrc b/software/bash/prompt.bashrc
@@ -1,3 +1,6 @@
+# (Ref.: https://support.apple.com/en-us/HT208050)
+export BASH_SILENCE_DEPRECATION_WARNING=1
+
 # original: `export PS1="\h:\W \u\$ "`
 # TODO: consider moving `__git_ps1` to `PROMPT_COMMAND`, because;
 #         1. it's slightly faster,

diff --git a/software/finicky/finicky.js b/software/finicky/finicky.js
@@ -20,7 +20,7 @@ module.exports = {
         return zoomLinkFromGCal.test(urlString);
       },
       url: ({ urlString }) => {
-        const matches = urlString.match(zoomLinkFromGCal);
+        const matches = zoomLinkFromGCal.exec(urlString);
 
         return {
           protocol: 'https',
@@ -32,15 +32,15 @@ module.exports = {
   ],
   handlers: [
     {
-      match: finicky.matchDomains([ 'localhost' ]),
+      match: finicky.matchDomains([ 'localhost', /\.convox$/ ]),
       browser: 'Google Chrome'
     },
     {
       match: finicky.matchDomains([ /(.+\.)?pivotaltracker\.com/ ]),
       browser: 'Pivotal Tracker'
     },
     {
-      match: finicky.matchDomains([ /(plus|hangouts|meet)\.google\.com/ ]),
+      match: finicky.matchDomains([ /(chrome|plus|hangouts|meet)\.google\.com/ ]),
       browser: 'Google Chrome'
     },
     {

diff --git a/software/git/bin/git-merge b/software/git/bin/git-merge
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+trap "echo 'error: Script failed: see failed command above'" ERR
+
+if [[ "$@" = "--abort" ]]; then
+  # case: `fatal: --abort expects no arguments`
+  $GIT merge --abort
+else
+  $GIT merge --no-edit "$@"
+fi
diff --git a/software/git/bin/git-wrapper b/software/git/bin/git-wrapper
@@ -13,6 +13,9 @@ case "${1:-}" in
   "add" )
     "${__dir__}"/git-add "${@:2}"
     ;;
+  "merge" )
+    "${__dir__}"/git-merge "${@:2}"
+    ;;
   "remote" )
     "${__dir__}"/git-remote "${@:2}"
     ;;

diff --git a/software/git/config b/software/git/config
@@ -60,12 +60,12 @@
 [log]
 	decorate = short
 [difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 	path = 
 [difftool "Kaleidoscope"]
 	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"
 	trustExitCode = true
 [mergetool "Kaleidoscope"]
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" \"$REMOTE\"

diff --git a/software/keka.rb b/software/keka.rb
@@ -0,0 +1,5 @@
+#!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby
+require_relative '../src/helpers'
+
+cask 'keka'
+cask 'kekadefaultapp'
diff --git a/software/torbrowser.rb → software/logitech-options.rb b/software/torbrowser.rb → software/logitech-options.rb
@@ -1,4 +1,4 @@
 #!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby
 require_relative '../src/helpers'
 
-cask 'torbrowser'
+cask 'logitech-options'
diff --git a/software/mosaic/MosaicCoreData.storedata b/software/mosaic/MosaicCoreData.storedata
@@ -5,12 +5,12 @@
     <databaseInfo>
         <version>134481920</version>
         <UUID>2C0DF9CF-16F0-4A42-9E2A-96195F31D5AC</UUID>
-        <nextObjectID>149</nextObjectID>
+        <nextObjectID>150</nextObjectID>
         <metadata>
             <plist version="1.0">
                 <dict>
                     <key>NSPersistenceFrameworkVersion</key>
-                    <integer>866</integer>
+                    <integer>973</integer>
                     <key>NSStoreModelVersionHashes</key>
                     <dict>
                         <key>ApplicationLayout</key>
@@ -58,6 +58,8 @@
 		PLSUnmW9KLwvdqGwig6M22jNuZXaWVAnD+uxEz8uqFM=
 		</data>
                     </dict>
+                    <key>NSStoreModelVersionHashesDigest</key>
+                    <string>BYg1sXiy6NEly6Tp4yhoqHNHPVy7Znkxd1dJTgbrW3qFTFvvaqJR/M2kJ+NtKDVfoZtpVwBDbjkMYy1bz+9Sew==</string>
                     <key>NSStoreModelVersionHashesVersion</key>
                     <integer>3</integer>
                     <key>NSStoreModelVersionIdentifiers</key>
@@ -320,8 +322,8 @@
         <attribute name="notificationbody" type="string">Thank you for installing Mosaic. If you would like help getting started with Mosaic, or have any questions regarding the app you can take a look at our help centre at any time. We hope you enjoy Mosaic.</attribute>
     </object>
     <object type="PREFERENCES" id="z128">
-        <attribute name="touchbarshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGJSZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoKsH
-CBcYGRobHB0eH1UkbnVsbNMJCgsMERZXTlMua2V5c1pOUy5vYmplY3RzViRjbGFzc6QNDg8QgAKAA4AEgAWkEhMUFYAGgAeACIAJgApfEBtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnNaY2hhcmFjdGVyc1drZXlDb2RlXW1vZGlmaWVyRmxhZ3NRVFZcVTAwY2EQERIAGgAA0iAhIiNaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiIiRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRJyhUcm9vdIABAAgAEQAaACMALQAyADcAQwBJAFAAWABjAGoAbwBxAHMAdQB3AHwAfgCAAIIAhACGAKQArwC3AMUAxwDOANAA1QDaAOUA7gD7AP4BBwEZARwBIQAAAAAAAAIBAAAAAAAAACkAAAAAAAAAAAAAAAAAAAEj
+        <attribute name="touchbarshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8Q
+D05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGrCwwbHB0eHyAhIiNVJG51bGzTDQ4PEBUaV05TLmtleXNaTlMub2JqZWN0c1YkY2xhc3OkERITFIACgAOABIAFpBYXGBmABoAHgAiACYAKXxAbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzWmNoYXJhY3RlcnNXa2V5Q29kZV1tb2RpZmllckZsYWdzUVRWXFUwMGNhEBESABoAANIkJSYnWiRjbGFzc25hbWVYJGNsYXNzZXNcTlNEaWN0aW9uYXJ5oiYoWE5TT2JqZWN0AAgAEQAaACQAKQAyADcASQBMAFEAUwBfAGUAbAB0AH8AhgCLAI0AjwCRAJMAmACaAJwAngCgAKIAwADLANMA4QDjAOoA7ADxAPYBAQEKARcBGgAAAAAAAAIBAAAAAAAAACkAAAAAAAAAAAAAAAAAAAEj
 </attribute>
         <attribute name="touchbarenabled" type="bool">1</attribute>
         <attribute name="showquickpositions" type="bool">1</attribute>
@@ -336,13 +338,13 @@ CBcYGRobHB0eH1UkbnVsbNMJCgsMERZXTlMua2V5c1pOUy5vYmplY3RzViRjbGFzc6QNDg8QgAKAA4AE
         <attribute name="remoteappgridresolutiony" type="int16">6</attribute>
         <attribute name="remoteappgridresolutionx" type="int16">6</attribute>
         <attribute name="remoteappgridmaintainaspectratio" type="bool">1</attribute>
-        <attribute name="quicklayoutshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGJSZYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoKsH
-CBcYGRobHB0eH1UkbnVsbNMJCgsMERZXTlMua2V5c1pOUy5vYmplY3RzViRjbGFzc6QNDg8QgAKAA4AEgAWkEhMUFYAGgAeACIAJgApfEBtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnNaY2hhcmFjdGVyc1drZXlDb2RlXW1vZGlmaWVyRmxhZ3NRTFZcVTAwZDIQJRIAGgAA0iAhIiNaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiIiRYTlNPYmplY3RfEA9OU0tleWVkQXJjaGl2ZXLRJyhUcm9vdIABAAgAEQAaACMALQAyADcAQwBJAFAAWABjAGoAbwBxAHMAdQB3AHwAfgCAAIIAhACGAKQArwC3AMUAxwDOANAA1QDaAOUA7gD7AP4BBwEZARwBIQAAAAAAAAIBAAAAAAAAACkAAAAAAAAAAAAAAAAAAAEj
+        <attribute name="quicklayoutshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8Q
+D05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGrCwwbHB0eHyAhIiNVJG51bGzTDQ4PEBUaV05TLmtleXNaTlMub2JqZWN0c1YkY2xhc3OkERITFIACgAOABIAFpBYXGBmABoAHgAiACYAKXxAbY2hhcmFjdGVyc0lnbm9yaW5nTW9kaWZpZXJzWmNoYXJhY3RlcnNXa2V5Q29kZV1tb2RpZmllckZsYWdzUUxWXFUwMGQyECUSABoAANIkJSYnWiRjbGFzc25hbWVYJGNsYXNzZXNcTlNEaWN0aW9uYXJ5oiYoWE5TT2JqZWN0AAgAEQAaACQAKQAyADcASQBMAFEAUwBfAGUAbAB0AH8AhgCLAI0AjwCRAJMAmACaAJwAngCgAKIAwADLANMA4QDjAOoA7ADxAPYBAQEKARcBGgAAAAAAAAIBAAAAAAAAACkAAAAAAAAAAAAAAAAAAAEj
 </attribute>
         <attribute name="quicklayoutgridresolutiony" type="int16">8</attribute>
         <attribute name="quicklayoutgridresolutionx" type="int16">8</attribute>
         <attribute name="quicklayoutgridmaintainaspectratio" type="bool">1</attribute>
-        <attribute name="preferencestab" type="int16">0</attribute>
+        <attribute name="preferencestab" type="int16">7</attribute>
         <attribute name="positioningextraguttermode" type="string">Pixel Value</attribute>
         <attribute name="positioningextragutterexternal" type="int16">20</attribute>
         <attribute name="positioningextragutterdefault" type="bool">1</attribute>
@@ -708,8 +710,8 @@ CBcYGRobHB0eVSRudWxs0wkKCwwRFldOUy5rZXlzWk5TLm9iamVjdHNWJGNsYXNzpA0ODxCAAoADgASA
         <attribute name="gridmaintainaspectratio" type="bool">1</attribute>
         <attribute name="endy" type="int16">8</attribute>
         <attribute name="endx" type="int16">8</attribute>
-        <attribute name="layoutshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGJCVYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoKoH
-CBcYGRobHB0eVSRudWxs0wkKCwwRFldOUy5rZXlzWk5TLm9iamVjdHNWJGNsYXNzpA0ODxCAAoADgASABaQSEhQVgAaABoAHgAiACV8QG2NoYXJhY3RlcnNJZ25vcmluZ01vZGlmaWVyc1pjaGFyYWN0ZXJzV2tleUNvZGVdbW9kaWZpZXJGbGFnc2H3AxB8EgAMAADSHyAhIlokY2xhc3NuYW1lWCRjbGFzc2VzXE5TRGljdGlvbmFyeaIhI1hOU09iamVjdF8QD05TS2V5ZWRBcmNoaXZlctEmJ1Ryb290gAEACAARABoAIwAtADIANwBCAEgATwBXAGIAaQBuAHAAcgB0AHYAewB9AH8AgQCDAIUAowCuALYAxADHAMkAzgDTAN4A5wD0APcBAAESARUBGgAAAAAAAAIBAAAAAAAAACgAAAAAAAAAAAAAAAAAAAEc
+        <attribute name="layoutshortcut" type="binary">YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8Q
+D05TS2V5ZWRBcmNoaXZlctEICVRyb290gAGqCwwbHB0eHyAhIlUkbnVsbNMNDg8QFRpXTlMua2V5c1pOUy5vYmplY3RzViRjbGFzc6QREhMUgAKAA4AEgAWkFhYYGYAGgAaAB4AIgAlfEBtjaGFyYWN0ZXJzSWdub3JpbmdNb2RpZmllcnNaY2hhcmFjdGVyc1drZXlDb2RlXW1vZGlmaWVyRmxhZ3Nh9wMQfBIADAAA0iMkJSZaJGNsYXNzbmFtZVgkY2xhc3Nlc1xOU0RpY3Rpb25hcnmiJSdYTlNPYmplY3QACAARABoAJAApADIANwBJAEwAUQBTAF4AZABrAHMAfgCFAIoAjACOAJAAkgCXAJkAmwCdAJ8AoQC/AMoA0gDgAOMA5QDqAO8A+gEDARABEwAAAAAAAAIBAAAAAAAAACgAAAAAAAAAAAAAAAAAAAEc
 </attribute>
         <attribute name="layoutpositionindex" type="int16">1</attribute>
         <attribute name="layoutname" type="string">Right</attribute>
@@ -794,4 +796,15 @@ CBcYGRobHB0eVSRudWxs0wkKCwwRFldOUy5rZXlzWk5TLm9iamVjdHNWJGNsYXNzpA0ODxCAAoADgASA
         <relationship name="gutters" type="0/1" destination="GUTTERS" idrefs="z115"></relationship>
         <relationship name="membership" type="0/0" destination="WINDOWLAYOUTGROUPMEMBERSHIP"></relationship>
     </object>
+    <object type="NOTIFICATION" id="z150">
+        <attribute name="notificationread" type="bool">1</attribute>
+        <attribute name="notificationmessage" type="string">Catalina Compatibility</attribute>
+        <attribute name="notificationindex" type="int32">5</attribute>
+        <attribute name="notificationimageurl" type="string"></attribute>
+        <attribute name="notificationicon" type="string">info</attribute>
+        <attribute name="notificationdate" type="date">592584049.46204698085784912109</attribute>
+        <attribute name="notificationbuttonurl" type="string">https://lightpillar.com/mosaic-catalina.html</attribute>
+        <attribute name="notificationbuttontitle" type="string">More Info</attribute>
+        <attribute name="notificationbody" type="string">Mosaic is compatible with macOS Catalina, however due to changes in Catalina you may need to provide an additional permision. Click More Info for details on how to resolve this issue.</attribute>
+    </object>
 </database>
diff --git a/software/node/bashrc b/software/node/bashrc
@@ -1,4 +1,2 @@
-export PATH="/usr/local/opt/node@8/bin:$PATH"
-
 # make sure this comes after all the others, so that local binaries win
 export PATH="./node_modules/.bin:$PATH"
diff --git a/software/node/node.rb b/software/node/node.rb
@@ -1,6 +1,11 @@
 #!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby
 require_relative '../../src/helpers'
 
+brew 'node'
 brew 'node@8'
+brew 'node@10'
+brew 'node@12'
+
+link_to_home_relative 'npmrc', '.npmrc'
 
 bash_source_relative
diff --git a/software/node/npmrc b/software/node/npmrc
@@ -0,0 +1 @@
+audit=false
diff --git a/software/the-unarchiver.rb → software/tor-browser.rb b/software/the-unarchiver.rb → software/tor-browser.rb
@@ -1,4 +1,4 @@
 #!/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby
 require_relative '../src/helpers'
 
-mas '425424353'
+cask 'tor-browser'
diff --git a/src/steps/install_homebrew.rb b/src/steps/install_homebrew.rb
@@ -5,7 +5,6 @@ def install_homebrew
   # Don't attempt to install if already installed
   return if cmd_exists?('brew')
   system "/usr/bin/ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\""
-  system 'brew tap caskroom/cask'
-  system 'brew tap caskroom/versions'
-  system 'brew tap caskroom/drivers'
+  system 'brew tap homebrew/cask-versions'
+  system 'brew tap homebrew/cask-drivers'
 end