Skip to content

Commit 541207e

Browse files
updoot
1 parent 8bdd002 commit 541207e

File tree

10 files changed

+79
-16
lines changed

10 files changed

+79
-16
lines changed

.config/nvim/init.lua

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,16 @@ end
1414
vim.opt.rtp:prepend(lazypath)
1515

1616
local lazy = require('lazy')
17-
lazy.setup('plugins')
17+
-- lazy.setup('plugins')
18+
lazy.setup {
19+
spec = {
20+
{import = "plugins"},
21+
},
22+
23+
change_detection = {
24+
notify = false,
25+
},
26+
}
1827

1928
-- require('plugins')
2029
require('opt')

.config/nvim/lazy-lock.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
{
2-
"LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" },
2+
"LuaSnip": { "branch": "master", "commit": "659c4479529a05cc9b05ef762639a09d366cc690" },
33
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
44
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
5-
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
5+
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
66
"fluent.vim": { "branch": "master", "commit": "86f60ebc5dc6ee52c1b7676aa2c950eb4b9af06a" },
77
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
8-
"indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
9-
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
8+
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
9+
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
1010
"mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" },
1111
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
1212
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
1313
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
14-
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
15-
"nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" },
16-
"nvim-tree.lua": { "branch": "master", "commit": "120ba58254835d412bbc91cffe847e9be835fadd" },
17-
"nvim-treesitter": { "branch": "master", "commit": "f9e9370a6f710148f4a3f3f4f23d5349c85c2888" },
14+
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
15+
"nvim-lspconfig": { "branch": "master", "commit": "d2d153a179ed59aa7134d7ebdf4d7dcb156efa22" },
16+
"nvim-tree.lua": { "branch": "master", "commit": "28eac2801b201f301449e976d7a9e8cfde053ba3" },
17+
"nvim-treesitter": { "branch": "master", "commit": "6389ceb1758b8f62a15194e3b790e33268304cb8" },
1818
"nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" },
1919
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
2020
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
2121
"rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" },
22-
"schemastore.nvim": { "branch": "main", "commit": "ed65feb5b8026d7c6b1981cfe9d97402342d344d" },
22+
"schemastore.nvim": { "branch": "main", "commit": "8ae7ed5b8a58ad36136d9b440205cef552bd0e41" },
2323
"tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
2424
"telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
2525
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
2626
"telescope-zoxide": { "branch": "main", "commit": "54bfe630bad08dc9891ec78c7cf8db38dd725c97" },
2727
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
2828
"tree-sitter-just": { "branch": "main", "commit": "1014d2fd6396856c312054d6c30df4d78b62966c" },
29-
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
29+
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
3030
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
3131
"twoslash-queries.nvim": { "branch": "main", "commit": "b92622c7b71eceefabd02eef24236041069904b1" },
3232
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
3333
"vim-crystal": { "branch": "master", "commit": "dc21188ec8c2ee77bb81dffca02e1a29d87cfd9f" },
34+
"vim-easymotion": { "branch": "master", "commit": "b3cfab2a6302b3b39f53d9fd2cd997e1127d7878" },
3435
"vim-elixir": { "branch": "master", "commit": "39cfaec9ea71c22a82c459ecd64860c8850f1215" },
3536
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
3637
"vim-matchit": { "branch": "master", "commit": "f52e59b05a937fe3102d431dd23f8ae4d8752ba3" },

.config/nvim/lua/config/lsp-servers.lua

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,23 @@ return function(lsp_attach)
2828
exit_timeout = 0,
2929
},
3030

31+
-- capabilities = vim.lsp.protocol.make_client_capabilities(),
32+
-- temporary fix: https://github.com/hrsh7th/cmp-nvim-lsp/issues/72#issuecomment-2425963432
33+
capabilities = require('cmp_nvim_lsp').default_capabilities {
34+
resolveSupport = {
35+
properties = {
36+
"documentation",
37+
"detail",
38+
"additionalTextEdits",
39+
"sortText",
40+
"filterText",
41+
"insertText",
42+
"insertTextFormat",
43+
"insertTextMode"
44+
}
45+
}
46+
},
47+
3148
settings = {
3249
rust = {
3350
},
@@ -87,7 +104,7 @@ return function(lsp_attach)
87104
includeInlayParameterNameHintsWhenArgumentMatchesName = true,
88105
-- class member inferred type
89106
includeInlayPropertyDeclarationTypeHints = true,
90-
includeInlayVariableTypeHints = false,
107+
includeInlayVariableTypeHints = true,
91108
},
92109
},
93110
},

.config/nvim/lua/plugins/cmp.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
return {
22
{
33
'hrsh7th/nvim-cmp',
4-
event = {'InsertEnter'},
4+
event = {"VeryLazy"},
55
dependencies = {
66
'hrsh7th/cmp-nvim-lsp',
77
'hrsh7th/cmp-path',

.config/nvim/lua/plugins/lspconfig.lua

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,24 @@ return {
106106
'force',
107107
vim.lsp.protocol.make_client_capabilities(),
108108
cmp_nvim_lsp.default_capabilities()
109+
110+
-- temporary fix: https://github.com/hrsh7th/cmp-nvim-lsp/issues/72#issuecomment-2425963432
111+
-- cmp_nvim_lsp.default_capabilities(
112+
-- {
113+
-- resolveSupport = {
114+
-- properties = {
115+
-- "documentation",
116+
-- "detail",
117+
-- "additionalTextEdits",
118+
-- "sortText",
119+
-- "filterText",
120+
-- "insertText",
121+
-- "insertTextFormat",
122+
-- "insertTextMode"
123+
-- }
124+
-- }
125+
-- }
126+
-- )
109127
)
110128

111129
local custom_configs = require('config.lsp-servers')(lsp_attach)

.config/nvim/lua/plugins/nvim-tree.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ return {
3838
-- }
3939
-- }
4040
},
41+
42+
-- git = {
43+
-- disable_dirs = {
44+
-- 'qmk'
45+
-- }
46+
-- }
4147
},
4248

4349
config = function(_, opts)

.config/nvim/lua/plugins/telescope.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ return {
2727
},
2828

2929
extensions = {
30-
file_browser = {},
30+
file_browser = {
31+
git_status = false,
32+
},
3133

3234
fzf = {
3335
fuzzy = true,

.config/nvim/lua/plugins/util.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ return {
2525
'godlygeek/tabular',
2626
event = {'BufReadPre', 'BufNewFile'},
2727
},
28+
-- {
29+
-- 'easymotion/vim-easymotion',
30+
-- event = {'BufReadPre', 'BufNewFile'},
31+
-- },
2832

2933
{
3034
'windwp/nvim-autopairs',

.zshrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ setopt listpacked
2323
zstyle ':completion:*' menu select
2424
zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
2525
zstyle ':completion:*' complete-options true
26-
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
2726
zstyle ':completion:*' use-cache true
2827
zstyle ':completion:*' cache-path ~/.cache/zsh/.zcompcache
2928
zstyle ':completion:*' group-name ''
3029
zstyle ':completion:*' complete-options true
3130
zstyle ':completion:*' squeeze-slashes true
3231
zstyle ':completion:*:*:*:*:descriptions' format '%F{blue}-- %d --%f'
32+
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
33+
zstyle ':completion:*:*:*:*:functions' ignoreed-patterns '_*'
34+
zstyle ':completion:*' verbose yes
3335

3436
autoload -U {up,down}-line-or-beginning-search
3537
zle -N up-line-or-beginning-search
@@ -58,12 +60,14 @@ compdef _curl curlbot
5860
compdef _mkdir mk
5961
compdef _git dot
6062

61-
autoload run-help
63+
autoload run-help -uZ
6264
HELPDIR=/usr/share/zsh/"${ZSH_VERSION}"/help
65+
unalias run-help &>/dev/null
6366
alias help=run-help
6467

6568
# third-party plugins
6669
plugins=(
70+
$HOME/.local/share/zsh/plugins/async.zsh
6771
$HOME/.local/share/zsh/themes/oxide.zsh-theme
6872
/opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
6973
/opt/homebrew/opt/zsh-vi-mode/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
## Hardware
1313
- 13" 2020 M1 MacBook Pro; 16GB, 512GB SSD
14+
- Keychron Q4 Pro with Gateron Milky Yellow Pro switches [VIA Keymap](/keyboard/keychron_q4_pro/layout.json)
15+
- Planck V7 with Akko Lavendar Purple switches [QMK firmware](https://github.com/Benricheson101/qmk_firmware/blob/master/keyboards/planck/rev7/keymaps/benricheson101)
1416

1517
## Usage
1618
```sh

0 commit comments

Comments
 (0)