repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

Merge branch 'trunk' of github.com:bugabinga/dotfiles into trunk

35a26b724f226430cdb3f360ba5c59019d62652e

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (8)

neovim/lua/bugabinga/lsp/init.lua

Modified
13 13 local _ = {}
16 -local token_update = function ( lsp_client )
15 +local token_update = function ( lsp_client )
17 16 local token = lsp_client.data.token
18 17 local buffer = lsp_client.buffer
19 18 local client_id = lsp_client.data.client_id
29 28 --* closures that capture something
32 -local expand_path = function ( path )
31 +local expand_path = function ( path )
33 32 if vim.fn.executable( path ) == 1 then
34 33 return vim.fn.exepath( path )
40 -local expand_command = function ( command )
39 +local expand_command = function ( command )
41 40 vim.validate { command = { command, { 'string', 'table' } } }
43 42 if type( command ) == 'table' then
48 47 return expand_path( command )
51 -local lsp_start = function ( file_type_event )
50 +local lsp_start = function ( file_type_event )
52 51 dbg.print 'trying to start lsp'
53 52 local match = file_type_event.match
235 234 local old_omnifunc
236 235 local old_tagfunc
238 -local keybinds = {}
239 -local add = function ( client_id, keybind_remover )
237 +local keybinds = {}
238 +local add = function ( client_id, keybind_remover )
240 239 vim.validate {
241 240 client_id = { client_id, 'number' },
242 241 keybind_remover = { keybind_remover, 'function' },
247 246 table.insert( keybinds[client_id], keybind_remover )
250 -local lsp_attach = function ( args )
249 +-- FIXME: move to own file with LspAttach instead, so that those settings are
250 +-- applied to all LSPs, not only those managed by my configs.
251 +local lsp_attach = function ( args )
251 252 local bufnr = args.buf
252 253 local client_id = args.data.client_id
253 254 local client = vim.lsp.get_client_by_id( client_id )
273 274 if client.server_capabilities.documentHighlightProvider then
275 + -- FIXME: there is an incubating pluging, that adds [r ]r bindings to navigate
276 + -- highlighted references.
277 + -- steal those, improve the debouncing below (i still see dubbel highlights sometimes)
278 + -- and then remove plugin.
274 279 -- the timer has application lifetime. no need to close
275 - local delay = 300
276 - local debounced_highlight = defer.debounce_leading( vim.lsp.buf.document_highlight, delay )
277 - local debounced_clear = defer.debounce_leading( vim.lsp.buf.clear_references, delay )
279 - auto 'document_highlight' {
280 - {
281 - description = 'Highlight symbol under cursor on hold',
282 - events = 'CursorHold',
283 - buffer = bufnr,
284 - command = debounced_highlight,
285 - },
286 - {
287 - description = 'Remove highlight from symbol under cursor on move',
288 - events = { 'CursorMoved', 'InsertEnter' },
289 - buffer = bufnr,
290 - command = debounced_clear,
291 - },
292 - }
280 + -- local delay = 300
281 + -- local debounced_highlight = defer.debounce_leading( vim.lsp.buf.document_highlight, delay )
282 + -- local debounced_clear = defer.debounce_leading( vim.lsp.buf.clear_references, delay )
283 + --
284 + -- auto 'document_highlight' {
285 + -- {
286 + -- description = 'Highlight symbol under cursor on hold',
287 + -- events = 'CursorHold',
288 + -- buffer = bufnr,
289 + -- command = debounced_highlight,
290 + -- },
291 + -- {
292 + -- description = 'Remove highlight from symbol under cursor on move',
293 + -- events = { 'CursorMoved', 'InsertEnter' },
294 + -- buffer = bufnr,
295 + -- command = debounced_clear,
296 + -- },
297 + -- }
295 300 if client.server_capabilities.inlayHintProvider then
380 -local lsp_detach = function ( args )
385 +local lsp_detach = function ( args )
381 386 dbg.print( 'DETACH LSP', args )
383 388 local bufnr = args.buf
507 512 completion_kinds[i] = completion_icons[kind] or kind
516 +-- style the lsp hover window
517 +vim.lsp.handlers['textDocument/hover'] = vim.lsp.with(
518 + vim.lsp.handlers.hover, {
519 + border = vim.g.border_style,
520 + title = ' ' .. icon.hover .. ' ',
510 524 return setmetatable( _, {} )

neovim/lua/bugabinga/nugu/init.lua

Modified
42 42 vim.g.terminal_color_14 = ui_important_global -- aqua
43 43 vim.g.terminal_color_15 = ui_normal -- white
46 45 local set_group_properties = function ( self, properties )
47 46 vim.validate {
48 47 properties = { properties, 'table' },
107 106 local link_group = function ( self, key, value )
108 107 -- vim.print( 'linking group', self, key, value )
109 108 local group = add_group( self, key )
110 - for name, link_group in pairs( self.groups ) do
111 - if link_group == value then
109 + for name, group_link in pairs( self.groups ) do
110 + if group_link == value then
112 111 -- vim.print( 'found group to link ' .. name .. ' to ' .. key )
113 112 group.link = name
114 113 return group
131 130 _.Search { bg = content_unfocus }
132 131 _.IncSearch { fg = content_focus }
133 132 _.CurSearch { fg = content_important_global, bg = content_unfocus }
134 -_.NormalFloat { fg = ui_normal, bg = ui_backdrop }
135 -_.FloatBorder { fg = _.NormalFloat.bg, bg = _.NormalFloat.bg }
133 +_.NormalFloat = _.Normal
134 +_.FloatBorder { fg = ui_accent, bg = _.Normal.bg }
136 135 _.ColorColumn { fg = ui_important_global, bg = _.Normal.bg }
137 136 _.Conceal { fg = content_focus, bg = _.Normal.bg }
138 137 _.Cursor { bg = ui_accent }
152 151 _.FoldColumn = _.LineNr
153 152 _.SignColumn = _.LineNr
154 153 _.ModeMsg { bold = true }
155 -_.MsgArea = _.Normal
154 +_.MsgArea = _.StatusLine
156 155 _.MsgSeparator = _.Debug
157 156 _.MoreMsg = _.Normal
158 157 _.NonText { fg = content_unfocus }
175 174 _.WinbarNC { fg = ui_minor, bg = _.LineNr.bg }
176 175 _.Title { fg = content_important_global, sp = content_important_global, bold = true, underline = true }
177 176 _.TabLine = _.StatusLine
178 -_.TabLineFill { fg = _.TabLine.fg, bg = content_backdrop }
179 -_.TabLineSel { fg = ui_important_global, bg = ui_unfocus }
177 +_.TabLineFill = _.StatusLine
178 +_.TabLineSel { fg = ui_important_global, bold = true, underline = true }
180 179 _.Visual { bg = content_unfocus }
181 180 _.VisualNOS { bg = ui_unfocus }
182 181 _.WarningMsg { fg = warning, bold = true }
203 202 _.Parameter { fg = content_focus }
204 203 _.Exception = _.Statement
206 -_.PreProc { fg = content_important_global, bg = content_unfocus, bold = true }
205 +_.PreProc { fg = content_important_global, bold = true }
207 206 _.Include = _.PreProc
208 207 _.Define = _.PreProc
209 208 _.Macro = _.PreProc
256 255 _.LspReferenceRead = _.LspReferenceText
257 256 _.LspReferenceWrite = _.LspReferenceText
258 257 _.LspInlayHint { fg = content_minor, bg = _.Normal.bg }
258 +_.LspSignatureActiveParameter = _.Debug
260 260 _['@text.literal'] = _.Comment
261 261 _['@text.reference'] = _.Identifier
306 306 _['@debug'] = _.Debug
307 307 _['@tag'] = _.Tag
309 -_['@markup.raw.block'] = _.PreProc
310 -_['@markup.raw.block.vimdoc'] = _.Normal
309 +_['@markup.raw.block'] { bg = content_backdrop }
310 +-- _['@markup.raw.block.markdown'] { fg = ui_normal, bg = ui_backdrop }
311 +-- _['@markup.raw.block.vimdoc'] { fg = ui_normal, bg = ui_backdrop }
312 313 _['@lsp.type.namespace'] = _['@namespace']
313 314 _['@lsp.type.type'] = _['@type']

neovim/lua/bugabinga/options/ui.lua

Modified
108 108 vim.opt.winblend = 0
110 110 -- use this in various places for consistent border style
111 -vim.g.border_style = 'solid'
111 +vim.g.border_style = 'single'
113 113 -- hide the mode indicator in status
114 114 vim.opt.showmode = false

neovim/lua/bugabinga/plugins/incubator.lua

Modified
16 16 lazy = false,
17 17 version = '2.0',
18 18 config = true,
19 - enable = FUCK_STABILITY,
19 + enabled = FUCK_STABILITY,
21 21 -------------------------------------------------------------------------------
36 - enable = FUCK_STABILITY,
36 + enabled = FUCK_STABILITY,
38 38 -------------------------------------------------------------------------------
52 52 position = 'right',
53 53 width = 69,
55 - enable = FUCK_STABILITY,
55 + enabled = FUCK_STABILITY,
57 57 -------------------------------------------------------------------------------
64 64 keys = { ']r', '[r' },
65 65 opts = {},
66 - enable = FUCK_STABILITY,
66 + enabled = FUCK_STABILITY,
68 68 -------------------------------------------------------------------------------
78 78 opts = {
79 79 debug = true, -- Enable debugging
81 - enable = FUCK_STABILITY,
81 + enabled = FUCK_STABILITY,
83 83 -------------------------------------------------------------------------------
85 + -- TODO: this is pretty great! i just need better binds and tell which key about them
85 86 'chrisgrieser/nvim-rulebook',
86 87 keys = {
87 88 { '<leader>ri', function () require 'rulebook'.ignoreRule() end },
89 90 { '<leader>ry', function () require 'rulebook'.yankDiagnosticCode() end },
90 91 { '<leader>sf', function () require 'rulebook'.suppressFormatter() end, mode = { 'n', 'x' } },
92 - enable = FUCK_STABILITY,
93 + enabled = FUCK_STABILITY,
94 95 -------------------------------------------------------------------------------
96 97 'chrisgrieser/nvim-dr-lsp',
97 98 event = 'LspAttach',
98 99 opts = {},
99 - enable = FUCK_STABILITY,
100 + enabled = FUCK_STABILITY,
101 102 -------------------------------------------------------------------------------
103 104 'Wansmer/symbol-usage.nvim',
104 105 event = 'LspAttach',
105 106 opts = {},
106 - enable = FUCK_STABILITY,
107 + enabled = FUCK_STABILITY,
108 109 -------------------------------------------------------------------------------
114 115 init = function ()
115 116 vim.o.mousemoveevent = true
117 - enable = FUCK_STABILITY,
118 + enabled = FUCK_STABILITY,
119 120 -------------------------------------------------------------------------------
127 128 desc = 'Show time spent',
130 - enable = FUCK_STABILITY,
131 + enabled = FUCK_STABILITY,
132 133 -------------------------------------------------------------------------------
143 144 desc = 'telescope: Show recently and frequently used files.',
146 - enable = FUCK_STABILITY,
147 + enabled = FUCK_STABILITY,
150 151 'cenk1cenk2/scratch.nvim',
151 - enable = FUCK_STABILITY,
152 + enabled = FUCK_STABILITY,
153 154 -------------------------------------------------------------------------------
156 157 lazy = false,
157 158 build = 'cargo build --release',
158 159 opts = {},
159 - enable = FUCK_STABILITY,
160 + enabled = false,
161 + -- this one is not ready yet, but looks promising
161 163 -------------------------------------------------------------------------------
169 171 opts = {
170 172 root_key = 'ms',
172 - enable = FUCK_STABILITY,
174 + enabled = FUCK_STABILITY,
174 176 -------------------------------------------------------------------------------
178 180 config = function ()
179 181 require 'tiny-inline-diagnostic'.setup()
181 - enable = FUCK_STABILITY,
183 + enabled = FUCK_STABILITY,
183 185 -------------------------------------------------------------------------------
186 188 lazy = false,
187 189 dependencies = { 'winston0410/cmd-parser.nvim' },
188 190 opts = { highlight = 'Visual' },
189 - enable = FUCK_STABILITY,
191 + enabled = FUCK_STABILITY,
191 193 -------------------------------------------------------------------------------
203 205 padding = 2,
206 - enable = FUCK_STABILITY,
208 + enabled = FUCK_STABILITY,
208 210 -------------------------------------------------------------------------------
211 213 'zbirenbaum/neodim',
212 214 event = 'LspAttach',
213 215 opts = {},
214 - enable = FUCK_STABILITY,
216 + enabled = FUCK_STABILITY,
216 218 -------------------------------------------------------------------------------
218 220 'rafcamlet/nvim-luapad',
219 221 cmd = { 'Luapad', 'LuaRun' },
220 222 opts = {},
221 - enable = FUCK_STABILITY,
223 + enabled = FUCK_STABILITY,
224 226 -------------------------------------------------------------------------------
226 228 'ravibrock/spellwarn.nvim',
227 229 event = 'VeryLazy',
228 230 config = true,
229 - enable = FUCK_STABILITY,
231 + enabled = FUCK_STABILITY,
231 233 -------------------------------------------------------------------------------
234 236 config = function ()
235 237 require 'decisive'.setup {}
237 - lazy = true,
238 239 ft = { 'csv' },
239 240 keys = {
240 241 { '<leader>cca', ":lua require('decisive').align_csv({})<cr>", { silent = true }, desc = 'Align CSV', mode = 'n' },
242 243 { '[c', ":lua require('decisive').align_csv_prev_col()<cr>", { silent = true }, desc = 'Align CSV prev col', mode = 'n' },
243 244 { ']c', ":lua require('decisive').align_csv_next_col()<cr>", { silent = true }, desc = 'Align CSV next col', mode = 'n' },
245 - enable = FUCK_STABILITY,
246 + enabled = FUCK_STABILITY,
247 248 -------------------------------------------------------------------------------
273 274 disabled_fts = ignored.filetypes,
275 - enable = FUCK_STABILITY,
276 + enabled = FUCK_STABILITY,
277 278 -------------------------------------------------------------------------------
291 292 { path = 'wezterm-types', mods = { 'wezterm' } },
294 - enable = FUCK_STABILITY,
295 + enabled = FUCK_STABILITY,
297 298 'shortcuts/no-neck-pain.nvim',
298 299 lazy = false,
299 - enable = FUCK_STABILITY,
300 + enabled = FUCK_STABILITY,
301 302 -------------------------------------------------------------------------------
304 305 -- NOTE: if this one does not work out, check https://github.com/Wansmer/sibling-swap.nvim
305 306 'mizlan/iswap.nvim',
306 307 event = 'VeryLazy',
307 - enable = FUCK_STABILITY,
308 + enabled = FUCK_STABILITY,
309 310 -------------------------------------------------------------------------------
382 - enable = FUCK_STABILITY,
383 + enabled = FUCK_STABILITY,

neovim/lua/bugabinga/plugins/whichkey.lua

Modified
18 18 event = 'VeryLazy',
19 19 opts = {
20 20 icons = {
21 - group = icon.group,
21 + group = icon.group .. ' ',
22 22 keys = {
23 23 CR = icon.return_key,
24 24 Esc = icon.esc_key,
39 39 debug = dbg.get(),
40 40 spec = {
41 - { '<leader> ', group = 'fun' },
42 - { '<leader>b', group = '|b|uffer' },
43 - { '<leader>f', group = '|f|iles' },
44 - { '<leader>j', group = '|j|oin' },
45 - { '<leader>l', group = '|l|sp' },
46 - { '<leader>lc', group = '|c|alls' },
47 - { '<leader>t', group = '|t|oggle' },
48 - { '<leader>v', group = '|v|ersion control' },
49 - { '<leader>z', group = 'la|z|y' },
41 + { '<leader> ', group = 'fun' },
43 + { '<leader>b', group = 'Buffers' },
44 + { '<leader>f', group = 'Files' },
45 + { '<leader>j', group = 'Join' },
46 + { '<leader>l', group = 'Lsp' },
47 + { '<leader>t', group = 'Toggle' },
48 + { '<leader>v', group = 'Version control' },
49 + { '<leader>z', group = 'laZy' },

neovim/lua/std/icon.lua

Modified
40 40 global = '󱥔',
41 41 group = '',
42 42 hash = '',
43 + hover = '󰟂',
43 44 hint = '',
44 45 info = '󰩖',
45 46 insert = '',

wezterm/bugabinga/code_fonts.csv

Modified
81 81 1, ProggyCleanTT
82 82 1, ProggyCleanTTSZ
83 83 1, ProggySmallTT
84 -1, ProggySquareTT
84 +0, ProggySquareTT
85 85 1, ProggySquareTTSZ
86 86 1, ProggyTinyTT
87 87 1, ProggyTinyTTSZ
99 99 1, TeX Gyre Cursor
100 100 1, Terminus
101 101 1, Ubuntu Mono
102 -1, Verily Serif Mono
102 +0, Verily Serif Mono
103 103 1, Victor Mono
104 104 1, Whois
105 105 1, agave
108 108 1, monofur
109 109 1, mononoki
110 110 0, saxMono

wezterm/bugabinga/window.lua

Modified
1 1 return function ( cfg )
2 2 cfg.window_decorations = 'RESIZE'
3 3 cfg.enable_wayland = true
4 + cfg.use_resize_increments = true
4 5 cfg.window_padding = {
5 - left = 2,
6 - right = 2,
7 - top = 2,
6 + left = 0,
7 + right = 0,
8 + top = 0,
8 9 bottom = 0,