this repo has no description
Merge branch 'main' of github.com:ian-h-chamberlain/dotfiles
+158
-39
+1
-2
.config/Code/User/keybindings.json
+1
-2
.config/Code/User/keybindings.json
+7
-6
.config/Code/User/settings.json
+7
-6
.config/Code/User/settings.json
···
1006
1006
1007
1007
"output.smartScroll.enabled": false,
1008
1008
1009
+
"python.analysis.logLevel": "Trace",
1010
+
"python.analysis.inlayHints.functionReturnTypes": true,
1011
+
"python.analysis.inlayHints.callArgumentNames": "partial",
1012
+
"python.analysis.inlayHints.variableTypes": true,
1013
+
"python.analysis.inlayHints.pytestParameters": true,
1009
1014
"python.analysis.autoImportCompletions": false,
1010
1015
"python.analysis.typeCheckingMode": "basic",
1011
1016
"python.analysis.useLibraryCodeForTypes": true,
···
1013
1018
"All"
1014
1019
],
1015
1020
"python.testing.autoTestDiscoverOnSaveEnabled": false,
1016
-
"python.defaultInterpreterPath": "python",
1017
-
"python.formatting.provider": "black",
1018
-
"python.formatting.blackArgs": ["--fast"],
1021
+
"python.defaultInterpreterPath": "/Users/ichamberlain/.pyenv/versions/3.10.6/envs/thefuck/bin/python",
1019
1022
"python.languageServer": "Pylance",
1020
-
"python.linting.lintOnSave": true,
1021
-
"python.linting.pylintCategorySeverity.refactor": "Information",
1022
-
"python.showStartPage": false,
1023
1023
"python.terminal.activateEnvironment": false,
1024
1024
"python.venvFolders": [],
1025
1025
···
1184
1184
"terminal.integrated.rightClickBehavior": "default",
1185
1185
"terminal.integrated.scrollback": 10000,
1186
1186
"terminal.integrated.stickyScroll.enabled": true,
1187
+
"terminal.integrated.stickyScroll.maxLineCount": 3,
1187
1188
"terminal.integrated.tabStopWidth": 4,
1188
1189
"terminal.integrated.experimentalUseTitleEvent": true,
1189
1190
"terminal.integrated.gpuAcceleration": "auto",
+2
-1
.config/bpython/config
+2
-1
.config/bpython/config
+2
-4
.config/brew/Brewfile
+2
-4
.config/brew/Brewfile
···
2
2
# Homebrew-provided taps
3
3
# ==============================================================================
4
4
tap "homebrew/cask-fonts"
5
-
5
+
tap "homebrew/command-not-found"
6
6
7
7
# ==============================================================================
8
8
# Third-party/custom taps
9
9
# ==============================================================================
10
10
tap "rcmdnk/file"
11
11
tap "superatomic/bundle-extensions", "git@github.com:ian-h-chamberlain/homebrew-bundle-extensions"
12
-
13
12
14
13
# ==============================================================================
15
14
# Device-specific brewfiles
···
18
17
# It would be nicer to use __dir__ here, but seems that this file is sometimes
19
18
# `evalged which leaves __dir__ as an empty string. So we just hardcode the path.
20
19
Dir.glob(File.join(Dir.home, ".config", "brew", "*.Brewfile")) do |brewfile|
21
-
puts "Loading #{brewfile}..."
20
+
STDERR.puts "Loading #{brewfile}..."
22
21
instance_eval File.read(brewfile)
23
22
end
24
-
25
23
26
24
# ==============================================================================
27
25
# Formulae/Casks
+90
.config/fish/completions/brew.fish
+90
.config/fish/completions/brew.fish
···
1
+
set -l vendor_completions (brew --prefix)/share/fish/vendor_completions.d/brew.fish
2
+
if test -f $vendor_completions
3
+
source $vendor_completions
4
+
end
5
+
6
+
# Overrides to make flag suggestions faster.
7
+
# TODO: maybe upstream this or something equivalent?
8
+
# It's a way better user experience and probably applies everywhere
9
+
for brew_suggest in (functions -a | string split ',' | string match '__fish_brew_suggest_*')
10
+
functions -c "$brew_suggest" "__orig$brew_suggest"
11
+
# Use `source` here to "inline" the $brew_suggest variable into the function definition
12
+
echo "function $brew_suggest
13
+
if commandline -t | string match -q -- '-*'
14
+
# If the cursor is in the middle of a flag, return immediately
15
+
return
16
+
else
17
+
# Otherwise, call the original function
18
+
__orig$brew_suggest \$argv
19
+
end
20
+
end" | source
21
+
end
22
+
23
+
# For upstream could probably do something cleaner like this:
24
+
# function __fish_brew_complete_arg -a cond -d "A shortcut for defining arguments completion for brew commands"
25
+
# if contains -- -a $argv; or contains -- --arguments $argv
26
+
# # There's no need to run -a completions if we're mid-flag
27
+
# set cond "$cond; and commandline -pt | string match -vq -- -\*"
28
+
# end
29
+
# __orig_fish_brew_complete_arg $cond $argv[2..]
30
+
# end
31
+
32
+
33
+
# Custom completions for superatomic/bundle-extensions
34
+
__fish_brew_complete_cmd add "Add one or more formulae and/or casks to a Brewfile"
35
+
__fish_brew_complete_cmd drop "Drop one or more formulae and/or casks from a Brewfile"
36
+
37
+
__fish_brew_complete_arg add -s v -l verbose -d "Make some output more verbose"
38
+
__fish_brew_complete_arg drop -s v -l verbose -d "Make some output more verbose"
39
+
40
+
# __fish_brew_complete_arg uses -f so we can't use it with -F
41
+
function __fish_brew_complete_file_arg -a cond -d "A shortcut for defining file argument completion for brew commands"
42
+
set -e argv[1]
43
+
# NOTE: $cond can be just a name of a command (or several) or additionally any other condition
44
+
complete -r -F -c brew -n "__fish_brew_command $cond" $argv
45
+
end
46
+
47
+
for cmd in add drop
48
+
__fish_brew_complete_arg $cmd -s g -l global -d "Read the Brewfile from ~/.Brewfile"
49
+
__fish_brew_complete_arg $cmd -l formula -l formulae -d "Treat all named arguments as formulae"
50
+
__fish_brew_complete_arg $cmd -l cask -l casks -d "Treat all named arguments as casks"
51
+
__fish_brew_complete_arg $cmd -s d -l debug -d "Display any debugging information"
52
+
__fish_brew_complete_arg $cmd -s q -l quiet -d "Make some output more quiet"
53
+
__fish_brew_complete_arg $cmd -s v -l verbose -d "Make some output more verbose"
54
+
__fish_brew_complete_arg $cmd -s h -l help -d "Show help message"
55
+
56
+
__fish_brew_complete_file_arg $cmd -l file -d "Read the Brewfile from this location"
57
+
end
58
+
59
+
__fish_brew_complete_arg add -l describe -d "Add a descriptive comment above each line"
60
+
# Stolen from
61
+
__fish_brew_complete_arg 'add; and not __fish_seen_argument -l cask -l casks' -a '(__fish_brew_suggest_formulae_all)'
62
+
__fish_brew_complete_arg 'add; and not __fish_seen_argument -l formula -l formulae' -a '(__fish_brew_suggest_casks_all)'
63
+
64
+
function __fish_brew_suggest_bundle -d 'List formulae/casks present in the given Brewfile'
65
+
set bundle_args
66
+
67
+
set current_args (commandline --current-process --tokenize --cut-at-cursor)
68
+
argparse --ignore-unknown file= -- $current_args
69
+
if set -q _flag_file
70
+
set -a bundle_args --file="$_flag_file"
71
+
end
72
+
73
+
for flag in --global/-g --cask/--casks --formula/--formulae
74
+
set passthrough (string split '/' -- $flag)
75
+
if __fish_brew_opt >/dev/null $passthrough
76
+
set -a bundle_args $passthrough[1]
77
+
end
78
+
end
79
+
80
+
if not __fish_brew_opt --formula --formulae --cask --casks >/dev/null
81
+
# The default `bundle list` only does formula but we want to do both
82
+
set -a bundle_args --cask --formula
83
+
end
84
+
85
+
# TODO: If we know the file, it might be faster to actually just do a simple
86
+
# grep rather than invoking `brew bundle list`. These completions take a
87
+
brew bundle $bundle_args list 2>/dev/null
88
+
end
89
+
90
+
__fish_brew_complete_arg drop -a '(__fish_brew_suggest_bundle)'
+7
.config/fish/conf.d/25-brew.fish
+7
.config/fish/conf.d/25-brew.fish
···
14
14
end
15
15
end
16
16
17
+
# For some reason using (brew --repository) here is _VERY_ slow so we just use
18
+
# the environment that `brew shellenv` should have just given us in the step above
19
+
set -l HB_CNF_HANDLER "$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-command-not-found/handler.fish"
20
+
if test -f $HB_CNF_HANDLER
21
+
source $HB_CNF_HANDLER
22
+
end
23
+
17
24
# This lets us use `brew bundle add --global` for cross-system packages
18
25
# and `brew bundle add` for system-specific packages.
19
26
set -gx HOMEBREW_BUNDLE_FILE_GLOBAL ~/.config/brew/Brewfile
+2
-3
.config/fish/conf.d/50-config.fish
+2
-3
.config/fish/conf.d/50-config.fish
···
81
81
/usr/local/sbin \
82
82
/opt/homebrew/bin
83
83
84
-
test -e {$HOME}/.iterm2_shell_integration.fish; and source {$HOME}/.iterm2_shell_integration.fish
85
-
86
84
if status is-interactive; and test -f .nvmrc; and functions -q nvm
87
85
nvm use --silent
88
86
end
···
90
88
if string match -q "$TERM_PROGRAM" vscode
91
89
and command -q code
92
90
and test -z "$REMOTE_CONTAINERS"
93
-
source (code --locate-shell-integration-path fish)
91
+
and test -f "$vscode_shell_integration"
92
+
source (code --locate-shell-integration-path fish)
94
93
end
95
94
96
95
# Used to ensure Docker cache hits on dev VM
+1
-1
.config/fish/functions/brew.fish
+1
-1
.config/fish/functions/brew.fish
+4
-12
.config/fish/functions/dsh.fish
+4
-12
.config/fish/functions/dsh.fish
···
1
1
function dsh
2
-
set -l dlib "tools/dlib.sh"
2
+
set -l denv (gbase)/tools/denv
3
3
4
-
if ! test -f "$dlib"
5
-
echo "'"(pwd)"/$dlib' does not exist!"
4
+
if not test -f "$denv"
5
+
echo "'$denv' does not exist!"
6
6
return 1
7
7
end
8
8
···
11
11
return 1
12
12
end
13
13
14
-
DOCKER_BUILDKIT=0 bash -c '
15
-
set -o nounset
16
-
17
-
source tools/dlib.sh
18
-
dlib_args="$(dlib_parse_args $@)"
19
-
shift $?
20
-
21
-
dlib_workflow $dlib_args -- "/bin/bash --rcfile /etc/bashrc --rcfile ~/.bashrc"
22
-
' -- $argv
14
+
DOCKER_BUILDKIT=0 $denv "/bin/bash --rcfile /etc/bashrc --rcfile ~/.bashrc" -- $argv
23
15
end
+20
-3
.config/fish/functions/fish_prompt.fish
+20
-3
.config/fish/functions/fish_prompt.fish
···
15
15
set -g __fish_prompt_cwd (set_color cyan)
16
16
end
17
17
18
-
set -g __fish_git_prompt_color bryellow --background normal --italics
19
-
20
18
set color_chars 0
21
19
22
20
set -g magenta (set_color magenta)
···
54
52
set remaining_char_count 0
55
53
end
56
54
55
+
set -g __fish_git_prompt_showdirtystate true
56
+
set -g __fish_git_prompt_showuntrackedfiles true
57
+
set -g __fish_git_prompt_showcolorhints true
58
+
set -g __fish_git_prompt_use_informative_chars true
59
+
60
+
set -g __fish_git_prompt_describe_style contains
61
+
set -g __fish_git_prompt_showupstream auto
62
+
63
+
set -l default_color bryellow -i -b normal
64
+
set -g __fish_git_prompt_color $default_color
65
+
set -g __fish_git_prompt_color_branch $default_color
66
+
set -g __fish_git_prompt_color_branch_detached brblack
67
+
68
+
# Partial workaround for https://github.com/fish-shell/fish-shell/issues/10175
69
+
# This ends up with two separators sometimes but better than nothing I guess
70
+
set -g __fish_git_prompt_char_upstream_prefix (set_color $default_color)'|'(set_color green)
71
+
# Once fixed:
72
+
# set -g __fish_git_prompt_color_upstream green
73
+
57
74
set -g __fish_git_prompt_shorten_branch_len $remaining_char_count
58
75
59
76
set -l vcs_prompt (__fish_vcs_prompt)
···
62
79
end
63
80
64
81
set -l symbol '§'
65
-
if test (id -u) -eq 0
82
+
if test (id -u) -eq 0
66
83
set symbol '♯'
67
84
end
68
85
+2
.config/yadm/alt/.config/brew/10-class.Brewfile##class.personal
+2
.config/yadm/alt/.config/brew/10-class.Brewfile##class.personal
+11
-6
.config/yadm/alt/.config/brew/20-os.Brewfile##os.Darwin
+11
-6
.config/yadm/alt/.config/brew/20-os.Brewfile##os.Darwin
···
1
+
# ==============================================================================
2
+
# Taps
3
+
# ==============================================================================
4
+
tap "archgpt/tap"
5
+
tap "d12frosted/emacs-plus"
6
+
1
7
# ==============================================================================
2
8
# Formulae
3
9
# ==============================================================================
···
6
12
brew "pinentry-mac"
7
13
# Mac App Store command-line interface
8
14
brew "mas"
15
+
# TODO: this might also work on Linux but I need to check
16
+
# GNU Emacs text editor
17
+
brew "d12frosted/emacs-plus/emacs-plus@29"
9
18
10
19
# ==============================================================================
11
20
# App store apps
···
22
31
23
32
# Application uninstaller
24
33
cask "appcleaner"
34
+
# HTTP & GraphQL Client. FOSS Fork of Insomnia. 100%-Local, no user login, etc
35
+
cask "archgpt/tap/insomnium"
25
36
# Tool to customize input devices and automate computer systems
26
37
cask "bettertouchtool"
27
-
# Text editor
28
-
cask "emacs"
29
38
# Web browser
30
39
cask "firefox"
31
40
# Screen color temperature controller
···
42
51
cask "logitech-g-hub"
43
52
# Sound and audio controller
44
53
cask "proxy-audio-device"
45
-
# Instant messaging application focusing on security
46
-
cask "signal"
47
54
# Music streaming service
48
55
cask "spotify"
49
-
# Video game digital distribution service
50
-
cask "steam"
51
56
# Break time reminder app
52
57
cask "stretchly"
53
58
# Real time file synchronization software
+6
-1
.config/yadm/alt/.config/fish/conf.d/20-iterm2_shell_integration.fish##os.Darwin,extension.fish
+6
-1
.config/yadm/alt/.config/fish/conf.d/20-iterm2_shell_integration.fish##os.Darwin,extension.fish
···
13
13
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
14
14
15
15
if begin
16
-
status --is-interactive; and not functions -q -- iterm2_status; and [ "$ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX""$TERM" != screen ]; and [ "$TERM" != dumb ]; and [ "$TERM" != linux ]
16
+
status --is-interactive
17
+
and not functions -q -- iterm2_status
18
+
and [ "$ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX""$TERM" != screen ]
19
+
and [ "$TERM" != dumb ]
20
+
and [ "$TERM" != linux ]
21
+
and string match -q "$TERM_PROGRAM" iTerm.app
17
22
end
18
23
function iterm2_status
19
24
printf "\033]133;D;%s\007" $argv
+3
.gitconfig
+3
.gitconfig
···
34
34
dir-diff = ! COMPARE_FOLDERS=DIFF git difftool --dir-diff
35
35
sswitch = !sh -c 'git stash && git switch \"$@\" && git stash pop' -
36
36
ssw = sswitch
37
+
su = submodule update
37
38
[core]
38
39
editor = vim
39
40
quotePath = true
···
77
78
clean = git-lfs clean -- %f
78
79
smudge = git-lfs smudge -- %f
79
80
process = git-lfs filter-process
81
+
[advice]
82
+
detachedHead = false
80
83
# NOTE: This has to come last to override other settings, e.g. user.email
81
84
[include]
82
85
path = ~/.gitconfig.local
Library/Application Support/lghub/settings.db
Library/Application Support/lghub/settings.db
This is a binary file and will not be displayed.