repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

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

ab16d0ce33a99efb732eeee8cd3a227eb32abcf8

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (7)

git/gitconfig

Modified
41 41 tool = nvim_merge
43 43 [mergetool]
44 - prompt = true
44 + keepBackup = false
45 + prompt = false
46 47 [mergetool "meld_merge"]
47 48 cmd = "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "

neovim/init.lua

Modified
9 9 -- ▀ ▀
11 11 -- setup debug mode
12 -local debug = require 'std.debug'
13 -debug.toggle()
12 +-- local debug = require 'std.debug'
13 +-- debug.toggle()
15 15 local ok, loaded
37 37 -- setup lsp clients
38 38 ok, loaded = pcall( require, 'bugabinga.lsp' )
39 39 if not ok then vim.print( 'error while loading lsp', loaded ) end

neovim/lazy-lock.json

Modified
2 2 "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3 3 "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
4 - "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" },
5 - "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" },
4 + "actions-preview.nvim": { "branch": "master", "commit": "5c240e6356156b72cfbf7c05feefadae61d7a06f" },
6 5 "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
7 6 "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
8 7 "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
20 19 "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
21 20 "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
22 21 "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" },
23 - "hlargs.nvim": { "branch": "main", "commit": "5995d199628ef9eba40e3699f9f635660f5d19f0" },
22 + "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" },
24 23 "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
25 24 "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
26 25 "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
27 26 "lush.nvim": { "branch": "main", "commit": "2e8d34e748642621d761a65e3c2a198154b914e8" },
28 27 "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
29 - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
28 + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
30 29 "mini.align": { "branch": "main", "commit": "f845218c5fea89e49074e48270dc5e1b9511a0f9" },
31 30 "mini.bracketed": { "branch": "main", "commit": "65c7dfb51e832de9e279e5d5b0741e7af6755ab5" },
32 31 "mini.colors": { "branch": "main", "commit": "f64963332f7fcb45c8dfcc243f682a9a0fb9935d" },
47 46 "nvim-spectre": { "branch": "master", "commit": "e7db8ebca7fd0a604027ebf85acee52f6642c91c" },
48 47 "nvim-surround": { "branch": "main", "commit": "8f2af76134f37058dc4c27a24bc5f86c9cae76dc" },
49 48 "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" },
50 - "nvim-treesitter": { "branch": "master", "commit": "ede5b461c9e11404b5ba0a2ba452fffaaf252907" },
49 + "nvim-treesitter": { "branch": "master", "commit": "db12bd416e2764420047e4a5d6b96fe44e4377d5" },
51 50 "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" },
52 51 "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
53 52 "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
57 56 "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
58 57 "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
59 58 "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
60 - "schemastore.nvim": { "branch": "main", "commit": "0358c7e159e5502361bf3971d89bf5133bcc2893" },
59 + "schemastore.nvim": { "branch": "main", "commit": "a93078f016d3216f4ab4e4c65306b65212314d8d" },
61 60 "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" },
62 61 "speedtyper.nvim": { "branch": "main", "commit": "2d158eed4c753995b0501a3a7a72464fbb213e3d" },
63 62 "ssr.nvim": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },
74 73 "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" },
75 74 "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
76 75 "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
77 -}

neovim/lua/bugabinga/options/ui.lua

Modified
54 54 nbsp = icon.nbsp,
57 +-- force english messages
58 +vim.cmd [[ language mes en_US ]]
57 60 -- do not spam the cmdline with every little input
58 61 vim.opt.showcmd = false
59 62 vim.opt.wildmode = 'list:longest'

neovim/lua/bugabinga/plugins/auto-dark-mode.lua

Modified
1 1 return {
2 2 'f-person/auto-dark-mode.nvim',
3 - priority = 1000,
4 - lazy = false,
3 + dev = true,
4 + event = 'VeryLazy',
5 5 opts = {
6 + -- interval of 0 freezes neovim on quit
7 + -- update_interval = 0,
6 8 update_interval = 5000,
9 + set_dark_mode=function()
10 + vim.opt.background = 'dark'
11 + end,
12 + set_light_mode=function()
13 + vim.opt.background = 'light'
14 + end,

neovim/lua/bugabinga/plugins/gen.lua

Modified
1 +require 'bugabinga.health'.add_dependency
2 +{
3 + name_of_executable = 'ollama',
4 +}
1 5 return {
2 6 'David-Kunz/gen.nvim',
3 7 cmd = 'Gen',

neovim/lua/bugabinga/plugins/treesitter.lua

Modified
5 5 name = 'CMake',
6 6 name_of_executable = 'cmake'
8 - {
9 - name_of_executable = 'make'
10 - }
11 - {
12 - name_of_executable = 'zig'
13 - }
14 - {
15 - name = 'TreeSitter CLI',
16 - name_of_executable = 'tree-sitter'
17 - }
18 - {
19 - name_of_executable = 'tar'
20 - }
8 +{
9 + name_of_executable = 'make'
12 + name_of_executable = 'zig'
15 + name = 'TreeSitter CLI',
16 + name_of_executable = 'tree-sitter'
19 + name_of_executable = 'tar'
22 22 return {
23 23 'nvim-treesitter/nvim-treesitter',