Merge branch 'main' of git.clustercockpit.org:moebiusband/dotfiles

dot_config/kitty/kitty.conf

@@ -7,11 +7,11 @@
 #: characters.
 
 # font_family Source Code Pro
-font_family BrutalistMono Nerd Font
+font_family BrutalistMono Nerd Font Regular
 # font_family Fira Code Medium
 # font_family Fira Code
 # font_family      Hack Regular
-# bold_font        auto
+bold_font BrutalistMono Nerd Font Regular
 # italic_font      auto
 # bold_italic_font auto
 
@@ -26,7 +26,7 @@ font_family BrutalistMono Nerd Font
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 18.0
+font_size 16.0
 
 #: Font size (in pts)
 

dot_config/nvim/after/plugin/lsp.lua.tmpl

@@ -15,6 +15,7 @@ require('mason-lspconfig').setup({
         'clangd',
         'gopls',
         'ltex',
+        'marksman',
         'svelte',
         'tsserver',
         'eslint',
@@ -193,7 +194,10 @@ lsp.gopls.setup {
     on_attach = on_attach
 }
 lsp.clangd.setup { on_attach = on_attach }
-lsp.ltex.setup { on_attach = on_attach }
+lsp.ltex.setup {
+    on_attach = on_attach,
+    filetypes = { "latex", "tex", "bib", "mkd", "gitcommit", "text" },
+    }
 lsp.svelte.setup { on_attach = on_attach }
 lsp.tsserver.setup { on_attach = on_attach }
 lsp.lua_ls.setup {

dot_config/nvim/after/plugin/treesitter.lua

@@ -73,24 +73,6 @@ treesitter.setup {
             goto_previous_end = {
                 ["[]"] = "@function.outer",
                 ["[C"] = "@class.outer",
-            },
-            -- Below will go to either the start or the end, whichever is closer.
-            -- Use if you want more granular movements
-            -- Make it even more gradual by adding multiple queries and regex.
-            goto_next = {
-                ["]d"] = "@conditional.outer",
-            },
-            goto_previous = {
-                ["[d"] = "@conditional.outer",
-            }
-        },
-        swap = {
-            enable = true,
-            swap_next = {
-                ["<leader>a"] = "@parameter.inner"
-            },
-            swap_previous = {
-                ["<leader>A"] = "@parameter.inner"
             }
         }
     },

dot_config/nvim/init.lua.tmpl

@@ -234,7 +234,7 @@ o.wildignore =
 'deps,.svn,CVS,.git,.hg,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.png,*.xpm,*.gif,.DS_Store,*.aux,*.out,*.toc'
 
 vim.cmd([[
-au BufRead,BufNewFile *.md          set ft=mkd tw=80 syntax=markdown
+au BufRead,BufNewFile *.md   set tw=80 syntax=markdown
 ]])
 
 vim.api.nvim_create_user_command('ReloadConfig', 'source $MYVIMRC', {})

dot_vimrc.tmpl

@@ -223,9 +223,9 @@ let g:tex_flavor = 'latex'
 " Productivity
 "#####################
 Plug 'fcpg/vim-waikiki' "{{ "{{{" }}
-let g:waikiki_roots = ['~/doc/vimwiki/']
+let g:waikiki_roots = ['~/doc/wiki/']
 let g:waikiki_default_maps = 1
-nn <Leader>ww :e ~/doc/vimwiki/index.md<cr>
+nn <Leader>ww :e ~/doc/wiki/index.md<cr>
 "{{ "}}}" }}
 Plug 'alok/notational-fzf-vim' "{{ "{{{" }}
 let g:nv_search_paths = ['~/doc/zettelkasten', '~/doc/wiki']

dot_zshrc.tmpl

@@ -80,7 +80,6 @@ export PATH=/opt/homebrew/bin:$PATH
 export PATH=/usr/local/opt/sqlite/bin:/usr/local/opt/ruby/bin:/usr/local/opt/mariadb@10.4/bin:$PATH
 {{- end }}
 {{- end }}
-alias vim=nvim
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh