diff --git a/lazy-lock.json b/lazy-lock.json index 8506353..056db02 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,6 +19,7 @@ "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" }, + "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, "lsp_signature.nvim": { "branch": "master", "commit": "d9c39937e4e0977357530e988aa8940078bb231f" }, @@ -52,8 +53,11 @@ "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "onedarkpro.nvim": { "branch": "main", "commit": "5ffd45b3602bc1ed75f0b2be6c5c1f6ba5c6b796" }, + "org-roam.nvim": { "branch": "main", "commit": "34d1d113cd139ea903125305310be3d7c1067484" }, + "orgmode": { "branch": "master", "commit": "ad5d652d2bb82ee2d609d4a6ee8fc2114cdcb8fd" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "poimandres.nvim": { "branch": "main", "commit": "a488957d803943a4201ac3b774913fcafa9e6b3a" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "render-markdown.nvim": { "branch": "main", "commit": "5c0e241bdbd208b7ae546009378d6bc93c083ef3" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, @@ -66,5 +70,6 @@ "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, - "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" } + "which-key.nvim": { "branch": "main", "commit": "fcbf4eea17cb299c02557d576f0d568878e354a4" }, + "wrapping.nvim": { "branch": "master", "commit": "f26fdeabd17cf1bf5197badbdadc2e2f08b6ab0f" } } diff --git a/lua/community.lua b/lua/community.lua index f48097d..62e77ef 100644 --- a/lua/community.lua +++ b/lua/community.lua @@ -28,6 +28,8 @@ return { { import = "astrocommunity.colorscheme.onedarkpro-nvim" }, { import = "astrocommunity.colorscheme.rose-pine" }, { import = "astrocommunity.colorscheme.gruvbox-nvim" }, + { import = "astrocommunity.colorscheme.kanagawa-nvim" }, + { import = "astrocommunity.colorscheme.poimandres-nvim" }, { import = "astrocommunity.motion.flash-nvim", diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua new file mode 100644 index 0000000..788edfb --- /dev/null +++ b/lua/plugins/orgmode.lua @@ -0,0 +1,41 @@ +---@type LazySpec +return { + { + "nvim-orgmode/orgmode", + event = "VeryLazy", + config = function() + -- Setup orgmode + require("orgmode").setup { + org_agenda_files = "~/orgfiles/**/*", + org_default_notes_file = "~/orgfiles/refile.org", + mappings = { + global = { + org_capture = "gC", + org_agenda = "gA", + }, + }, + } + end, + }, + { + "chipsenkbeil/org-roam.nvim", + tag = "0.2.0", + dependencies = { + { + "nvim-orgmode/orgmode", + tag = "0.7.0", + }, + }, + config = function() + require("org-roam").setup { + directory = "~/org_roam_files", + -- optional + org_files = { + "~/orgfiles", + -- "~/some/folder/*.org", + -- "~/a/single/org_file.org", + }, + } + end, + }, +} diff --git a/lua/plugins/user.lua b/lua/plugins/user.lua index 58de26c..8943d3c 100644 --- a/lua/plugins/user.lua +++ b/lua/plugins/user.lua @@ -2,6 +2,24 @@ -- PLEASE REMOVE THE EXAMPLES YOU HAVE NO INTEREST IN BEFORE ENABLING THIS FILE -- Here are some examples: +local parser_config = require("nvim-treesitter.parsers").get_parser_configs() + +parser_config["selinux"] = { + install_info = { + url = "/home/michaelflossmann/code/tree-sitter-selinux_2", + files = { "src/parser.c" }, + branch = "main", + generate_requires_npm = false, + requires_generate_from_grammar = false, + }, + filetype = "selinux", +} +vim.filetype.add { + extension = { + te = "selinux", + }, +} + ---@type LazySpec return { @@ -54,6 +72,14 @@ return { if ls.choice_active() then ls.change_choice(1) end end, }, + { + "", + function() + local ls = require "luasnip" + if ls.expand_or_jumpable() then ls.expand_or_jump() end + end, + mode = { "i" }, + }, }, config = function(plugin, opts) require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call @@ -111,42 +137,6 @@ return { end, }, - -- { - -- "vimwiki/vimwiki", - -- event = "BufEnter *.md", - -- ft = "md", - -- lazy = false, - -- keys = { - -- { "W", desc = "VimWiki" }, - -- { "Ww", "VimwikiIndex", desc = "VimWiki Index" }, - -- { "Ws", "VimwikiUISelect", desc = "VimWiki UI Select" }, - -- { "Wt", "VimwikiTabIndex", desc = "VimWiki Tab Index" }, - -- { "Wi", "VimwikiDiaryIndex", desc = "VimWiki Diary Index" }, - -- { "W", desc = "VimWiki Diary" }, - -- { "Ww", "VimwikiMakeDiaryNote", desc = "VimWiki Diary: Today" }, - -- { "Wt", "VimwikiTabMakeDiaryNote", desc = "VimWiki Diary: Today (Tab)" }, - -- { "Wi", "Vimwiki", desc = "VimWiki Diary: Generate Links" }, - -- { "Wm", "Vimwiki", desc = "VimWiki Diary: Tomorrow" }, - -- { "Wy", "Vimwiki", desc = "VimWiki Diary: Yesterday" }, - -- }, - -- - -- init = function() - -- vim.g.vimwiki_list = { { - -- path = "~/vimwiki/", - -- syntax = "markdown", - -- ext = ".md", - -- } } - -- - -- vim.g.vimwiki_ext2syntax = { - -- [".md"] = "markdown", - -- [".markdown"] = "markdown", - -- [".mdown"] = "markdown", - -- } - -- - -- vim.g.vimwiki_global_ext = 0 - -- end, - -- }, - { "kylechui/nvim-surround", version = "*", @@ -174,4 +164,8 @@ return { { "-", desc = "🛢️Oil toggle", mode = { "n" }, require("oil").toggle_float }, }, }, + { + "andrewferrier/wrapping.nvim", + config = function() require("wrapping").setup() end, + }, }