feat(Fish, Nvim): Update Nvim Config and Uninstalll zvm
This commit is contained in:
parent
f8ba8baac3
commit
6f7abe4640
2 changed files with 22 additions and 6 deletions
|
@ -8,3 +8,6 @@ set -gxa PATH $HOME/.local/share/bob/nvim-bin
|
||||||
set -gx PYENV_ROOT $HOME/.pyenv
|
set -gx PYENV_ROOT $HOME/.pyenv
|
||||||
set -gxa PATH $PYENV_ROOT/bin
|
set -gxa PATH $PYENV_ROOT/bin
|
||||||
set -gxa PATH $PYENV_ROOT/shims
|
set -gxa PATH $PYENV_ROOT/shims
|
||||||
|
#set -gx ZVM_INSTALL $HOME/.zvm/self
|
||||||
|
#set -gxa PATH $PATH:$HOME/.zvm/bin
|
||||||
|
#set -gxa PATH $PATH:$ZVM_INSTALL/
|
||||||
|
|
|
@ -133,12 +133,10 @@ require('lazy').setup({
|
||||||
|
|
||||||
{ -- Add indentation guides even on blank lines
|
{ -- Add indentation guides even on blank lines
|
||||||
'lukas-reineke/indent-blankline.nvim',
|
'lukas-reineke/indent-blankline.nvim',
|
||||||
|
main = 'ibl',
|
||||||
-- Enable `lukas-reineke/indent-blankline.nvim`
|
-- Enable `lukas-reineke/indent-blankline.nvim`
|
||||||
-- See `:help indent_blankline.txt`
|
-- See `:help indent_blankline.txt`
|
||||||
opts = {
|
opts = {},
|
||||||
char = '┊',
|
|
||||||
show_trailing_blankline_indent = false,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
-- "gc" to comment visual regions/lines
|
-- "gc" to comment visual regions/lines
|
||||||
|
@ -169,6 +167,19 @@ require('lazy').setup({
|
||||||
pcall(require('nvim-treesitter.install').update { with_sync = true })
|
pcall(require('nvim-treesitter.install').update { with_sync = true })
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'nvim-orgmode/orgmode',
|
||||||
|
dependencies = {
|
||||||
|
{ 'nvim-treesitter/nvim-treesitter', lazy = true },
|
||||||
|
},
|
||||||
|
event = 'VeryLazy',
|
||||||
|
config = function()
|
||||||
|
require('orgmode').setup({
|
||||||
|
org_agenda_files = '~/orgfiles/**/*',
|
||||||
|
org_default_notes_file = '~/orgfiles/refile.org',
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
}, {})
|
}, {})
|
||||||
|
|
||||||
-- [[ Setting options ]]
|
-- [[ Setting options ]]
|
||||||
|
@ -274,14 +285,15 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
|
||||||
|
|
||||||
-- [[ Configure Treesitter ]]
|
-- [[ Configure Treesitter ]]
|
||||||
-- See `:help nvim-treesitter`
|
-- See `:help nvim-treesitter`
|
||||||
|
require('orgmode').setup_ts_grammar()
|
||||||
require('nvim-treesitter.configs').setup {
|
require('nvim-treesitter.configs').setup {
|
||||||
-- Add languages to be installed here that you want installed for treesitter
|
-- Add languages to be installed here that you want installed for treesitter
|
||||||
ensure_installed = { 'go', 'lua', 'python', 'tsx', 'typescript', 'javascript', 'help', 'vim' },
|
ensure_installed = { 'go', 'lua', 'python', 'tsx', 'typescript', 'javascript', 'vimdoc', 'vim', 'org' },
|
||||||
|
|
||||||
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
||||||
auto_install = false,
|
auto_install = false,
|
||||||
|
|
||||||
highlight = { enable = true },
|
highlight = { enable = true, additional_vim_regex_highlighting = { 'org' }, },
|
||||||
indent = { enable = true, disable = { 'python' } },
|
indent = { enable = true, disable = { 'python' } },
|
||||||
incremental_selection = {
|
incremental_selection = {
|
||||||
enable = true,
|
enable = true,
|
||||||
|
@ -480,6 +492,7 @@ cmp.setup {
|
||||||
sources = {
|
sources = {
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip' },
|
||||||
|
{ name = 'orgmode' },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue