repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

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

7ac112c65b462aa985bb3e98ed9200391a3df28c

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (20)

git/gitconfig

Modified
10 10 safecrlf = false
11 11 symlinks = true
12 12 fscache = true
13 + preloadIndex = true
14 15 [help]
15 16 format = html

neovim/README.md

Modified
39 39 # todo
41 +* try loading lsp async for better startup perf
41 42 * check out vim-dadbod for sql workflows
42 43 * navic highlights do not fit winbar
43 44 * make highlights more visible when expanding snippets

neovim/lazy-lock.json

Modified
70 70 "treesj": { "branch": "main", "commit": "e1e82ab4237619d342c7102c9f13d4b9833bfd39" },
71 71 "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
72 72 "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" },
73 + "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
73 74 "vim-vscode-snippets": { "branch": "master", "commit": "812e60d1c648f889328761ec71daff09d1eb3177" },
74 75 "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" },
75 76 "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" },
76 77 "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
77 -}

neovim/lua/bugabinga/diagnostic.lua

Modified
18 18 local diagnostic = vim.diagnostic
19 -diagnostic.disable( 0 )
19 +diagnostic.enable(false)
21 21 auto 'disable_diagnostic_initially' {
22 22 description = 'Disable Diagnostics initially, when attaching an LSP client to a buffer',
23 23 events = 'LspAttach',
24 - command = function () diagnostic.disable( 0 ) end,
24 + command = function () diagnostic.enable(false, { bufnr = 0 } ) end,
27 27 local diagnostic_format = function ( context )
75 75 category = 'diagnostic',
76 76 keys = '<leader>td',
77 77 command = function ()
78 - if diagnostic.is_disabled( 0 ) then
79 - diagnostic.enable( 0 )
78 + if not diagnostic.is_enabled() then
79 + diagnostic.enable()
80 80 vim.notify 'Enabling Diagnostics'
82 - diagnostic.disable( 0 )
82 + diagnostic.enable(false)
83 83 vim.notify 'Disabling Diagnostics'

neovim/lua/bugabinga/lsp/init.lua

Modified
371 371 description = 'Show incoming calls of symbol under cursor.',
372 372 category = 'lsp',
373 373 buffer = bufnr,
374 - keys = '<leader>lci',
374 + keys = '<leader>lc',
375 375 command = vim.lsp.buf.incoming_calls,
379 379 description = 'Show outgoing calls of symbol under cursor.',
380 380 category = 'lsp',
381 381 buffer = bufnr,
382 - keys = '<leader>lco',
382 + keys = '<leader>lC',
383 383 command = vim.lsp.buf.outgoing_calls,

neovim/lua/bugabinga/options/keymaps.lua

Modified
166 166 map.normal {
167 167 description = 'Toggle ' .. option_name .. ' option',
168 168 category = 'options',
169 - keys = '<leader>to' .. first_char,
169 + keys = '<leader>t' .. first_char,
170 170 command = function ()
171 171 toggler:toggle()

neovim/lua/bugabinga/options/ui.lua

Modified
127 127 vim.opt.guicursor = 'n-v-c-sm:block-Cursor,i-ci-ve:ver25-blinkon250,r-cr:hor20,o:hor50'
129 129 -- font
130 -vim.opt.guifont = 'Cousine,Symbols Nerd Font Mono:h16:#e-subpixelantialias:#h-none'
130 +vim.opt.guifont = 'Cousine,Symbols Nerd Font Mono:h15:#e-subpixelantialias:#h-none'
132 132 -- neovide only options
133 133 if vim.g.neovide then

neovim/lua/bugabinga/plugins/heirline.lua

Modified
225 225 local lsp_active = {
226 - condition = conditions.lsp_attached,
226 + -- condition = conditions.lsp_attached,
227 + condition = function() vim.lsp.buf_is_attached() end,
227 228 -- FIXME: updates from parent components do not seem to update children,
228 229 -- if those have their own updates?
229 230 update = { "LspAttach", "LspDetach", "BufEnter", "BufLeave" },
337 338 local diagnostic_enabled = {
338 339 init = function(self)
339 - self.icon = vim.diagnostic.is_disabled() and icon.toggle_off or icon.toggle_on
340 + self.icon = (not vim.diagnostic.is_enabled()) and icon.toggle_off or icon.toggle_on
341 342 provider = function(self)
342 343 return icon.diagnostic .. " " .. self.icon

neovim/lua/bugabinga/plugins/luasnip.lua

Modified
25 25 callback = function ()
26 26 vim.cmd.LuaSnipUnlinkCurrent { mods = { emsg_silent = true, }, }
27 27 if has_vim_snippet then
28 - snippet.exit()
28 + snippet.stop()

neovim/lua/bugabinga/plugins/startuptime.lua

Added
new file mode 100644
1 +-- TODO: rewrite this in lua?
2 +return {
3 + 'dstein64/vim-startuptime',
4 + cmd = 'StartupTime',
5 +}

neovim/lua/bugabinga/plugins/telescope.lua

Modified
126 126 hidden = true,
127 127 prompt_prefix = icon.telescope .. ' ',
128 128 selection_caret = icon.arrow_right .. ' ',
129 + path_display = {'shorten'},
130 + dynamic_preview_title = true,
129 131 file_ignore_patterns = {
130 - '.git/',
131 - '.svn/',
132 - '.cache',
133 - '%.o',
134 - '%.a',
135 - '%.out',
136 - '%.class',
132 + '%.git/',
133 + '%.git/',
134 + '%.svn\\',
135 + '%.svn\\',
137 136 '%.pdf',
138 137 '%.mkv',
139 138 '%.mp4',

neovim/lua/bugabinga/plugins/treesitter.lua

Modified
178 178 enable = true,
179 179 disable = should_disable,
180 180 swap_next = {
181 - ['<leader>rwn'] = { query = '@parameter.inner', desc = 'Swap parameter with next', },
181 + ['<leader>rn'] = { query = '@parameter.inner', desc = 'Swap parameter with next', },
183 183 swap_previous = {
184 - ['<leader>rwp'] = { query = '@parameter.inner', desc = 'Swap parameter with previous', },
184 + ['<leader>rp'] = { query = '@parameter.inner', desc = 'Swap parameter with previous', },
191 191 border = vim.g.border_style,
192 192 floating_preview_opts = {},
193 193 peek_definition_code = {
194 - ['<leader>lpf'] = { query = '@function.outer', desc = 'Peek definition of outer function.', },
195 - ['<leader>lpc'] = { query = '@class.outer', desc = 'Peek definition of outer class.', },
194 + ['<leader>lp'] = { query = '@function.outer', desc = 'Peek definition of outer function.', },
195 + ['<leader>lP'] = { query = '@class.outer', desc = 'Peek definition of outer class.', },
227 227 mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
228 228 -- Separator between context and content. Should be a single character string, like '-'.
229 229 -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
230 - separator = nil,
230 + separator = '-',
231 231 zindex = 20, -- The Z-index of the context window
232 232 on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching

neovim/lua/bugabinga/plugins/whichkey.lua

Modified
50 50 v = { name = '|v|ersion control', _ = 'which_key_ignore', },
51 51 s = { name = '|s|essions', _ = 'which_key_ignore', },
52 52 r = { name = '|r|efactor', _ = 'which_key_ignore', },
53 - w = { name = 's|w|ap', _ = 'which_key_ignore',
54 - {
55 - p = { name = '|p|arameter', _ = 'which_key_ignore', },
56 - },
57 - },
58 - l = { name = '|l|sp', _ = 'which_key_ignore',
59 - p = { name = '|p|eek', _ = 'which_key_ignore', },
60 - c = { name = '|c|alls', _ = 'which_key_ignore', },
61 - },
62 - t = { name = '|t|oggle', _ = 'which_key_ignore',
63 - {
64 - o = { name = '|o|ptions', _ = 'which_key_ignore', },
65 - },
66 - },
53 + t = { name = '|t|oggle', _ = 'which_key_ignore', },
54 + w = { name = 's|w|ap', _ = 'which_key_ignore', },
67 55 z = { name = 'la|z|y', _ = 'which_key_ignore', },
68 56 [' '] = { name = 'fun', _ = 'which_key_ignore', },
57 + {
58 + p = { name = '|p|arameter', _ = 'which_key_ignore', },
59 + },
60 + l = { name = '|l|sp', _ = 'which_key_ignore',
61 + c = { name = '|c|alls', _ = 'which_key_ignore', },
62 + },
71 65 end,

neovim/spell/nerd.utf-8.add

Modified
62 62 href
63 63 DocumentUri
64 64 sinnfrei
65 +Asciidoc
66 +AsciidocFX

neovim/spell/nerd.utf-8.add.spl

Modified

Previous version contains binary or non-UTF-8 data.

Current version contains binary or non-UTF-8 data.

ssh/config

Modified
15 15 User oli
16 16 IdentityFile ~/.ssh/seaduck.key
18 +Host artifactory
19 + Hostname artifactory.isp-insoft.de
20 + User java
18 22 # catch-all pattern
19 23 Host *
20 24 User root

subversion/config

Modified
51 51 ### Set diff-cmd to the absolute path of your 'diff' program.
52 52 ### This will override the compile-time default, which is to use
53 53 ### Subversion's internal diff implementation.
54 -diff-cmd = /home/oli/.subversion/diff
54 +#diff-cmd = /home/oli/.subversion/diff
55 55 ### Diff-extensions are arguments passed to an external diff
56 56 ### program or to Subversion's internal diff implementation.
57 57 ### Set diff-extensions to override the default arguments ('-u').
59 59 ### Set diff3-cmd to the absolute path of your 'diff3' program.
60 60 ### This will override the compile-time default, which is to use
61 61 ### Subversion's internal diff3 implementation.
62 -diff3-cmd = /home/oli/.subversion/diff3
62 +#diff3-cmd = /home/oli/.subversion/diff3
63 63 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
64 64 ### accepts the '--diff-program' option.
65 65 # diff3-has-program-arg = no
66 66 ### Set merge-tool-cmd to the command used to invoke your external
67 67 ### merging tool of choice. Subversion will pass 5 arguments to
68 68 ### the specified command: base theirs mine merged wcfile
69 -merge-tool-cmd = /home/oli/.subversion/merge
69 +#merge-tool-cmd = /home/oli/.subversion/merge
71 71 ### Section for configuring tunnel agents.
72 72 [tunnels]

subversion/config.win32

Modified
51 51 ### Set diff-cmd to the absolute path of your 'diff' program.
52 52 ### This will override the compile-time default, which is to use
53 53 ### Subversion's internal diff implementation.
54 -diff-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff.bat
54 +#diff-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff.bat
55 55 ### Diff-extensions are arguments passed to an external diff
56 56 ### program or to Subversion's internal diff implementation.
57 57 ### Set diff-extensions to override the default arguments ('-u').
59 59 ### Set diff3-cmd to the absolute path of your 'diff3' program.
60 60 ### This will override the compile-time default, which is to use
61 61 ### Subversion's internal diff3 implementation.
62 -diff3-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff3.bat
62 +#diff3-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff3.bat
63 63 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
64 64 ### accepts the '--diff-program' option.
65 65 # diff3-has-program-arg = no
66 66 ### Set merge-tool-cmd to the command used to invoke your external
67 67 ### merging tool of choice. Subversion will pass 5 arguments to
68 68 ### the specified command: base theirs mine merged wcfile
69 -merge-tool-cmd = C:/Users/okr/AppData/Roaming/Subversion/merge.bat
69 +#merge-tool-cmd = C:/Users/okr/AppData/Roaming/Subversion/merge.bat
71 71 ### Section for configuring tunnel agents.
72 72 [tunnels]

wezterm/bugabinga/workspaces.lua

Modified
4 4 local wez = require 'wezterm'
5 5 local mux = wez.mux
6 6 local win32 = wez.target_triple:find'windows'
8 8 local get_my_code_workspace = function()
9 9 if win32 then
10 - return 'W:'
10 + return 'W:/'
11 11 else
12 12 return os.getenv 'HOME' .. '/Workspace'
26 26 local dork_ws = 'dorkfiles editing'
27 27 local dork_cwd = WORKSPACE .. '/dotfiles'
28 28 local dork_tab, dork_pane, dork_window = mux.spawn_window { cwd = dork_cwd, workspace = dork_ws }
29 - local dork_top_pane = dork_pane:split { cwd = dork_cwd, direction = 'Top', size = 0.42 }
30 - dork_top_pane:split { cwd = dork_cwd, direction = 'Left', size = 0.69 }
29 + local dork_top_pane = dork_pane:split { cwd = dork_cwd, direction = 'Top', size = 0.69 }
30 + dork_top_pane:split { cwd = dork_cwd, direction = 'Left', size = 0.42 }
31 31 dork_tab:set_title 'Dorkfiles Editing'
32 33 local wezterm_config_tab = dork_window:spawn_tab { cwd = dork_cwd .. '/wezterm' }
33 34 wezterm_config_tab:set_title 'Wezterm'
34 35 wezterm_config_tab:active_pane():split { cwd = dork_cwd .. '/wezterm', direction = 'Left', size = 0.69 }
35 - local helix_config_tab = dork_window:spawn_tab { cwd = dork_cwd .. '/neovim' }
36 - helix_config_tab:set_title 'Neovim'
37 - helix_config_tab:active_pane():split { cwd = dork_cwd .. '/neovim', direction = 'Left', size = 0.69 }
37 + local nvim_config_tab = dork_window:spawn_tab { cwd = dork_cwd .. '/neovim' }
38 + nvim_config_tab:set_title 'Neovim'
39 + nvim_config_tab:active_pane():split { cwd = dork_cwd .. '/neovim', direction = 'Left', size = 0.69 }
40 41 local code_ws = 'code'
41 42 local code_cwd = WORKSPACE
42 43 local code_tab, code_pane, code_window = mux.spawn_window { cwd = code_cwd, workspace = code_ws }
43 44 local code_top_pane = code_pane:split { cwd = code_cwd, direction = 'Top', size = 0.69 }
44 - code_pane:split { cwd = code_cwd, direction = 'Right', size = 0.69 }
45 + code_pane:split { cwd = code_cwd, direction = 'Right', size = 0.42 }
45 46 code_tab:set_title 'Code'
46 47 code_top_pane:activate()
48 49 local default_ws = 'default'
49 50 local default_cwd = wez.home_dir
50 51 local default_tab, default_pane, default_window = mux.spawn_window { cwd = default_cwd, workspace = default_ws }
51 - local default_top_pane = default_pane:split { cwd = default_cwd, direction = 'Top', size = 0.42 }
52 + local default_top_pane = default_pane:split { cwd = default_cwd, direction = 'Top', size = 0.69 }
52 53 default_pane:split { cwd = default_cwd, direction = 'Right', size = 0.42 }
53 54 default_top_pane:split { cwd = default_cwd, direction = 'Right', size = 0.42 }
54 - default_window:spawn_tab { args = { 'btm' } }
55 55 default_tab:set_title 'Default'
56 56 default_top_pane:activate()
67 67 -- e.g. /run/user/1000/wezterm/log
68 68 wez.on('mux-startup', function()
69 69 setup_workspaces()
70 + maximize_window()
70 71 end)

wezterm/wezterm.lua

Modified
18 18 font_size = 13
19 19 enable_wayland = true
20 20 elseif hostname == 'NB-00718' then
21 - font_size = 19
21 + font_size = 15
22 22 elseif hostname == 'fedora' then
23 23 font_size = 13
24 24 local font_names = {}
100 100 default_cursor_style = 'SteadyBlock',
102 102 exec_domains = exec_domains,
103 - unix_domains = {
104 - {
105 - name = 'mux'
106 - }
107 - },
103 + unix_domains = { { name = 'mux' } },
108 104 default_gui_startup_args = { 'connect', 'mux' },
110 106 font = font,