this repo has no description
Make pyenv-x86 work properly
- Vscode: support ^V for inserting tab literally
- More git option completions
- Fix nvim loading ~/.vim/after and better JSONC highlight
+49
-52
+6
.config/Code/User/keybindings.json
+6
.config/Code/User/keybindings.json
···
560
560
]
561
561
}
562
562
},
563
+
{
564
+
"key": "ctrl+v tab",
565
+
"command": "type",
566
+
"args": { "text": "\t" },
567
+
"when": "editorTextFocus && neovim.mode == 'insert'"
568
+
}
563
569
564
570
// =========================================================================
565
571
// End bindings for vscode-neovim
.config/btt/scripts/local_secrets.py
.config/btt/scripts/local_secrets.py
This is a binary file and will not be displayed.
+8
-1
.config/fish/completions/git.fish
+8
-1
.config/fish/completions/git.fish
···
3
3
end
4
4
5
5
if functions -q __fish_git_using_command
6
-
# Add completion for --no-verify
6
+
# Add completions for --no-verify
7
7
complete -x -c git -n '__fish_git_using_command commit' \
8
8
--long no-verify --short n --description 'Bypass the pre-commit and commit-msg hooks'
9
+
complete -x -c git -n '__fish_git_using_command push' \
10
+
--long no-verify --short n --description 'Bypass the pre-push hook'
11
+
12
+
# Technically `on-demand` is also an option but idk I don't really use that
13
+
complete -x -c git -n '__fish_git_using_command fetch' \
14
+
--long recurse-submodules --description 'Whether new commits of submodules should be fetched too' \
15
+
--long no-recurse-submodules --description 'Whether new commits of submodules should be fetched too'
9
16
10
17
# Add branch completions for custom !sh aliases
11
18
for cmd in bpull sswitch ssw ls merge-latest
-7
.config/fish/conf.d/05-xdg-dirs.fish
-7
.config/fish/conf.d/05-xdg-dirs.fish
···
20
20
export WINEPREFIX="$XDG_DATA_HOME"/wine
21
21
22
22
23
-
# TODO: I may want to set this differently for x86_64 + aarch64 versions
24
-
# It also seems to require a reinstall for stuff to work, otherwise it's possible
25
-
# to end up with infinite symlink loops!
26
-
#
27
-
# set -gx PYENV_ROOT "$XDG_DATA_HOME"/pyenv
28
-
29
-
30
23
# TODO:
31
24
# - .cargo
32
25
# - .gitconfig
+16
-38
.config/fish/conf.d/51-envs.fish
+16
-38
.config/fish/conf.d/51-envs.fish
···
14
14
end
15
15
16
16
if command -qs pyenv; and not set -qg __fish_pyenv_initialized
17
-
###############################################################
18
-
# Begin generated content
19
-
###############################################################
20
-
while set pyenv_index (contains -i -- ~/.pyenv/shims $PATH)
21
-
set -eg PATH[$pyenv_index]
22
-
end
23
-
set -e pyenv_index
24
-
set -gx PATH ~/.pyenv/shims $PATH
25
-
set -gx PYENV_SHELL fish
26
-
function pyenv
27
-
set command $argv[1]
28
-
set -e argv[1]
29
-
30
-
switch "$command"
31
-
case activate deactivate rehash shell
32
-
source (pyenv "sh-$command" $argv|psub)
33
-
case '*'
34
-
command pyenv "$command" $argv
35
-
end
36
-
end
37
-
38
-
# NOTE: Modified to use glob instead of hardcoded version
39
-
# also checking for stuff besides custom .local/bin
40
-
if command -sa brew | grep -qv '\.local'
41
-
set -gx PATH (brew --cellar)/pyenv-virtualenv/*/shims $PATH
42
-
end
43
-
set -gx PYENV_VIRTUALENV_INIT 1
44
-
# NOTE: modified for https://github.com/pyenv/pyenv-virtualenv/issues/338
45
-
# Also see https://github.com/pyenv/pyenv-virtualenv/issues/45
46
-
function _pyenv_virtualenv_hook --on-variable PWD --on-variable PYENV_VERSION
47
-
set -l ret $status
48
-
if [ -n "$VIRTUAL_ENV" ]
49
-
pyenv activate --quiet; or pyenv deactivate --quiet; or true
17
+
# TODO: this might be a little slower than what I used to have, but
18
+
# it should work better when pyenv-x86 is also installed
19
+
function _pyenv_hook --on-variable PWD --on-variable PYENV_VERSION
20
+
set --erase PYENV_VERSION PYENV_ROOT PYENV_SHELL PYENV_VIRTUALENV_INIT
21
+
set -l version_file (upfind .python-version)
22
+
if test -f "$version_file"; and test "$(head -n1 "$version_file")" = "#!x86_64"
23
+
set -gx PYENV_ROOT (pyenv-x86 root)
24
+
test -d $PYENV_ROOT/bin; and fish_add_path --global "$PYENV_ROOT/bin"
25
+
pyenv-x86 init --no-rehash - fish | source
26
+
pyenv-x86 virtualenv-init - fish | source
50
27
else
51
-
pyenv activate --quiet; or true
28
+
set -gx PYENV_ROOT (pyenv root)
29
+
test -d $PYENV_ROOT/bin; and fish_add_path --global "$PYENV_ROOT/bin"
30
+
pyenv init --no-rehash - fish | source
31
+
pyenv virtualenv-init - fish | source
52
32
end
53
-
return $ret
54
33
end
55
-
###############################################################
56
-
# End generated content
57
-
###############################################################
34
+
_pyenv_hook
35
+
set -g __fish_pyenv_initialized
58
36
end
59
37
60
38
if command -qs rbenv; and not set -qg __fish_rbenv_initialized
+4
.config/fish/functions/pyenv-x86.fish
+4
.config/fish/functions/pyenv-x86.fish
+2
-2
.config/nvim/init.lua
+2
-2
.config/nvim/init.lua
···
6
6
vim.g.loaded_textobj_quotes = true
7
7
8
8
-- Load all the vim-compatible plugins
9
-
vim.opt.runtimepath:prepend(HOME .. sep .. ".vim")
10
-
vim.opt.runtimepath:append(HOME .. sep .. ".vim" .. "after")
9
+
vim.opt.runtimepath:prepend(vim.fs.joinpath(HOME, ".vim"))
10
+
vim.opt.runtimepath:append(vim.fs.joinpath(HOME, ".vim", "after"))
11
11
vim.opt.packpath = vim.opt.runtimepath:get()
12
12
13
13
local vimrc = HOME .. sep .. ".vimrc"
+5
.vim/after/syntax/jsonc.vim
+5
.vim/after/syntax/jsonc.vim
+8
-4
.vimrc
+8
-4
.vimrc
···
38
38
" filetype matching
39
39
augroup CustomFiletypes
40
40
autocmd!
41
-
autocmd BufRead,BufNewFile */.ssh/config* set filetype=sshconfig
42
-
autocmd BufRead,BufNewFile */.gitconfig* set filetype=gitconfig
41
+
autocmd BufRead,BufNewFile */.ssh/config* set filetype=sshconfig
42
+
autocmd BufRead,BufNewFile */.gitconfig* set filetype=gitconfig
43
43
44
-
autocmd BufRead,BufNewFile *.yaml set nocindent
45
-
autocmd BufRead,BufNewFile *.yml set nocindent
44
+
autocmd BufRead,BufNewFile *.yaml set nocindent
45
+
autocmd BufRead,BufNewFile *.yml set nocindent
46
+
47
+
autocmd BufRead,BufNewFile */Code/User/*.json set filetype=jsonc
48
+
autocmd BufRead,BufNewFile */.vscode/*.json set filetype=jsonc
49
+
autocmd BufRead,BufNewFile *.code-workspace set filetype=jsonc
46
50
augroup END
47
51
48
52
" Keybinds for info files