+6 -11

.config/fish/config.fish

reviewed

··· 1 1 # Set fish_user_paths here instead of fish_variables to expand $HOME per-machine 2 2 - set -U fish_user_paths 2 2 + set -U fish_user_paths ~/.cargo/bin 3 3 4 4 - if command -qs npm 5 5 - set -Ua fish_user_paths (npm bin) 6 6 - end 7 7 - 8 8 - set -Ua fish_user_paths ~/.cargo/bin ~/.pyenv/shims /usr/local/Cellar/pyenv-virtualenv/*/shims 4 4 + # Run nvm to update fish_user_paths for npm installs 5 5 + nvm 9 6 10 7 if not set -q DOCKER_NAME; and test -f /etc/profile.d/docker_name.sh 11 8 set -gx DOCKER_NAME (sed -E 's/.*DOCKER_NAME=(.+)/\1/' /etc/profile.d/docker_name.sh) ··· 13 10 14 11 if status is-interactive; and status is-login 15 12 if command -qs thefuck 16 16 - source (thefuck --alias | psub) 13 13 + thefuck --alias | source 17 14 end 18 15 19 16 if command -qs pyenv 20 20 - source (pyenv init - | psub) 21 21 - source (pyenv virtualenv-init - | psub) 17 17 + pyenv init - | source 18 18 + pyenv virtualenv-init - | source 22 19 end 23 20 end 24 21 25 22 # Used to ensure Docker cache hits on dev VM 26 23 umask 0002 27 27 - 28 28 - source ~/.config/fish/iterm2_shell_integration.fish

+1 -1

.config/fish/functions/f.fish

reviewed

··· 1 1 # Defined in /Users/ichamberlain/.config/fish/functions/f.fish @ line 2 2 2 function f --description 'alias f fuck' 3 3 - fuck $argv; 3 3 + fuck $argv; 4 4 end

+3 -3

.config/fish/functions/nvm.fish

reviewed

··· 1 1 - set -g nvm_version 1.0.1 1 1 + set -g nvm_version 1.0.2 2 2 3 3 function nvm -a cmd -d "Node.js version manager" 4 4 set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config ··· 169 169 set arch armv6l 170 170 case armv7 armv7l 171 171 set arch armv7l 172 172 - case armv8 armv8l 172 172 + case armv8 armv8l aarch64 173 173 set arch arm64 174 174 case \* 175 175 set arch x86 ··· 189 189 echo "fetching $url" >&2 190 190 command mkdir -p $target/$name 191 191 192 192 - if not command curl --fail --progress-bar $url.tar.gz | command tar -xzf- -C $target/$name 192 192 + if not command curl -L --fail --progress-bar $url.tar.gz | command tar -xzf- -C $target/$name 193 193 command rm -rf $target 194 194 echo "nvm: fetch error -- are you offline?" >&2 195 195 return 1

.config/fish/iterm2_shell_integration.fish .config/fish/conf.d/iterm2_shell_integration.fish

reviewed

+1 -1

.config/vscode/extensions.txt

reviewed

··· 20 20 marko2276.yang@0.1.3 21 21 matklad.rust-analyzer@0.2.199 22 22 ms-azuretools.vscode-docker@1.2.1 23 23 - ms-python.python@2020.5.80290 23 23 + ms-python.python@2020.5.86398 24 24 ms-vscode-remote.remote-ssh@0.51.0 25 25 ms-vscode-remote.remote-ssh-edit@0.51.0 26 26 ms-vscode.cmake-tools@1.4.0

+2

.gitconfig

reviewed

··· 41 41 recurse = true 42 42 [push] 43 43 recurseSubmodules = check 44 44 + [pull] 45 45 + rebase = false

+2 -1

.gitignore_global

reviewed

··· 11 11 GRTAGS 12 12 GTAGS 13 13 14 14 + # Custom dotfiles-type stuff 14 15 .python-version 15 15 - 16 16 .vscode 17 17 .classpath 18 18 *.egg-info 19 19 **/bazel-* 20 20 /private/var/tmp/**/* 21 21 + fish_variables 21 22 22 23 # General 23 24 .DS_Store

+1

.nvmrc

reviewed

··· 1 1 + latest

+2 -2

Library/Application Support/Code/User/settings.json

reviewed

··· 248 248 249 249 "rfLanguageServer.logLevel": "info", 250 250 251 251 - "rpmspec.lint": false, 251 251 + "rpmspec.lint": true, 252 252 253 253 "rust-analyzer.checkOnSave.enable": true, 254 254 "rust-analyzer.inlayHints.maxLength": 10, ··· 374 374 "FoldColumn", 375 375 ], 376 376 // Mouse selection seems to cause more problems than it's worth... 377 377 - // "vscode-neovim.mouseSelectionStartVisualMode": true, 377 377 + "vscode-neovim.mouseSelectionStartVisualMode": false, 378 378 "vscode-neovim.neovimExecutablePaths.darwin": "/usr/local/bin/nvim", 379 379 "vscode-neovim.neovimInitPath": "~/.vimrc", 380 380 "vscode-neovim.neovimPath": "/usr/local/bin/nvim",