mirror of https://gitlab.com/baco/dotconf.git
Merge branch 'main' into lazy-nvim
# Conflicts: # nvim/plugins.vim
This commit is contained in:
commit
b06b37a31c
|
@ -1,5 +1,14 @@
|
|||
<fontconfig>
|
||||
<!-- Override monospace detection for custom fonts -->
|
||||
<!-- Override monospace detection for custom fonts -->
|
||||
<!-- either raising the symbols-font immediately after default font -->
|
||||
<alias>
|
||||
<family>monospace</family>
|
||||
<prefer>
|
||||
<family>DejaVu Sans Mono</family>
|
||||
<family>Symbols Nerd Font Mono</family>
|
||||
</prefer>
|
||||
</alias>
|
||||
<!-- or using the patched version of the default font -->
|
||||
<match target="pattern">
|
||||
<test name="family" qual="any">
|
||||
<string>monospace</string>
|
||||
|
|
|
@ -47,6 +47,17 @@ Choose your favourite programming font (already patched) from `NerdFonts
|
|||
<https://www.nerdfonts.com/font-downloads>`_, install it on your system and set
|
||||
it as your terminal profile font.
|
||||
|
||||
Easier fix, yet (GNU/Linux only)
|
||||
''''''''''''''''''''''''''''''''
|
||||
|
||||
Just download from NerdFonts the Symbols Only variant (NerdFontsSymbolsOnly)
|
||||
and decompress it on your HOME in ``~/.local/share/fonts/``; then run
|
||||
``fc-cache -frv`` to cache the new glyphs and restart your terminal (or app).
|
||||
|
||||
If you still have some mismatched symbols on your system, you can prioritize
|
||||
the whole font *Symbols Nerd Font Mono* by symlinking
|
||||
``fontconfig/fonts.conf`` into ``~/.config/fontconfig/`` provided in this repo.
|
||||
|
||||
(Alternatively)
|
||||
~~~~~~~~~~~~~~~
|
||||
|
||||
|
|
|
@ -95,6 +95,7 @@ if exists('g:colors_name') && (g:colors_name == 'onedark'
|
|||
endif
|
||||
|
||||
" Misc
|
||||
set laststatus=3
|
||||
let g:airline#extensions#tabline#enabled = v:true
|
||||
let g:airline#extensions#tabline#buffer_min_count = 2
|
||||
let g:airline_mode_map = {
|
||||
|
@ -109,6 +110,7 @@ let g:airline_mode_map = {
|
|||
\ 's': 'S',
|
||||
\ }
|
||||
let g:airline#extensions#tagbar#flags = 'f' " Requires majutsushi/tagbar plugin
|
||||
let g:airline#extensions#nvimlsp#show_line_numbers = v:false
|
||||
if exists('g:colors_name') && g:colors_name == 'vscode'
|
||||
let g:airline_theme = 'codedark' " vscode.nvim doesn't provide one
|
||||
endif
|
||||
|
|
|
@ -25,5 +25,13 @@ vim.api.nvim_create_autocmd("LspAttach", {
|
|||
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
|
||||
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
|
||||
vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts)
|
||||
|
||||
vim.keymap.set("n", "<leader>f", function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end, opts)
|
||||
|
||||
vim.keymap.set("n", "<leader>ih", function()
|
||||
vim.lsp.inlay_hint.enable(opts.buffer, not vim.lsp.inlay_hint.is_enabled())
|
||||
end, opts)
|
||||
end,
|
||||
})
|
||||
|
|
|
@ -53,6 +53,7 @@ local plugins = {
|
|||
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
"nvim-treesitter/nvim-treesitter-context",
|
||||
}
|
||||
|
||||
local opts = {
|
||||
|
|
|
@ -19,3 +19,9 @@ require'nvim-treesitter.configs'.setup {
|
|||
},
|
||||
},
|
||||
}
|
||||
|
||||
require'treesitter-context'.setup {
|
||||
max_lines = 2,
|
||||
min_window_height = 32,
|
||||
trim_scope = "inner",
|
||||
}
|
||||
|
|
|
@ -22,4 +22,5 @@ Plug 'vim-airline/vim-airline', { 'dir': misc_dir .. '/start/vim-airline' }
|
|||
Plug 'ryanoasis/vim-devicons', { 'dir': misc_dir .. '/start/vim-devicons' }
|
||||
Plug 'majutsushi/tagbar', { 'dir': misc_dir .. '/start/tagbar' }
|
||||
Plug 'yuttie/comfortable-motion.vim', { 'dir': misc_dir .. '/start/comfortable-motion.vim' }
|
||||
Plug 'wellle/context.vim', { 'dir': misc_dir .. '/start/context.vim' }
|
||||
call plug#end()
|
||||
|
|
|
@ -103,4 +103,9 @@ let g:airline_mode_map = {
|
|||
\ 's': 'S',
|
||||
\ }
|
||||
let g:airline#extensions#tagbar#flags = 'f' " Requires majutsushi/tagbar plugin
|
||||
let g:airline#extensions#coc#stl_format_err = '%C'
|
||||
let g:airline#extensions#coc#stl_format_warn = '%C'
|
||||
let g:DevIconsEnableDistro = v:false
|
||||
|
||||
let g:context_max_height = 2
|
||||
let g:context_highlight_border = '<hide>'
|
||||
|
|
Loading…
Reference in New Issue