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

This commit is contained in:
Jan Eitzinger 2023-07-11 13:25:01 +02:00
commit 806dd9080f
6 changed files with 11 additions and 26 deletions

View File

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

View File

@ -15,6 +15,7 @@ require('mason-lspconfig').setup({
'clangd', 'clangd',
'gopls', 'gopls',
'ltex', 'ltex',
'marksman',
'svelte', 'svelte',
'tsserver', 'tsserver',
'eslint', 'eslint',
@ -193,7 +194,10 @@ lsp.gopls.setup {
on_attach = on_attach on_attach = on_attach
} }
lsp.clangd.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.svelte.setup { on_attach = on_attach }
lsp.tsserver.setup { on_attach = on_attach } lsp.tsserver.setup { on_attach = on_attach }
lsp.lua_ls.setup { lsp.lua_ls.setup {

View File

@ -73,24 +73,6 @@ treesitter.setup {
goto_previous_end = { goto_previous_end = {
["[]"] = "@function.outer", ["[]"] = "@function.outer",
["[C"] = "@class.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"
} }
} }
}, },

View File

@ -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' 'deps,.svn,CVS,.git,.hg,*.o,*.a,*.class,*.mo,*.la,*.so,*.obj,*.swp,*.jpg,*.png,*.xpm,*.gif,.DS_Store,*.aux,*.out,*.toc'
vim.cmd([[ 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', {}) vim.api.nvim_create_user_command('ReloadConfig', 'source $MYVIMRC', {})

View File

@ -223,9 +223,9 @@ let g:tex_flavor = 'latex'
" Productivity " Productivity
"##################### "#####################
Plug 'fcpg/vim-waikiki' "{{ "{{{" }} Plug 'fcpg/vim-waikiki' "{{ "{{{" }}
let g:waikiki_roots = ['~/doc/vimwiki/'] let g:waikiki_roots = ['~/doc/wiki/']
let g:waikiki_default_maps = 1 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' "{{ "{{{" }} Plug 'alok/notational-fzf-vim' "{{ "{{{" }}
let g:nv_search_paths = ['~/doc/zettelkasten', '~/doc/wiki'] let g:nv_search_paths = ['~/doc/zettelkasten', '~/doc/wiki']

View File

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