mirror of
https://github.com/jakejarvis/dotfiles.git
synced 2025-04-25 15:35:21 -04:00
some updates for my new M1 mac ⚡
This commit is contained in:
parent
1348e52eb2
commit
3515d439b8
GPG Key ID:
2B0C9CF251E69A39
12
Brewfile
12
Brewfile
@ -112,7 +112,6 @@ brew "cloudflare/cloudflare/cloudflared"
|
||||
brew "cocoapods"
|
||||
brew "composer"
|
||||
brew "dart-lang/dart/dart"
|
||||
brew "dnsmasq"
|
||||
brew "doctl"
|
||||
brew "elixir"
|
||||
brew "erlang"
|
||||
@ -141,7 +140,8 @@ brew "mkcert"
|
||||
# brew "mongodb"
|
||||
brew "mongodb/brew/mongodb-community"
|
||||
brew "mosh"
|
||||
brew "mysql"
|
||||
# brew "mysql"
|
||||
brew "mariadb"
|
||||
brew "mysql-client"
|
||||
brew "ncurses"
|
||||
brew "neofetch"
|
||||
@ -149,13 +149,7 @@ brew "netcat"
|
||||
brew "openvpn"
|
||||
brew "optipng"
|
||||
brew "packer"
|
||||
brew "thoughtbot/formulae/parity"
|
||||
brew "php" # = php@7.3 https://formulae.brew.sh/formula/php
|
||||
# brew "php@7.1"
|
||||
# brew "php@7.2"
|
||||
# brew "jakejarvis/brew/php@5.6"
|
||||
# brew "exolnet/deprecated/php@5.6"
|
||||
# brew "exolnet/deprecated/php@7.0"
|
||||
brew "php"
|
||||
brew "pngcheck"
|
||||
brew "pngcrush"
|
||||
brew "postgresql"
|
||||
|
||||
@ -16,8 +16,8 @@ ln -sf ~/.dotfiles/ssh/.ssh/config ~/.ssh/config
|
||||
touch ~/.hushlogin
|
||||
|
||||
# https://github.com/ohmyzsh/ohmyzsh/issues/6835#issuecomment-390187157
|
||||
chmod 755 /usr/local/share/zsh
|
||||
chmod 755 /usr/local/share/zsh/site-functions
|
||||
chmod 755 /opt/homebrew/share/zsh
|
||||
chmod 755 /opt/homebrew/share/zsh/site-functions
|
||||
|
||||
# Get Oh My ZSH up and running
|
||||
if [ ! -e ~/.oh-my-zsh ]; then
|
||||
|
||||
@ -6,29 +6,27 @@
|
||||
<string>1164</string>
|
||||
<key>preferences</key>
|
||||
<dict>
|
||||
<key>CPU_CombineLogicalCores</key>
|
||||
<integer>1</integer>
|
||||
<key>CPU_DropdownOrderDisabled</key>
|
||||
<string></string>
|
||||
<key>CPU_MenubarGraphBreakdowns</key>
|
||||
<integer>0</integer>
|
||||
<integer>1</integer>
|
||||
<key>CPU_MenubarGroupItems</key>
|
||||
<integer>1</integer>
|
||||
<key>CPU_MenubarMode</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>key</key>
|
||||
<string>100</string>
|
||||
<key>uuid</key>
|
||||
<string>3438CB2E-D428-4495-B786-66F1FC6F9D45</string>
|
||||
<string>8F722CCF-D82B-4D8D-83B0-73C7E59AB2CC</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>key</key>
|
||||
<string>6</string>
|
||||
<key>uuid</key>
|
||||
<string>3D1DD3D6-B06B-4DF1-A2F5-2846A94D9723</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>key</key>
|
||||
<string>5</string>
|
||||
<key>uuid</key>
|
||||
<string>B9C7FEFC-25C6-41F8-A6E3-AF4E5B589EBB</string>
|
||||
<string>969E31C3-9F6D-4195-924C-A4733CE99A32</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>CPU_ProcessCount</key>
|
||||
@ -43,9 +41,7 @@
|
||||
<key>boot</key>
|
||||
<true/>
|
||||
<key>key</key>
|
||||
<string>7C143838-9EBF-405B-A0B6-FA82B8A9D92F</string>
|
||||
<key>name</key>
|
||||
<string>Macintosh HD</string>
|
||||
<string>F0C607FC-F570-4356-9D2C-4585952893F8</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>Disks_ProcessCount</key>
|
||||
@ -59,78 +55,7 @@
|
||||
<key>FanControl_Enabled</key>
|
||||
<false/>
|
||||
<key>FanControl_Sets</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>model</key>
|
||||
<string>MacBookPro14,2</string>
|
||||
<key>name</key>
|
||||
<string>Medium</string>
|
||||
<key>speeds</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>fan</key>
|
||||
<string>F0Ac</string>
|
||||
<key>high</key>
|
||||
<integer>6336</integer>
|
||||
<key>low</key>
|
||||
<integer>1250</integer>
|
||||
<key>percentage</key>
|
||||
<integer>50</integer>
|
||||
<key>speed</key>
|
||||
<integer>3793</integer>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>fan</key>
|
||||
<string>F1Ac</string>
|
||||
<key>high</key>
|
||||
<integer>6864</integer>
|
||||
<key>low</key>
|
||||
<integer>1350</integer>
|
||||
<key>percentage</key>
|
||||
<integer>50</integer>
|
||||
<key>speed</key>
|
||||
<integer>4107</integer>
|
||||
</dict>
|
||||
</array>
|
||||
<key>uuid</key>
|
||||
<string>6B58D7F2-E37C-4DBB-8F32-AFABD1BA1657</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>model</key>
|
||||
<string>MacBookPro14,2</string>
|
||||
<key>name</key>
|
||||
<string>High</string>
|
||||
<key>speeds</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>fan</key>
|
||||
<string>F0Ac</string>
|
||||
<key>high</key>
|
||||
<integer>6336</integer>
|
||||
<key>low</key>
|
||||
<integer>1250</integer>
|
||||
<key>percentage</key>
|
||||
<integer>100</integer>
|
||||
<key>speed</key>
|
||||
<integer>6336</integer>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>fan</key>
|
||||
<string>F1Ac</string>
|
||||
<key>high</key>
|
||||
<integer>6864</integer>
|
||||
<key>low</key>
|
||||
<integer>1350</integer>
|
||||
<key>percentage</key>
|
||||
<integer>100</integer>
|
||||
<key>speed</key>
|
||||
<integer>6864</integer>
|
||||
</dict>
|
||||
</array>
|
||||
<key>uuid</key>
|
||||
<string>8F33FE90-EB2E-45D6-9D08-82C063BCD9CD</string>
|
||||
</dict>
|
||||
</array>
|
||||
<array/>
|
||||
<key>Memory_AppFormat</key>
|
||||
<integer>0</integer>
|
||||
<key>Memory_DropdownOrderDisabled</key>
|
||||
@ -172,6 +97,8 @@
|
||||
<string></string>
|
||||
<key>Network_GraphShowBackground</key>
|
||||
<integer>0</integer>
|
||||
<key>Network_GraphWidth</key>
|
||||
<real>24</real>
|
||||
<key>Network_MenubarMode</key>
|
||||
<array>
|
||||
<dict>
|
||||
@ -248,10 +175,10 @@
|
||||
<string></string>
|
||||
<key>StatusItems-Order</key>
|
||||
<array>
|
||||
<integer>3</integer>
|
||||
<integer>4</integer>
|
||||
<integer>1</integer>
|
||||
<integer>2</integer>
|
||||
<integer>3</integer>
|
||||
</array>
|
||||
<key>Theme-SeperateStyles</key>
|
||||
<true/>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# https://github.com/kevinSuttle/macOS-Defaults/blob/master/.macos
|
||||
|
||||
# Change new hostname here if necessary
|
||||
COMPUTER_NAME="JJ-MBP13"
|
||||
COMPUTER_NAME="JJ-MBA"
|
||||
|
||||
# Quit System Preferences.app if open
|
||||
osascript -e 'tell application "System Preferences" to quit'
|
||||
|
||||
@ -21,8 +21,8 @@ if test ! "$(which brew)"; then
|
||||
fi
|
||||
|
||||
# Fix some installation errors
|
||||
sudo chown -R "$(whoami)" /usr/local/share/man/man8
|
||||
chmod u+w /usr/local/share/man/man8
|
||||
# sudo chown -R "$(whoami)" /usr/local/share/man/man8
|
||||
# chmod u+w /usr/local/share/man/man8
|
||||
|
||||
# Disable analytics
|
||||
# https://docs.brew.sh/Analytics
|
||||
|
||||
BIN
vscode/TTF-source-code-pro-2.038R-ro-1.058R-it.zip
Normal file
BIN
vscode/TTF-source-code-pro-2.038R-ro-1.058R-it.zip
Normal file
Binary file not shown.
@ -1,20 +1,11 @@
|
||||
// Place your settings in this file to overwrite the default settings
|
||||
{
|
||||
"editor.fontFamily": "Source Code Pro, Menlo, Monaco, 'Courier New', monospace",
|
||||
"editor.fontSize": 14,
|
||||
"sync.gist": "80a04530e0142ff5b7b77c92d5c6f526",
|
||||
"sync.autoDownload": false,
|
||||
"sync.autoUpload": false,
|
||||
"sync.forceDownload": false,
|
||||
"sync.quietSync": true,
|
||||
"sync.askGistName": false,
|
||||
"extensions.autoUpdate": true,
|
||||
"sync.removeExtensions": true,
|
||||
"sync.syncExtensions": true,
|
||||
"window.zoomLevel": 0,
|
||||
"workbench.colorCustomizations": {},
|
||||
"editor.fontFamily": "'Source Code Pro', Menlo, Monaco, 'Courier New', monospace",
|
||||
"editor.fontSize": 13,
|
||||
"editor.rulers": [80],
|
||||
"editor.minimap.enabled": false,
|
||||
"extensions.autoUpdate": true,
|
||||
"workbench.colorCustomizations": {},
|
||||
"workbench.enableExperiments": false,
|
||||
"workbench.quickOpen.preserveInput": true,
|
||||
"workbench.startupEditor": "none",
|
||||
@ -31,8 +22,6 @@
|
||||
"git.showPushSuccessNotification": true,
|
||||
"workbench.iconTheme": "material-icon-theme",
|
||||
"liveshare.featureSet": "insiders",
|
||||
"aws.profile": "profile:default",
|
||||
"sync.forceUpload": true,
|
||||
"editor.renderWhitespace": "none",
|
||||
"editor.suggestSelection": "first",
|
||||
"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
|
||||
@ -45,17 +34,15 @@
|
||||
"go.vetOnSave": "off",
|
||||
"php.validate.run": "onType",
|
||||
"workbench.colorTheme": "GitHub Dark",
|
||||
"aws.samcli.location": "/usr/local/bin/sam",
|
||||
"aws.samcli.location": "/opt/homebrew/bin/sam",
|
||||
"git.autofetch": true,
|
||||
"editor.acceptSuggestionOnEnter": "smart",
|
||||
"workbench.tips.enabled": false,
|
||||
"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,
|
||||
"terminal.integrated.shell.osx": "/opt/homebrew/bin/zsh",
|
||||
"diffEditor.renderSideBySide": true,
|
||||
"githubIssues.queries": [
|
||||
{
|
||||
@ -72,7 +59,6 @@
|
||||
"prettier.requireConfig": true,
|
||||
"aws.telemetry": false,
|
||||
"git.allowForcePush": true,
|
||||
"git.defaultCloneDirectory": "~/source",
|
||||
"git.fetchOnPull": true,
|
||||
"git.suggestSmartCommit": false,
|
||||
"githubPullRequests.defaultMergeMethod": "rebase",
|
||||
@ -86,9 +72,6 @@
|
||||
"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,
|
||||
@ -101,5 +84,16 @@
|
||||
"githubIssues.useBranchForIssues": "prompt",
|
||||
"material-icon-theme.folders.theme": "classic",
|
||||
"scss.lint.zeroUnits": "warning",
|
||||
"stylelint.reportNeedlessDisables": true
|
||||
"stylelint.reportNeedlessDisables": true,
|
||||
"codespaces.accountProvider": "GitHub",
|
||||
"settingsSync.ignoredSettings": [
|
||||
|
||||
],
|
||||
"settingsSync.ignoredExtensions": [
|
||||
"amazonwebservices.aws-toolkit-vscode",
|
||||
"ms-vscode.azure-account",
|
||||
"msjsdiag.debugger-for-chrome",
|
||||
"firefox-devtools.vscode-firefox-debug"
|
||||
],
|
||||
"aws.profile": "profile:default"
|
||||
}
|
||||
|
||||
@ -80,8 +80,8 @@ update() {
|
||||
echo -e "${YELLOW}Updating Oh-My-ZSH...${NC}"
|
||||
omz update
|
||||
|
||||
echo -e "${YELLOW}Updating MAS apps...${NC}"
|
||||
mas upgrade
|
||||
# echo -e "${YELLOW}Updating MAS apps...${NC}"
|
||||
# mas upgrade
|
||||
|
||||
echo -e "${YELLOW}Updating macOS system...${NC}"
|
||||
sudo softwareupdate -ia --include-config-data
|
||||
@ -104,7 +104,7 @@ alias ripmenu="sudo killall SystemUIServer NotificationCenter"
|
||||
# open current directory in Finder
|
||||
alias finder="open -a Finder ./"
|
||||
|
||||
# use VS Code insiders build
|
||||
# uncomment to use VS Code insiders build
|
||||
# alias code="code-insiders"
|
||||
alias vs="code ./"
|
||||
|
||||
@ -114,11 +114,7 @@ alias ff="firefox"
|
||||
#
|
||||
# Git
|
||||
#
|
||||
# required: https://github.com/github/hub
|
||||
# `brew install hub`
|
||||
#
|
||||
alias git="hub"
|
||||
alias g="hub"
|
||||
alias g="git"
|
||||
alias gc="git commit -m" # + commit message
|
||||
alias gca="git add . && git commit -m" # + commit message
|
||||
alias gs="git status -sb"
|
||||
@ -136,12 +132,10 @@ alias grm="git rebase -i origin/main"
|
||||
alias gsub="git submodule update --recursive --remote"
|
||||
alias gundo="git reset --soft HEAD~1"
|
||||
alias greset="git reset"
|
||||
alias gsync="hub sync"
|
||||
alias github="gh repo view --web"
|
||||
alias gist="gh gist create --web"
|
||||
alias ghnew="gh repo create"
|
||||
alias ghfork="gh repo fork"
|
||||
alias ghci="hub ci-status --verbose"
|
||||
glall() {
|
||||
# pull all remote branches
|
||||
# https://stackoverflow.com/a/10312587
|
||||
|
||||
39
zsh/path.zsh
39
zsh/path.zsh
@ -1,36 +1,53 @@
|
||||
# Default paths
|
||||
export PATH="$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH"
|
||||
|
||||
# homebrew
|
||||
export HOMEBREW_PREFIX="/opt/homebrew";
|
||||
export HOMEBREW_CELLAR="/opt/homebrew/Cellar";
|
||||
export HOMEBREW_REPOSITORY="/opt/homebrew";
|
||||
export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}";
|
||||
export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:";
|
||||
export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
|
||||
|
||||
# Go
|
||||
export GOPATH="$HOME/golang"
|
||||
export GOROOT="/usr/local/opt/go/libexec"
|
||||
#export GOROOT="/usr/local/opt/go/libexec"
|
||||
export PATH="$GOPATH/bin:$PATH"
|
||||
export PATH="$GOROOT/bin:$PATH"
|
||||
#export PATH="$GOROOT/bin:$PATH"
|
||||
|
||||
# Ruby
|
||||
export RUBY_HOME=/usr/local/opt/ruby@2.7/bin
|
||||
export GEM_PATH=/usr/local/lib/ruby/gems/2.7.0
|
||||
export RUBY_HOME="/opt/homebrew/opt/ruby/bin"
|
||||
export GEM_PATH="$HOME/.gem/ruby/3.0.0"
|
||||
export PATH="$RUBY_HOME:$PATH"
|
||||
export PATH="$GEM_PATH/bin:$PATH"
|
||||
|
||||
# openjdk
|
||||
export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
|
||||
|
||||
# Metasploit
|
||||
export PATH="/opt/metasploit-framework/bin:$PATH"
|
||||
|
||||
# curl
|
||||
# export PATH="/usr/local/opt/curl/bin:$PATH"
|
||||
export PATH="/usr/local/opt/curl-openssl/bin:$PATH"
|
||||
export PATH="/opt/homebrew/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:$PATH"
|
||||
export PATH="$HOME/.config/yarn/global/node_modules/.bin:$PATH"
|
||||
|
||||
# misc.
|
||||
export PATH="/opt/homebrew/opt/make/libexec/gnubin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/whois/bin:$PATH"
|
||||
export PATH="/opt/homebrew/opt/jpeg-turbo/bin:$PATH"
|
||||
#export LDFLAGS="-L/opt/homebrew/opt/jpeg-turbo/lib"
|
||||
#export CPPFLAGS="-I/opt/homebrew/opt/jpeg-turbo/include"
|
||||
|
||||
# nvm
|
||||
# export NVM_DIR="$HOME/.nvm"
|
||||
# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||
|
||||
# pyenv
|
||||
if command -v pyenv 1>/dev/null 2>&1; then
|
||||
eval "$(pyenv init -)"
|
||||
@ -44,4 +61,4 @@ fi
|
||||
# ----- Third-party additions below: -----
|
||||
|
||||
# Google Cloud SDK
|
||||
[ -f /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc
|
||||
[ -f /opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc ] && source /opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user