From 7ab7f843070bf42275ff365814b1dd7d20b2fed0 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Sun, 10 May 2020 20:42:33 -0400 Subject: [PATCH] updates (mainly to FF user.js) --- firefox/user.js | 293 +++++++++++++++++++---------------------- git/.gitconfig | 3 +- vscode/extensions.json | 162 ++++++++++++++++++++--- vscode/settings.json | 58 ++++++-- zsh/aliases.zsh | 21 ++- zsh/path.zsh | 13 +- 6 files changed, 353 insertions(+), 197 deletions(-) diff --git a/firefox/user.js b/firefox/user.js index 1da719c..15e9d87 100644 --- a/firefox/user.js +++ b/firefox/user.js @@ -1,35 +1,35 @@ -// user_pref("accessibility.force_disabled", 1); +// https://github.com/pyllyukko/user.js +// https://github.com/drduh/config/blob/master/firefox.user.js +// https://github.com/ghacksuserjs/ghacks-user.js + +user_pref("accessibility.force_disabled", 1); // user_pref("accessibility.typeaheadfind.flashBar", 0); - - -user_pref("app.shield.optoutstudies.enabled", false); +user_pref("app.shield.optoutstudies.enabled", false); // disable studies user_pref("app.update.enabled", true); - - +user_pref("app.feedback.baseURL", ""); +user_pref("app.normandy.api_url", ""); +user_pref("app.normandy.enabled", false); +user_pref("app.normandy.first_run", false); +user_pref("app.support.baseURL", ""); user_pref("beacon.enabled", false); - - user_pref("breakpad.reportURL", ""); - - user_pref("browser.aboutHomeSnippets.updateUrl", ""); - user_pref("browser.bookmarks.max_backups", 0); - user_pref("browser.casting.enabled", false); - +user_pref("browser.chrome.errorReporter.enabled", false); +user_pref("browser.chrome.errorReporter.submitUrl", ""); +user_pref("browser.contentblocking.rejecttrackers.reportBreakage.enabled", false); +user_pref("browser.contentblocking.reportBreakage.enabled", false); +user_pref("browser.contentblocking.reportBreakage.url", ""); +user_pref("browser.crashReports.unsubmittedCheck.enabled", false); user_pref("browser.ctrlTab.migrated", true); user_pref("browser.ctrlTab.recentlyUsedOrder", false); - user_pref("browser.download.manager.retention", 0); user_pref("browser.download.animateNotifications", false); user_pref("browser.download.autoHideButton", false); - user_pref("browser.fixup.alternate.enabled", false); user_pref("browser.fixup.hide_user_pass", true); - user_pref("browser.formfill.enable", false); - user_pref("browser.library.activity-stream.enabled", false); user_pref("browser.newtabpage.activity-stream.disableSnippets", true); user_pref("browser.newtabpage.activity-stream.enabled", false); @@ -46,63 +46,59 @@ user_pref("browser.newtabpage.activity-stream.section.highlights.includeVisited" user_pref("browser.newtabpage.activity-stream.showSponsored", false); user_pref("browser.newtabpage.activity-stream.telemetry", false); user_pref("browser.newtabpage.activity-stream.telemetry.ping.endpoint", ""); - +user_pref("browser.newtabpage.activity-stream.tippyTop.service.endpoint", ""); user_pref("browser.newtabpage.enhanced", false); user_pref("browser.newtab.preload", false); user_pref("browser.newtabpage.directory.ping", ""); user_pref("browser.newtabpage.directory.source", "data:text/plain,{}"); - +user_pref("browser.newtabpage.remote", false); +user_pref("browser.newtabpage.storageVersion", 1); user_pref("browser.pagethumbnails.capturing_disabled", true); user_pref("browser.ping-centre.telemetry", false); +user_pref("browser.ping-centre.production.endpoint", ""); +user_pref("browser.ping-centre.staging.endpoint", ""); user_pref("browser.preferences.defaultPerformanceSettings.enabled", false); - user_pref("browser.safebrowsing.downloads.enabled", false); user_pref("browser.safebrowsing.downloads.remote.enabled", false); user_pref("browser.safebrowsing.downloads.remote.url", ""); user_pref("browser.safebrowsing.malware.enabled", false); user_pref("browser.safebrowsing.phishing.enabled", false); - user_pref("browser.search.countryCode", "US"); user_pref("browser.search.region", "US"); user_pref("browser.search.geoSpecificDefaults", false); user_pref("browser.search.geoSpecificDefaults.url", ""); user_pref("browser.search.geoip.url", ""); user_pref("browser.search.update", false); - +user_pref("browser.search.hiddenOneOffs", "Bing,Amazon.com,eBay,Facebook,Twitter,YouTube"); // disable search providers user_pref("browser.selfsupport.url", ""); +user_pref("browser.sessionstore.privacy_level", 2); // disable session restore +user_pref("browser.sessionstore.resume_from_crash", false); user_pref("browser.send_pings", false); user_pref("browser.send_pings.require_same_host", true); user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.ssl_override_behavior", 1); - +user_pref("browser.startup.homepage_override.buildID", "20120101"); user_pref("browser.tabs.crashReporting.sendReport", false); -user_pref("browser.crashReports.unsubmittedCheck.enabled", false); - user_pref("browser.tabs.extraDragSpace", true); user_pref("browser.tabs.warnOnClose", false); - +user_pref("browser.tabs.warnOnCloseOtherTabs", false); +user_pref("browser.tabs.warnOnOpen", false); user_pref("browser.uitour.enabled", false); - +user_pref("browser.uitour.url", ""); user_pref("browser.urlbar.speculativeConnect.enabled", false); user_pref("browser.urlbar.suggest.openpage", false); user_pref("browser.urlbar.trimURLs", false); user_pref("browser.urlbar.filter.javascript", true); - - user_pref("camera.control.face_detection.enabled", false); - - +user_pref("canvas.capturestream.enabled", false); // disable canvas capture stream +user_pref("captivedetect.canonicalURL", ""); // disable captive portal helper user_pref("clipboard.autocopy", false); - - +user_pref("datareporting.healthreport.infoURL", ""); user_pref("datareporting.healthreport.service.enabled", false); +user_pref("datareporting.healthreport.service.firstRun", false); user_pref("datareporting.healthreport.uploadEnabled", false); user_pref("datareporting.policy.dataSubmissionEnabled", false); - - user_pref("device.sensors.enabled", false); - - user_pref("devtools.cache.disabled", true); user_pref("devtools.dom.enabled", true); user_pref("devtools.onboarding.telemetry.logged", false); @@ -113,24 +109,27 @@ user_pref("devtools.webide.autoinstallADBExtension", false); user_pref("devtools.webide.autoinstallADBHelper", false); user_pref("devtools.webide.autoinstallFxdtAdapters", false); user_pref("devtools.webide.enabled", false); - - // user_pref("dom.allow_cut_copy", false); user_pref("dom.battery.enabled", false); +user_pref("dom.caches.enabled", false); // disable service workers cache user_pref("dom.enable_performance", false); user_pref("dom.enable_performance_navigation_timing", false); user_pref("dom.enable_performance_observer", false); user_pref("dom.enable_resource_timing", false); // user_pref("dom.event.clipboardevents.enabled", false); user_pref("dom.event.contextmenu.enabled", false); -user_pref("dom.flyweb.enabled", false); -user_pref("dom.gamepad.enabled", false); +user_pref("dom.flyweb.enabled", false); // disable local discovery +user_pref("dom.gamepad.enabled", false); // disable USB enumeration +user_pref("dom.imagecapture.enabled", false); // disable camera image capture +user_pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false); +user_pref("dom.ipc.plugins.reportCrashURL", false); user_pref("dom.maxHardwareConcurrency", 2); user_pref("dom.mozTCPSocket.enabled", false); user_pref("dom.netinfo.enabled", false); user_pref("dom.push.connection.enabled", false); user_pref("dom.push.enabled", false); user_pref("dom.push.serverURL", ""); +user_pref("dom.push.userAgentID", ""); user_pref("dom.serviceWorkers.enabled", false); user_pref("dom.telephony.enabled", false); user_pref("dom.vibrator.enabled", false); @@ -139,133 +138,126 @@ user_pref("dom.vr.service.enabled", false); user_pref("dom.webaudio.enabled", false); user_pref("dom.webnotifications.enabled", false); user_pref("dom.webnotifications.serviceworker.enabled", false); - - +user_pref("experiments.activeExperiment", false); user_pref("experiments.enabled", false); user_pref("experiments.manifest.uri", ""); user_pref("experiments.supported", false); - - +user_pref("extensions.blocklist.enabled", true); +user_pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/"); user_pref("extensions.formautofill.addresses.enabled", false); user_pref("extensions.formautofill.available", "off"); user_pref("extensions.formautofill.creditCards.enabled", false); user_pref("extensions.formautofill.heuristics.enabled", false); - -user_pref("extensions.blocklist.enabled", true); -user_pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/"); -user_pref("services.blocklist.update_enabled", true); - user_pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); user_pref("extensions.getAddons.cache.enabled", false); - user_pref("extensions.pocket.api", ""); user_pref("extensions.pocket.enabled", false); user_pref("extensions.pocket.oAuthConsumerKey", ""); user_pref("extensions.pocket.site", ""); - user_pref("extensions.screenshots.disabled", true); user_pref("extensions.screenshots.upload-disabled", true); - +user_pref("extensions.shield-recipe-client.api_url", ""); user_pref("extensions.shield-recipe-client.enabled", false); - user_pref("extensions.ui.dictionary.hidden", true); +user_pref("extensions.ui.experiment.hidden", true); user_pref("extensions.ui.locale.hidden", true); - - +user_pref("extensions.webcompat-reporter.enabled", false); // disable web compatibility reporter +user_pref("extensions.webservice.discoverURL", ""); user_pref("findbar.highlightAll", true); user_pref("findbar.modalHighlight", true); - - user_pref("general.buildID.override", "20120101"); -user_pref("browser.startup.homepage_override.buildID", "20120101"); - - -user_pref("geo.enabled", false); +user_pref("general.warnOnAboutConfig", false); // disable about:config warning +user_pref("geo.enabled", false); // no geo-location +user_pref("geo.provider.ms-windows-location", false); // disable geo on windows +user_pref("geo.provider.use_corelocation", false); // disable geo on mac +user_pref("geo.provider.use_gpsd", false); // disable geo on linux user_pref("geo.wifi.logging.enabled", false); user_pref("geo.wifi.uri", ""); - - -user_pref("gfx.font_rendering.opentype_svg.enabled", false); - - user_pref("intl.accept_languages", "en-US, en"); -user_pref("intl.locale.matchOS", false); - - +user_pref("intl.charset.fallback.override", "utf-8"); +user_pref("intl.locale.requested", "en-US"); +user_pref("intl.regional_prefs.use_os_locales", false); // don't use OS to determine locale user_pref("javascript.options.asmjs", false); -user_pref("javascript.use_us_english_locale", true); +user_pref("javascript.options.shared_memory", false); // disable shared memory user_pref("javascript.options.wasm", false); - - +user_pref("javascript.use_us_english_locale", true); +// user_pref("keyword.enabled", false); // do not submit invalid URLs to search engine user_pref("layers.acceleration.force-enabled", true); - - -user_pref("lightweightThemes.update.enabled", false); - - -user_pref("loop.logDomains", false); - - -user_pref("media.getusermedia.screensharing.enabled", false); -user_pref("media.getusermedia.audiocapture.enabled", false); +user_pref("lightweightThemes.persisted.footerURL", false); +user_pref("lightweightThemes.persisted.headerURL", false); +user_pref("lightweightThemes.update.enabled", false); // disable themes auto updates +user_pref("loop.logDomains", false); // disable more telemetry +user_pref("mathml.disabled", true); // disable Mathematical Markup Language +user_pref("media.autoplay.default", 2); // HTML5 media - 0: allow; 1: block; 2: prompt +user_pref("media.autoplay.default", 5); +user_pref("media.block-autoplay-until-in-foreground", true); // disable auto-play in background tabs +user_pref("media.autoplay.ask-permission", true); +user_pref("media.autoplay.enabled.user-gestures-needed", true); +user_pref("media.autoplay.allow-muted", false); +user_pref("media.autoplay.block-webaudio", true); +user_pref("media.getusermedia.audiocapture.enabled", false); // disable audio capture +user_pref("media.getusermedia.browser.enabled", false); // disable WebRTC getUserMedia +user_pref("media.getusermedia.screensharing.enabled", false); // disable screen-sharing user_pref("media.gmp-gmpopenh264.enabled", false); user_pref("media.gmp-manager.url", ""); user_pref("media.navigator.enabled", false); user_pref("media.navigator.video.enabled", false); user_pref("media.ondevicechange.enabled", false); user_pref("media.peerconnection.enabled", false); -user_pref("media.peerconnection.ice.proxy_only", true); user_pref("media.peerconnection.ice.default_address_only", true); user_pref("media.peerconnection.ice.no_host", true); +user_pref("media.peerconnection.ice.proxy_only", true); +user_pref("media.peerconnection.ice.tcp", false); +user_pref("media.peerconnection.identity.enabled", false); +user_pref("media.peerconnection.identity.timeout", 1); +user_pref("media.peerconnection.turn.disable", true); +user_pref("media.peerconnection.use_document_iceservers", false); +user_pref("media.peerconnection.video.enabled", false); user_pref("media.video_stats.enabled", false); user_pref("media.webspeech.recognition.enable", false); user_pref("media.webspeech.synth.enabled", false); - - user_pref("network.allow-experiments", false); user_pref("network.captive-portal-service.enabled", false); - +user_pref("network.connectivity-service.enabled", false); // disable network connectivity checks +user_pref("network.connectivity-service.enabled", false); // don't help with captive portals user_pref("network.cookie.cookieBehavior", 4); user_pref("network.cookie.thirdparty.nonsecureSessionOnly", true); user_pref("network.cookie.thirdparty.sessionOnly", true); - +user_pref("network.dns.blockDotOnion", true); user_pref("network.dns.disablePrefetch", true); user_pref("network.dns.disablePrefetchFromHTTPS", true); -user_pref("network.dns.blockDotOnion", true); - +user_pref("network.file.disable_unc_paths", true); // disable Uniform Naming Convention paths +user_pref("network.ftp.enabled", false); // disable FTP +user_pref("network.gio.supported-protocols", ""); // disable Gvfs/GIO +user_pref("network.http.altsvc.enabled", false); // disable HTTP Alternative Services +user_pref("network.http.altsvc.oe", false); +// referrer stuff was too strict before -- broke LOTS of crap: +user_pref("network.http.sendRefererHeader", 2); user_pref("network.http.referer.XOriginPolicy", 1); -user_pref("network.http.referer.XOriginTrimmingPolicy", 1); -user_pref("network.http.referer.spoofSource", true); -user_pref("network.http.referer.trimmingPolicy", 1); - -user_pref("network.http.sendRefererHeader", 1); +user_pref("network.http.referer.XOriginTrimmingPolicy", 0); +user_pref("network.http.referer.trimmingPolicy", 0); +user_pref("network.http.referer.spoofSource", false); user_pref("network.http.speculative-parallel-limit", 0); - -user_pref("network.negotiate-auth.allow-insecure-ntlm-v1", false); -user_pref("network.stricttransportsecurity.preloadlist", true); user_pref("network.IDN_show_punycode", true); user_pref("network.manage-offline-status", false); -user_pref("network.predictor.enabled", false); +user_pref("network.negotiate-auth.allow-insecure-ntlm-v1", false); // disable NTLMv1 +user_pref("network.negotiate-auth.allow-insecure-ntlm-v1-https", false); // disable all NTLM +user_pref("network.predictor.cleaned-up", true); +user_pref("network.predictor.enable-prefetch", false); // disable prefetching +user_pref("network.predictor.enabled", false); // disable "Necko" predictive service user_pref("network.prefetch-next", false); - +user_pref("network.stricttransportsecurity.preloadlist", true); // preload HSTS +// DoH via Cloudflare: user_pref("network.trr.mode", 2); user_pref("network.trr.uri", "https://cloudflare-dns.com/dns-query"); user_pref("network.trr.custom_uri", "https://cloudflare-dns.com/dns-query"); - - user_pref("offline-apps.allow_by_default", false); - - +user_pref("pdfjs.enableWebGL", false); // user_pref("plugin.state.flash", 0); user_pref("plugin.state.java", 0); -user_pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false); -user_pref("dom.ipc.plugins.reportCrashURL", false); -user_pref("shumway.disabled", true); - - +user_pref("plugins.click_to_play", true); // require plugin activation user_pref("privacy.clearOnShutdown.offlineApps", true); user_pref("privacy.clearOnShutdown.openWindows", true); - user_pref("privacy.cpd.offlineApps", true); user_pref("privacy.cpd.cache", true); user_pref("privacy.cpd.cookies", true); @@ -276,47 +268,43 @@ user_pref("privacy.cpd.openWindows", true); 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("browser.contentblocking.rejecttrackers.reportBreakage.enabled", false); -user_pref("browser.contentblocking.reportBreakage.enabled", false); -user_pref("browser.contentblocking.reportBreakage.url", ""); -user_pref("privacy.trackingprotection.enabled", true); -user_pref("privacy.trackingprotection.pbmode.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.trackingprotection.cryptomining.enabled", true); +user_pref("privacy.trackingprotection.enabled", true); // https://wiki.mozilla.org/Security/Tracking_protection +user_pref("privacy.trackingprotection.fingerprinting.enabled", true); +user_pref("privacy.trackingprotection.introCount", 20); +user_pref("privacy.trackingprotection.ui.enabled", true); +user_pref("privacy.userContext.enabled", true); +user_pref("privacy.userContext.longPressBehavior", 2); // long-press on + tab button to open container menu +user_pref("privacy.userContext.ui.enabled", true); // enable container tabs setting +user_pref("privacy.usercontext.about_newtab_segregation.enabled", true); user_pref("reader.parse-on-load.enabled", false); - - user_pref("security.cert_pinning.enforcement_level", 2); user_pref("security.certerrors.recordEventTelemetry", false); user_pref("security.csp.enable", true); user_pref("security.csp.experimentalEnabled", true); +user_pref("security.data_uri.block_toplevel_data_uri_navigations", true); user_pref("security.dialog_enable_delay", 0); user_pref("security.fileuri.strict_origin_policy", true); 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.OCSP.enabled", 1); -user_pref("security.ssl.enable_ocsp_stapling", true); -user_pref("security.ssl.enable_ocsp_must_staple", true); user_pref("security.OCSP.require", true); - user_pref("security.pki.sha1_enforcement_level", 1); user_pref("security.sri.enable", true); user_pref("security.ssl.disable_session_identifiers", true); - +user_pref("security.ssl.enable_ocsp_stapling", true); +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.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); @@ -358,48 +346,45 @@ user_pref("security.ssl3.rsa_rc4_128_md5", false); user_pref("security.ssl3.rsa_rc4_128_sha", false); user_pref("security.ssl3.rsa_rc4_40_md5", false); user_pref("security.ssl3.rsa_seed_sha", false); - user_pref("security.tls.enable_0rtt_data", false); user_pref("security.tls.unrestricted_rc4_fallback", false); user_pref("security.tls.version.fallback-limit", 3); user_pref("security.tls.version.min", 3); - user_pref("security.xpconnect.plugin.unrestricted", false); - user_pref("security.webauth.u2f", true); - - +user_pref("services.blocklist.update_enabled", true); +user_pref("shield.savant.enabled", false); +user_pref("shumway.disabled", true); user_pref("signon.autofillForms", false); user_pref("signon.autofillForms.http", false); user_pref("signon.formlessCapture.enabled", false); user_pref("signon.rememberSignons", false); - - user_pref("startup.homepage_welcome_url", ""); - - -user_pref("toolkit.telemetry.enabled", false); user_pref("toolkit.telemetry.archive.enabled", false); user_pref("toolkit.telemetry.bhrPing.enabled", false); +user_pref("toolkit.telemetry.cachedClientID", ""); +user_pref("toolkit.telemetry.coverage.opt-out", true); // disable telemetry coverage +user_pref("toolkit.telemetry.enabled", false); // disable Mozilla telemetry user_pref("toolkit.telemetry.firstShutdownPing.enabled", false); user_pref("toolkit.telemetry.hybridContent.enabled", false); +user_pref("toolkit.telemetry.infoURL", ""); user_pref("toolkit.telemetry.newProfilePing.enabled", false); +user_pref("toolkit.telemetry.previousBuildID", ""); +user_pref("toolkit.telemetry.prompted", 2); +user_pref("toolkit.telemetry.rejected", true); user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); -user_pref("toolkit.telemetry.server", ""); -user_pref("toolkit.telemetry.server_owner", ""); +user_pref("toolkit.telemetry.server", "data:,"); user_pref("toolkit.telemetry.shutdownPingSender.enabled", false); -user_pref("toolkit.telemetry.unified", false); +user_pref("toolkit.telemetry.unified", false); // disable telemetry user_pref("toolkit.telemetry.updatePing.enabled", false); - - +user_pref("toolkit.winRegisterApplicationRestart", false); // disable session restore +user_pref("ui.use_standins_for_native_colors", true); // disable exposing system colors to canvas +user_pref("webchannel.allowObject.urlWhitelist", ""); +user_pref("webgl.disabled", true); // disable WebGL user_pref("webgl.disable-extensions", true); user_pref("webgl.disable-fail-if-major-performance-caveat", true); -user_pref("webgl.disabled", true); -user_pref("webgl.enable-debug-renderer-info", false); -user_pref("webgl.min_capability_mode", false); - -user_pref("media.autoplay.default", 1); -user_pref("media.autoplay.ask-permission", true); -user_pref("media.autoplay.enabled.user-gestures-needed", true); -user_pref("media.autoplay.allow-muted", false); -user_pref("media.autoplay.block-webaudio", true); +user_pref("webgl.dxgl.enabled", false); +user_pref("webgl.enable-debug-renderer-info", false); // do not expose graphics driver information +user_pref("webgl.enable-webgl2", false); +user_pref("webgl.min_capability_mode", true); +user_pref("xpinstall.signatures.required", true); // extensions must be signed \ No newline at end of file diff --git a/git/.gitconfig b/git/.gitconfig index 3b20e89..7655101 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -3,7 +3,7 @@ [user] email = jake@jarv.is name = Jake Jarvis - signingkey = 2B0C9CF251E69A39 + signingkey = 3BC6E5776BF379D36F6714802B0C9CF251E69A39 [gpg] program = /usr/local/MacGPG2/bin/gpg [commit] @@ -19,7 +19,6 @@ rebase = true [hub] host = github.com - host = git.jarv.is [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f diff --git a/vscode/extensions.json b/vscode/extensions.json index 113d3f2..9fa76a2 100644 --- a/vscode/extensions.json +++ b/vscode/extensions.json @@ -1,4 +1,34 @@ [ + { + "metadata": { + "id": "ac5787df-9b2d-441c-abf0-977d62bc66f0", + "publisherId": "amazonwebservices.aws-toolkit-vscode", + "publisherDisplayName": "amazonwebservices" + }, + "name": "aws-toolkit-vscode", + "publisher": "amazonwebservices", + "version": "1.9.0" + }, + { + "metadata": { + "id": "819a23e1-b6c6-41cf-9029-e653b537d996", + "publisherId": "ms-vscode.azure-account", + "publisherDisplayName": "ms-vscode" + }, + "name": "azure-account", + "publisher": "ms-vscode", + "version": "0.8.11" + }, + { + "metadata": { + "id": "464f4ac7-af65-4aa9-9907-4ba7fa419085", + "publisherId": "bungcip.better-toml", + "publisherDisplayName": "bungcip" + }, + "name": "better-toml", + "publisher": "bungcip", + "version": "0.3.2" + }, { "metadata": { "id": "e337c67b-55c2-4fef-8949-eb260e7fb7fd", @@ -7,7 +37,17 @@ }, "name": "code-settings-sync", "publisher": "Shan", - "version": "3.4.2" + "version": "3.4.3" + }, + { + "metadata": { + "id": "690b692e-e8a9-493f-b802-8089d50ac1b2", + "publisherId": "ms-vscode.cpptools", + "publisherDisplayName": "ms-vscode" + }, + "name": "cpptools", + "publisher": "ms-vscode", + "version": "0.27.1" }, { "metadata": { @@ -17,7 +57,37 @@ }, "name": "debugger-for-chrome", "publisher": "msjsdiag", - "version": "4.11.7" + "version": "4.12.6" + }, + { + "metadata": { + "id": "f60a60a6-95ba-42d4-b41c-3d24c1b89588", + "publisherId": "EditorConfig.EditorConfig", + "publisherDisplayName": "EditorConfig" + }, + "name": "EditorConfig", + "publisher": "EditorConfig", + "version": "0.14.5" + }, + { + "metadata": { + "id": "d6f6cfea-4b6f-41f4-b571-6ad2ab7918da", + "publisherId": "ms-vscode.Go", + "publisherDisplayName": "ms-vscode" + }, + "name": "Go", + "publisher": "ms-vscode", + "version": "0.14.1" + }, + { + "metadata": { + "id": "0e22bd0e-8a8d-424d-b5bd-29aaf21800eb", + "publisherId": "budparr.language-hugo-vscode", + "publisherDisplayName": "budparr" + }, + "name": "language-hugo-vscode", + "publisher": "budparr", + "version": "1.2.0" }, { "metadata": { @@ -27,7 +97,17 @@ }, "name": "material-icon-theme", "publisher": "PKief", - "version": "3.9.0" + "version": "4.1.0" + }, + { + "metadata": { + "id": "f1f59ae4-9318-4f3c-a9b5-81b2eaa5f8a5", + "publisherId": "ms-python.python", + "publisherDisplayName": "ms-python" + }, + "name": "python", + "publisher": "ms-python", + "version": "2020.4.76186" }, { "metadata": { @@ -37,7 +117,7 @@ }, "name": "remote-containers", "publisher": "ms-vscode-remote", - "version": "0.74.0" + "version": "0.117.0" }, { "metadata": { @@ -47,7 +127,7 @@ }, "name": "remote-ssh", "publisher": "ms-vscode-remote", - "version": "0.46.0" + "version": "0.51.0" }, { "metadata": { @@ -57,17 +137,7 @@ }, "name": "remote-ssh-edit", "publisher": "ms-vscode-remote", - "version": "0.46.0" - }, - { - "metadata": { - "id": "5d9b66c1-7da3-4004-8c92-2b0852ec0c9b", - "publisherId": "ms-vscode-remote.remote-ssh-explorer", - "publisherDisplayName": "ms-vscode-remote" - }, - "name": "remote-ssh-explorer", - "publisher": "ms-vscode-remote", - "version": "0.46.0" + "version": "0.51.0" }, { "metadata": { @@ -77,7 +147,7 @@ }, "name": "remote-wsl", "publisher": "ms-vscode-remote", - "version": "0.39.5" + "version": "0.44.2" }, { "metadata": { @@ -87,7 +157,7 @@ }, "name": "slime", "publisher": "smlombardi", - "version": "2.34.0" + "version": "3.2.1" }, { "metadata": { @@ -97,7 +167,37 @@ }, "name": "vscode-docker", "publisher": "ms-azuretools", - "version": "0.7.0" + "version": "1.1.0" + }, + { + "metadata": { + "id": "03944bdc-9bcb-4ac2-b9b3-fdb050dd43e4", + "publisherId": "mrmlnc.vscode-duplicate", + "publisherDisplayName": "mrmlnc" + }, + "name": "vscode-duplicate", + "publisher": "mrmlnc", + "version": "1.2.1" + }, + { + "metadata": { + "id": "c5f4d87f-a524-462c-ac01-923eb19cf3e9", + "publisherId": "firefox-devtools.vscode-firefox-debug", + "publisherDisplayName": "firefox-devtools" + }, + "name": "vscode-firefox-debug", + "publisher": "firefox-devtools", + "version": "2.8.0" + }, + { + "metadata": { + "id": "69ddd764-339a-4ecc-97c1-9c4ece58e36d", + "publisherId": "GitHub.vscode-pull-request-github", + "publisherDisplayName": "GitHub" + }, + "name": "vscode-pull-request-github", + "publisher": "GitHub", + "version": "0.16.0" }, { "metadata": { @@ -107,6 +207,26 @@ }, "name": "vscode-remote-extensionpack", "publisher": "ms-vscode-remote", - "version": "0.17.0" + "version": "0.20.0" + }, + { + "metadata": { + "id": "876e8f93-74d0-4f4f-91b7-34a09f19f444", + "publisherId": "VisualStudioExptTeam.vscodeintellicode", + "publisherDisplayName": "VisualStudioExptTeam" + }, + "name": "vscodeintellicode", + "publisher": "VisualStudioExptTeam", + "version": "1.2.7" + }, + { + "metadata": { + "id": "5a6dc0d5-dc02-4121-8e24-cad33a2ff0af", + "publisherId": "ms-vsliveshare.vsliveshare", + "publisherDisplayName": "ms-vsliveshare" + }, + "name": "vsliveshare", + "publisher": "ms-vsliveshare", + "version": "1.0.2106" } -] +] \ No newline at end of file diff --git a/vscode/settings.json b/vscode/settings.json index c961985..5542c74 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -7,30 +7,26 @@ "sync.autoDownload": false, "sync.autoUpload": false, "sync.forceDownload": false, - "sync.quietSync": false, + "sync.quietSync": true, "sync.askGistName": false, "extensions.autoUpdate": true, "sync.removeExtensions": true, "sync.syncExtensions": true, "window.zoomLevel": 0, - "team.showWelcomeMessage": false, "workbench.colorCustomizations": {}, - "workbench.colorTheme": "Slime", + "editor.rulers": [80], "editor.minimap.enabled": false, "workbench.enableExperiments": false, "workbench.quickOpen.preserveInput": true, "workbench.startupEditor": "none", - "workbench.statusBar.feedback.visible": false, - "breadcrumbs.enabled": true, + "breadcrumbs.enabled": false, "workbench.editor.openPositioning": "last", - "workbench.editor.tabSizing": "shrink", "workbench.settings.enableNaturalLanguageSearch": false, "terminal.external.osxExec": "iTerm.app", "telemetry.enableCrashReporter": false, "telemetry.enableTelemetry": false, - "team.appInsights.enabled": false, - "html.autoClosingTags": false, "html.format.indentInnerHtml": true, + "html.format.endWithNewline": true, "css.lint.important": "warning", "css.lint.unknownVendorSpecificProperties": "warning", "css.lint.zeroUnits": "warning", @@ -38,13 +34,51 @@ "git.showPushSuccessNotification": true, "workbench.iconTheme": "material-icon-theme", "liveshare.featureSet": "insiders", - "aws.telemetry": false, - "aws.profile": "default", + "aws.profile": "profile:default", "githubPullRequests.remotes": [ "origin", "upstream", - "github" + "github", + "hosted" ], "sync.forceUpload": true, - "editor.renderWhitespace": "none" + "editor.renderWhitespace": "none", + "editor.suggestSelection": "first", + "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", + "go.useLanguageServer": true, + "go.lintTool": "golangci-lint", + "go.lintOnSave": "off", + "go.formatTool": "gofmt", + "githubPullRequests.telemetry.enabled": false, + "go.buildOnSave": "off", + "go.vetOnSave": "off", + "php.validate.run": "onType", + "material-icon-theme.activeIconPack": "", + "material-icon-theme.saturation": null, + "workbench.colorTheme": "Slime", + "aws.samcli.location": "/usr/local/bin/sam", + "git.autofetch": true, + "editor.acceptSuggestionOnEnter": "off", + "workbench.tips.enabled": false, + "workbench.editor.tabSizing": "shrink", + "explorer.confirmDragAndDrop": false, + "extensions.ignoreRecommendations": true, + "extensions.showRecommendationsOnlyOnDemand": true, + "terminal.explorerKind": "external", + "remote.SSH.showLoginTerminal": true, + "terminal.integrated.shell.osx": "/bin/zsh", + "editor.letterSpacing": 0.2, + "diffEditor.renderSideBySide": true, + "githubIssues.queries": [ + { + "label": "My Issues", + "query": "default" + }, + { + "label": "Created Issues", + "query": "author:${user} state:open repo:${owner}/${repository} sort:updated-desc" + } + ], + "terminal.integrated.cursorStyle": "line", + "terminal.integrated.cursorBlinking": true } diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 8478e12..a42c13c 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -51,12 +51,16 @@ alias ripmenu="sudo killall SystemUIServer NotificationCenter" alias finder="open -a Finder ./" # use VS Code insiders build -alias code="code-insiders" +#alias code="code-insiders" alias vs="code ./" # required: https://github.com/github/hub # `brew install hub` alias git="hub" +alias g="hub" +alias github="hub browse" +alias gist="hub gist create --open" + alias gc="git commit -m" # + commit message alias gca="git add . && git commit -m" # + commit message alias gs="git status -sb" @@ -67,16 +71,18 @@ alias gpom="git push origin master" alias glom="git pull origin master" alias gpo="git push origin" # + branch name alias glo="git pull origin" # + branch name -alias gphm="git push hosted master" # self-hosted gitlab -alias gb="git checkout" # + branch name -alias gbn="git checkout -b" # + branch name +alias gphm="git push hosted master" # self-hosted git +alias gb="git checkout" # + existing branch name +alias gbn="git checkout -b" # + new branch name alias grm="git rebase -i origin/master" alias gsub="git submodule update --recursive --remote" alias gundo="git reset --soft HEAD~1" -alias gf="hub fork --remote-name=origin" -alias gpr="hub pull-request" +alias greset="git reset" alias gsync="hub sync" -alias gopen="hub browse" +alias ghnew="hub create --browse" +alias ghfork="hub fork --remote-name=origin" +alias ghpr="hub pull-request --push --edit --browse" +alias ghci="hub ci-status --verbose" alias dc="docker-compose" alias dcu="docker-compose up -d" @@ -97,4 +103,5 @@ alias ytmp3="youtube-dl -f bestaudio -x --audio-format mp3 --audio-quality 320K" alias weather="curl -4 https://wttr.in/Boston" +alias make_hugo="cd ~/golang/src/github.com/gohugoio/hugo && git pull && mage hugo && HUGO_BUILD_TAGS=extended mage install" alias hugod="docker run -v $(pwd):/src -p 1313:1313 jarv.is:develop" diff --git a/zsh/path.zsh b/zsh/path.zsh index db7da35..0aad1e5 100644 --- a/zsh/path.zsh +++ b/zsh/path.zsh @@ -9,7 +9,7 @@ export PATH="$PATH:$GOROOT/bin" # Ruby export RUBY_HOME=/usr/local/opt/ruby/bin -export GEM_PATH=~/.gem/ruby/2.6.0 +export GEM_PATH=/usr/local/lib/ruby/gems/2.7.0 export PATH="$RUBY_HOME:$PATH" export PATH="$GEM_PATH/bin:$PATH" @@ -22,9 +22,20 @@ export PATH="/usr/local/opt/curl/bin:$PATH" # Rust/Cargo export PATH="$HOME/.cargo/bin:$PATH" +# nvm +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + # yarn export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" +# pyenv +if command -v pyenv 1>/dev/null 2>&1; then + eval "$(pyenv init -)" +fi + +# rbenv +eval "$(rbenv init -)" # ----- Third-party additions below: -----