From 6f7abe464064f0fb132e9c0e0b71762e538e2f92 Mon Sep 17 00:00:00 2001 From: Nikurasu Date: Mon, 8 Jan 2024 07:14:14 +0100 Subject: [PATCH] feat(Fish, Nvim): Update Nvim Config and Uninstalll zvm --- fish/conf.d/10-variables.fish | 3 +++ nvim/init.lua | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fish/conf.d/10-variables.fish b/fish/conf.d/10-variables.fish index a94b97c..c2caa49 100755 --- a/fish/conf.d/10-variables.fish +++ b/fish/conf.d/10-variables.fish @@ -8,3 +8,6 @@ set -gxa PATH $HOME/.local/share/bob/nvim-bin set -gx PYENV_ROOT $HOME/.pyenv set -gxa PATH $PYENV_ROOT/bin 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/ diff --git a/nvim/init.lua b/nvim/init.lua index 3a07cf9..c698097 100755 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -133,12 +133,10 @@ require('lazy').setup({ { -- Add indentation guides even on blank lines 'lukas-reineke/indent-blankline.nvim', + main = 'ibl', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` - opts = { - char = '┊', - show_trailing_blankline_indent = false, - }, + opts = {}, }, -- "gc" to comment visual regions/lines @@ -169,6 +167,19 @@ require('lazy').setup({ pcall(require('nvim-treesitter.install').update { with_sync = true }) 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 ]] @@ -274,14 +285,15 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` +require('orgmode').setup_ts_grammar() require('nvim-treesitter.configs').setup { -- 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!) auto_install = false, - highlight = { enable = true }, + highlight = { enable = true, additional_vim_regex_highlighting = { 'org' }, }, indent = { enable = true, disable = { 'python' } }, incremental_selection = { enable = true, @@ -480,6 +492,7 @@ cmp.setup { sources = { { name = 'nvim_lsp' }, { name = 'luasnip' }, + { name = 'orgmode' }, }, }