Skip to content

Commit 19c077f

Browse files
committed
nvim: clean stuff up
1 parent eb0915c commit 19c077f

File tree

4 files changed

+122
-92
lines changed

4 files changed

+122
-92
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

home/nvim/default.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,12 @@
4242
"nvim-bqf"
4343
"nvim-dap"
4444
"nvim-lint"
45-
"nvim-pqf"
4645
"nvim-tree-lua"
4746
"nvim-treesitter"
4847
"nvim-treesitter-context"
4948
"nvim-treesitter-textobjects"
5049
"render-markdown-nvim"
51-
"zk-nvim"
50+
"snacks-nvim"
5251
]
5352
(
5453
name: {
@@ -66,11 +65,9 @@
6665
"mini-bracketed"
6766
"mini-bufremove"
6867
"mini-clue"
69-
"mini-completion"
7068
"mini-diff"
7169
"mini-extra"
7270
"mini-files"
73-
"mini-fuzzy"
7471
"mini-git"
7572
"mini-hipatterns"
7673
"mini-icons"

home/nvim/lua/options.lua

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ vim.opt.smartcase = true -- search case-sensitive when capital letters are searc
3737
vim.opt.cmdheight = 0 -- more space on the bottom
3838
vim.opt.laststatus = 3 -- global statusline
3939
vim.opt.signcolumn = "yes" -- always show signcolumn
40-
vim.opt.shortmess:append({
41-
l = false, -- don't abbreviate remaining write message
42-
W = true, -- no "written" messages when saving
43-
I = true, -- no intro
44-
c = true, -- no messages on completion items
45-
C = true, -- no messages when scanning for completion
46-
s = true, -- no search wrap message
47-
})
4840

4941
-- virtual text
5042
vim.opt.listchars = "eol:¬,tab:»·,trail:~,space:·" -- list these chars if enabled

home/nvim/lua/plugins.lua

Lines changed: 118 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ return inject_all({
4949
end,
5050
desc = "copy git url",
5151
},
52-
{
53-
"<leader>n",
54-
function()
55-
require("snacks").notifier.show_history()
56-
end,
57-
desc = "Notification History",
58-
},
5952
},
6053
config = function(_, opts)
6154
require("snacks").setup(opts)
@@ -68,14 +61,22 @@ return inject_all({
6861
})
6962
end,
7063
opts = {
64+
bigfile = { enabled = true },
7165
gitbrowse = {
7266
notify = false,
7367
open = function(url)
7468
vim.fn.setreg("+", url, "v")
7569
end,
7670
},
71+
input = { enabled = true },
7772
notifier = { enabled = true },
7873
quickfile = { enabled = false },
74+
scroll = {
75+
enabled = true,
76+
animate = {
77+
duration = { step = 15, total = 150 },
78+
},
79+
},
7980
statuscolumn = { enabled = true },
8081
styles = {
8182
notification = {
@@ -85,26 +86,6 @@ return inject_all({
8586
},
8687
},
8788

88-
{
89-
"ColinKennedy/cursor-text-objects.nvim",
90-
lazy = false,
91-
config = function()
92-
vim.keymap.set(
93-
{ "o", "x" },
94-
"[",
95-
"<Plug>(cursor-text-objects-up)",
96-
{ desc = "Run from your current cursor to the end of the text-object." }
97-
)
98-
vim.keymap.set(
99-
{ "o", "x" },
100-
"]",
101-
"<Plug>(cursor-text-objects-down)",
102-
{ desc = "Run from your current cursor to the end of the text-object." }
103-
)
104-
end,
105-
version = "v1.*",
106-
},
107-
10889
{
10990
"saghen/blink.cmp",
11091
lazy = false, -- it handles itself and is an integral part anyhow
@@ -121,32 +102,25 @@ return inject_all({
121102
})
122103
end,
123104
opts = {
124-
keymap = {
125-
preset = "enter",
126-
["<Tab>"] = { "select_next", "snippet_forward", "fallback" },
127-
["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
128-
["<C-u>"] = { "scroll_documentation_up", "fallback" },
129-
["<C-d>"] = { "scroll_documentation_down", "fallback" },
130-
["("] = { "accept", "fallback" },
105+
appearance = {
106+
use_nvim_cmp_as_default = true,
107+
kind_icons = {
108+
Interface = "",
109+
Keyword = "󰌋",
110+
Method = "󰆧",
111+
Operator = "󰆕",
112+
Reference = "",
113+
Snippet = "",
114+
Value = "󰎠",
115+
Variable = "󰂡",
116+
},
131117
},
132118
completion = {
133-
keyword = {
134-
range = "full",
135-
},
136-
trigger = {
137-
show_in_snippet = false,
138-
},
139-
list = {
140-
selection = "auto_insert",
141-
},
142119
accept = {
143120
auto_brackets = {
144121
enabled = true,
145122
},
146123
},
147-
menu = {
148-
max_height = 16,
149-
},
150124
documentation = {
151125
auto_show = true,
152126
auto_show_delay_ms = 50,
@@ -158,16 +132,46 @@ return inject_all({
158132
ghost_text = {
159133
enabled = true,
160134
},
135+
keyword = {
136+
range = "full",
137+
},
138+
list = {
139+
selection = "auto_insert",
140+
},
141+
menu = {
142+
max_height = 16,
143+
draw = {
144+
treesitter = { "lsp" },
145+
},
146+
},
147+
trigger = {
148+
show_in_snippet = false,
149+
show_on_insert_on_trigger_character = false,
150+
},
151+
},
152+
keymap = {
153+
preset = "enter",
154+
["<tab>"] = { "select_next", "snippet_forward", "fallback" },
155+
["<s-tab>"] = { "select_prev", "snippet_backward", "fallback" },
156+
["<c-u>"] = { "scroll_documentation_up", "fallback" },
157+
["<c-d>"] = { "scroll_documentation_down", "fallback" },
158+
["("] = { "accept", "fallback" },
159+
["<C-e>"] = { "cancel", "fallback" },
161160
},
162161
signature = {
163162
enabled = true,
163+
window = {
164+
direction_priority = { "s", "n" },
165+
},
164166
},
165167
sources = {
166-
completion = {
167-
enabled_providers = { "lsp", "path", "snippets", "buffer", "lazydev" },
168-
},
168+
default = { "lsp", "path", "snippets", "buffer", "lazydev" },
169+
cmdline = {},
169170
providers = {
170-
lsp = { fallback_for = { "lazydev" } },
171+
lsp = {
172+
fallbacks = { "lazydev" },
173+
score_offset = 10,
174+
},
171175
lazydev = { name = "LazyDev", module = "lazydev.integrations.blink" },
172176
snippets = {
173177
enabled = function(ctx)
@@ -179,19 +183,6 @@ return inject_all({
179183
},
180184
},
181185
},
182-
appearance = {
183-
use_nvim_cmp_as_default = true,
184-
kind_icons = {
185-
Interface = "",
186-
Keyword = "󰌋",
187-
Method = "󰆧",
188-
Operator = "󰆕",
189-
Reference = "",
190-
Snippet = "",
191-
Value = "󰎠",
192-
Variable = "󰂡",
193-
},
194-
},
195186
},
196187
},
197188

@@ -923,6 +914,68 @@ return inject_all({
923914
opts = {},
924915
},
925916

917+
{
918+
"folke/noice.nvim",
919+
main = "noice",
920+
event = "VeryLazy",
921+
keys = {
922+
{
923+
"<leader>n",
924+
function()
925+
require("noice").cmd("history")
926+
end,
927+
desc = "show message history",
928+
},
929+
},
930+
dependencies = {
931+
{ "MunifTanjim/nui.nvim" },
932+
},
933+
opts = {
934+
lsp = {
935+
hover = {
936+
silent = true,
937+
},
938+
override = {
939+
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
940+
["vim.lsp.util.stylize_markdown"] = true,
941+
},
942+
signature = {
943+
enabled = false,
944+
},
945+
},
946+
presets = {
947+
bottom_search = true,
948+
command_palette = true,
949+
},
950+
views = {
951+
mini = {
952+
timeout = 3000,
953+
},
954+
},
955+
routes = {
956+
{
957+
filter = {
958+
event = "msg_show",
959+
kind = "",
960+
find = "bytes",
961+
},
962+
opts = { skip = true },
963+
},
964+
{
965+
filter = {
966+
event = "msg_show",
967+
any = {
968+
{ find = "%d+L, %d+B" },
969+
{ find = "; after #%d+" },
970+
{ find = "; before #%d+" },
971+
},
972+
},
973+
view = "mini",
974+
},
975+
},
976+
},
977+
},
978+
926979
{
927980
"stevearc/quicker.nvim",
928981
event = "VeryLazy",
@@ -1617,7 +1670,8 @@ return inject_all({
16171670
opts = {
16181671
bash = { "shellcheck" },
16191672
go = { "golangcilint", "codespell" },
1620-
-- markdown = { 'vale', 'languagetool', },
1673+
markdown = { "proselint" },
1674+
text = { "proselint" },
16211675
nix = { "nix" },
16221676
-- yaml = { "yamllint" },
16231677
},
@@ -1631,12 +1685,6 @@ return inject_all({
16311685
end,
16321686
},
16331687

1634-
-- {
1635-
-- "yorickpeterse/nvim-pqf",
1636-
-- event = "VeryLazy", -- needs to be loaded before qf results are generated
1637-
-- opts = {},
1638-
-- },
1639-
16401688
{
16411689
"folke/lazydev.nvim",
16421690
ft = { "lua" },
@@ -1919,11 +1967,4 @@ return inject_all({
19191967
require("telescope").load_extension("undo")
19201968
end,
19211969
},
1922-
1923-
{
1924-
"zk-org/zk-nvim",
1925-
event = "VeryLazy",
1926-
main = "zk",
1927-
opts = {},
1928-
},
19291970
})

0 commit comments

Comments
 (0)