diff --git a/Brewfile b/Brewfile index d508a59..a1c5000 100644 --- a/Brewfile +++ b/Brewfile @@ -2,6 +2,7 @@ # Taps # ############################### +tap "AdoptOpenJDK/openjdk" tap "appveyor/brew" tap "aws/tap" tap "caskroom/cask" @@ -20,13 +21,13 @@ tap "homebrew/cask-versions" tap "homebrew/core" tap "homebrew/services" tap "homebrew/test-bot" -tap "jakejarvis/brew", "git@github.com:jakejarvis/homebrew-brew.git" +# tap "jakejarvis/brew", "git@github.com:jakejarvis/homebrew-brew.git" tap "mongodb/brew" tap "sass/sass" tap "teamookla/speedtest" tap "thoughtbot/formulae" tap "twilio/brew" -tap "wpengine/wpe-cli" +# tap "wpengine/wpe-cli" ############################### # Binaries # @@ -118,7 +119,6 @@ brew "elixir" brew "erlang" brew "facebook/fb/fbsimctl", args: ["HEAD"] brew "geoip" -brew "gitlab-runner" brew "go" brew "goreleaser/tap/goreleaser" brew "govendor" @@ -189,7 +189,7 @@ brew "whois" brew "wireguard-tools" brew "wireguard-go" brew "wp-cli" -brew "wpengine/wpe-cli/wpe-cli" +# brew "wpengine/wpe-cli/wpe-cli" brew "xz" brew "yarn" brew "youtube-dl" @@ -254,25 +254,30 @@ cask "etrecheckpro" cask "filebot" cask "geekbench" cask "intel-power-gadget" +cask "istat-menus" cask "paragon-ntfs" cask "the-unarchiver" cask "transmission" cask "unetbootin" +cask "unshaky" cask "vnc-viewer" # Passwords, VPNs, other Security cask "1password" cask "authy" cask "expressvpn" +cask "gpg-suite" # cask "gpg-suite-no-mail" # Install Mail separately: https://github.com/GpgMailNoActivation/GpgMailNoActivation -cask "jakejarvis/brew/gpg-suite-no-drm" # personal cask to install GPG suite and mail.app plugin without activation +# cask "jakejarvis/brew/gpg-suite-no-drm" # personal cask to install GPG suite and mail.app plugin without activation cask "keybase" cask "little-snitch" cask "nordvpn" cask "tor-browser" cask "tunnelblick" -# Development +# Development/Work +cask "adobe-creative-cloud" +cask "adoptopenjdk" cask "chromedriver" cask "eclipse-java" cask "filezilla" @@ -281,14 +286,17 @@ cask "glyphs" cask "google-cloud-sdk" cask "imageoptim" cask "iterm2" -cask "java8" +# cask "java8" cask "jetbrains-toolbox" +cask "mamp" +cask "microsoft-office" cask "multipass" cask "ngrok" cask "postman" cask "powershell" cask "robo-3t" cask "sequel-pro" +cask "sketch" cask "tower" cask "transmit" cask "visual-studio-code" @@ -321,6 +329,7 @@ cask "zoomus" # Gaming cask "shadow" cask "steam" +cask "minecraft" cask "nvidia-geforce-now" # Pentesting diff --git a/LICENSE.md b/LICENSE.md index 129cdf9..369b968 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Jake Jarvis +Copyright (c) 2019-present Jake Jarvis Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/firefox/user.js b/firefox/user.js index bcff1e2..ce6d0dc 100644 --- a/firefox/user.js +++ b/firefox/user.js @@ -269,8 +269,8 @@ user_pref("privacy.cpd.passwords", true); // user_pref("privacy.cpd.siteSettings", true); user_pref("privacy.cpd.sessions", true); user_pref("privacy.donottrackheader.enabled", true); -// user_pref("privacy.firstparty.isolate", true); // breaks CAPTCHAs, way too annoying -// user_pref("privacy.resistFingerprinting", true); // less breakage by using https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/ +// user_pref("privacy.firstparty.isolate", true); // breaks CAPTCHAs, way too annoying +// user_pref("privacy.resistFingerprinting", true); // less breakage by using https://addons.mozilla.org/en-US/firefox/addon/canvasblocker/ user_pref("privacy.trackingprotection.cryptomining.enabled", true); user_pref("privacy.trackingprotection.enabled", true); // https://wiki.mozilla.org/Security/Tracking_protection user_pref("privacy.trackingprotection.fingerprinting.enabled", true); @@ -292,10 +292,10 @@ user_pref("security.insecure_connection_icon.enabled", true); user_pref("security.insecure_connection_text.enabled", true); user_pref("security.insecure_field_warning.contextual.enabled", true); user_pref("security.insecure_password.ui.enabled", true); // warn on non-secure forms -// user_pref("security.mixed_content.block_display_content", true); // breaks xfinity on demand -// user_pref("security.mixed_content.block_object_subrequest", true); // breaks xfinity on demand +// user_pref("security.mixed_content.block_display_content", true); // breaks xfinity on demand +// user_pref("security.mixed_content.block_object_subrequest", true); // breaks xfinity on demand user_pref("security.OCSP.enabled", 1); -user_pref("security.OCSP.require", false); // TODO: turn back on +user_pref("security.OCSP.require", false); // TODO: turn back on user_pref("security.pki.sha1_enforcement_level", 1); user_pref("security.sri.enable", true); user_pref("security.ssl.disable_session_identifiers", true); @@ -304,7 +304,7 @@ user_pref("security.ssl.enable_ocsp_must_staple", true); user_pref("security.ssl.errorReporting.enabled", false); user_pref("security.ssl.errorReporting.url", ""); user_pref("security.ssl.treat_unsafe_negotiation_as_broken", true); -// user_pref("security.ssl.require_safe_negotiation", true); // still breaks lots of stuff: https://github.com/pyllyukko/user.js/issues/237 +// user_pref("security.ssl.require_safe_negotiation", true); // still breaks lots of stuff: https://github.com/pyllyukko/user.js/issues/237 user_pref("security.ssl3.dhe_dss_aes_128_sha", false); user_pref("security.ssl3.dhe_dss_aes_256_sha", false); user_pref("security.ssl3.dhe_dss_camellia_128_sha", false); diff --git a/vscode/extensions.json b/vscode/extensions.json index 4407dd3..f80adeb 100644 --- a/vscode/extensions.json +++ b/vscode/extensions.json @@ -7,7 +7,7 @@ }, "name": "aws-toolkit-vscode", "publisher": "amazonwebservices", - "version": "1.9.0" + "version": "1.11.0" }, { "metadata": { @@ -47,7 +47,7 @@ }, "name": "cpptools", "publisher": "ms-vscode", - "version": "0.28.0" + "version": "0.29.0" }, { "metadata": { @@ -57,7 +57,7 @@ }, "name": "debugger-for-chrome", "publisher": "msjsdiag", - "version": "4.12.6" + "version": "4.12.9" }, { "metadata": { @@ -67,7 +67,7 @@ }, "name": "EditorConfig", "publisher": "EditorConfig", - "version": "0.14.5" + "version": "0.15.1" }, { "metadata": { @@ -77,17 +77,17 @@ }, "name": "github-vscode-theme", "publisher": "GitHub", - "version": "1.0.0" + "version": "1.1.3" }, { "metadata": { "id": "d6f6cfea-4b6f-41f4-b571-6ad2ab7918da", - "publisherId": "ms-vscode.Go", - "publisherDisplayName": "ms-vscode" + "publisherId": "golang.go", + "publisherDisplayName": "golang" }, - "name": "Go", - "publisher": "ms-vscode", - "version": "0.14.1" + "name": "go", + "publisher": "golang", + "version": "0.15.2" }, { "metadata": { @@ -107,7 +107,7 @@ }, "name": "material-icon-theme", "publisher": "PKief", - "version": "4.1.0" + "version": "4.2.0" }, { "metadata": { @@ -117,7 +117,7 @@ }, "name": "prettier-vscode", "publisher": "esbenp", - "version": "4.6.0" + "version": "5.1.3" }, { "metadata": { @@ -127,7 +127,7 @@ }, "name": "python", "publisher": "ms-python", - "version": "2020.5.78807" + "version": "2020.7.96456" }, { "metadata": { @@ -137,7 +137,7 @@ }, "name": "remote-containers", "publisher": "ms-vscode-remote", - "version": "0.117.0" + "version": "0.128.0" }, { "metadata": { @@ -167,7 +167,7 @@ }, "name": "remote-wsl", "publisher": "ms-vscode-remote", - "version": "0.44.2" + "version": "0.44.4" }, { "metadata": { @@ -179,6 +179,16 @@ "publisher": "smlombardi", "version": "3.2.1" }, + { + "metadata": { + "id": "56d1e1f8-892a-4abc-b402-c473b832e324", + "publisherId": "GitHub.vscode-codeql", + "publisherDisplayName": "GitHub" + }, + "name": "vscode-codeql", + "publisher": "GitHub", + "version": "1.3.1" + }, { "metadata": { "id": "0479fc1c-3d67-49f9-b087-fb9069afe48f", @@ -187,7 +197,7 @@ }, "name": "vscode-docker", "publisher": "ms-azuretools", - "version": "1.2.0" + "version": "1.4.1" }, { "metadata": { @@ -207,7 +217,7 @@ }, "name": "vscode-eslint", "publisher": "dbaeumer", - "version": "2.1.5" + "version": "2.1.8" }, { "metadata": { @@ -217,7 +227,7 @@ }, "name": "vscode-firefox-debug", "publisher": "firefox-devtools", - "version": "2.8.0" + "version": "2.9.0" }, { "metadata": { @@ -227,7 +237,7 @@ }, "name": "vscode-icons", "publisher": "vscode-icons-team", - "version": "10.1.1" + "version": "10.2.0" }, { "metadata": { @@ -237,7 +247,7 @@ }, "name": "vscode-pull-request-github", "publisher": "GitHub", - "version": "0.16.0" + "version": "0.18.0" }, { "metadata": { @@ -251,13 +261,23 @@ }, { "metadata": { - "id": "876e8f93-74d0-4f4f-91b7-34a09f19f444", - "publisherId": "VisualStudioExptTeam.vscodeintellicode", - "publisherDisplayName": "VisualStudioExptTeam" + "id": "ec35b5a3-9802-4c68-b5ff-e85f19ec0977", + "publisherId": "stylelint.vscode-stylelint", + "publisherDisplayName": "stylelint" }, - "name": "vscodeintellicode", - "publisher": "VisualStudioExptTeam", - "version": "1.2.7" + "name": "vscode-stylelint", + "publisher": "stylelint", + "version": "0.84.0" + }, + { + "metadata": { + "id": "ff96f1b4-a4b8-45ef-8ecf-c232c0cb75c8", + "publisherId": "hbenl.vscode-test-explorer", + "publisherDisplayName": "hbenl" + }, + "name": "vscode-test-explorer", + "publisher": "hbenl", + "version": "2.19.1" }, { "metadata": { @@ -267,6 +287,16 @@ }, "name": "vsliveshare", "publisher": "ms-vsliveshare", - "version": "1.0.2106" + "version": "1.0.2478" + }, + { + "metadata": { + "id": "03bcac69-2a42-4fd3-ac6e-928090766003", + "publisherId": "ms-vscode.wordcount", + "publisherDisplayName": "ms-vscode" + }, + "name": "wordcount", + "publisher": "ms-vscode", + "version": "0.1.0" } ] \ No newline at end of file diff --git a/vscode/keybindingsMac.json b/vscode/keybindingsMac.json index d5938c6..b8eb33f 100644 --- a/vscode/keybindingsMac.json +++ b/vscode/keybindingsMac.json @@ -1,5 +1,6 @@ // Place your key bindings in this file to overwrite the defaults [ - { "key": "ctrl+tab", "command": "workbench.action.nextEditor" }, - { "key": "ctrl+shift+tab", "command": "workbench.action.previousEditor" } -] + +{ "key": "ctrl+tab", "command": "workbench.action.nextEditor" }, +{ "key": "ctrl+shift+tab", "command": "workbench.action.previousEditor" } +] \ No newline at end of file diff --git a/vscode/settings.json b/vscode/settings.json index 1200f40..6e0fdf5 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -2,7 +2,6 @@ { "editor.fontFamily": "Source Code Pro, Menlo, Monaco, 'Courier New', monospace", "editor.fontSize": 14, - "editor.cursorStyle": "line", "sync.gist": "80a04530e0142ff5b7b77c92d5c6f526", "sync.autoDownload": false, "sync.autoUpload": false, @@ -19,7 +18,6 @@ "workbench.enableExperiments": false, "workbench.quickOpen.preserveInput": true, "workbench.startupEditor": "none", - "breadcrumbs.enabled": false, "workbench.editor.openPositioning": "last", "workbench.settings.enableNaturalLanguageSearch": false, "terminal.external.osxExec": "iTerm.app", @@ -31,7 +29,7 @@ "css.lint.zeroUnits": "warning", "git.enableCommitSigning": true, "git.showPushSuccessNotification": true, - "workbench.iconTheme": "vscode-icons", + "workbench.iconTheme": "material-icon-theme", "liveshare.featureSet": "insiders", "aws.profile": "profile:default", "sync.forceUpload": true, @@ -49,9 +47,8 @@ "workbench.colorTheme": "GitHub Dark", "aws.samcli.location": "/usr/local/bin/sam", "git.autofetch": true, - "editor.acceptSuggestionOnEnter": "off", + "editor.acceptSuggestionOnEnter": "smart", "workbench.tips.enabled": false, - "workbench.editor.tabSizing": "shrink", "explorer.confirmDragAndDrop": false, "extensions.ignoreRecommendations": true, "extensions.showRecommendationsOnlyOnDemand": true, @@ -73,7 +70,6 @@ "terminal.integrated.cursorStyle": "line", "terminal.integrated.cursorBlinking": true, "prettier.requireConfig": true, - "eslint.alwaysShowStatus": true, "aws.telemetry": false, "git.allowForcePush": true, "git.defaultCloneDirectory": "~/source", @@ -85,7 +81,25 @@ "material-icon-theme.showWelcomeMessage": false, "prettier.configPath": ".prettierrc", "dotfiles.repository": "https://github.com/jakejarvis/dotfiles.git", - "scss.lint.duplicateProperties": "warning", - "scss.lint.compatibleVendorPrefixes": "warning", - "scss.lint.zeroUnits": "warning" + "editor.lineHeight": 23, + "markdown.preview.lineHeight": 1.75, + "css.validate": false, + "less.validate": false, + "scss.validate": false, + "java.home": "/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home", + "java.help.firstView": "gettingStarted", + "java.configuration.checkProjectSettingsExclusions": false, + "editor.tabSize": 2, + "workbench.view.alwaysShowHeaderActions": true, + "workbench.editor.highlightModifiedTabs": true, + "workbench.editor.tabSizing": "shrink", + "window.openFilesInNewWindow": "default", + "aws.cdk.explorer.enabled": false, + "git.scanRepositories": [ + "~/source" + ], + "githubIssues.useBranchForIssues": "prompt", + "material-icon-theme.folders.theme": "classic", + "scss.lint.zeroUnits": "warning", + "stylelint.reportNeedlessDisables": true }