diff --git a/lazy-lock.json b/lazy-lock.json index 050b298..24486d4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,27 +1,30 @@ { - "AstroNvim": { "branch": "main", "commit": "9417da143b971e65b159089c3de5a0ee37edb1fd" }, + "AstroNvim": { "branch": "main", "commit": "55a2b084eabe880c4ffa377f82bb972caec57e09" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "aerial.nvim": { "branch": "master", "commit": "3284a2cb858ba009c79da87d5e010ccee3c99c4d" }, - "astrocommunity": { "branch": "main", "commit": "c44cdc008f6b2fb745a7c829100b87a1cfb21b82" }, + "aerial.nvim": { "branch": "master", "commit": "6ab1a0ce4874d21610fc5a67a6c82c7b943c635b" }, + "astrocommunity": { "branch": "main", "commit": "9e0ca5bda04b1fc0d346a956fabb4f292dd81a84" }, "astrocore": { "branch": "main", "commit": "c797dd5a592e2bd154f2503e231b8a4083659534" }, - "astrolsp": { "branch": "main", "commit": "414775e4b49a46bd7105cc5498ea7bb312359bf2" }, - "astrotheme": { "branch": "main", "commit": "f12dcf64b1f9a05839c3ac2146f550f43bae9dab" }, - "astroui": { "branch": "main", "commit": "5db873d4af9f6bf57748884bfd4cbccebd4e6863" }, + "astrolsp": { "branch": "main", "commit": "0befe28a4ea96e46b7f7c01e4a634c04225ba55a" }, + "astrotheme": { "branch": "main", "commit": "4a2af93815e4e6adfe69c836e46047a9451de858" }, + "astroui": { "branch": "main", "commit": "4943abbd42674b43249313afe83b91065a40e4be" }, "before.nvim": { "branch": "master", "commit": "187bafe2792a82d53cdb632971e4113cd703ac53" }, - "blink.cmp": { "branch": "main", "commit": "3536ce464e82843b00c76718d9bfe1994647d686" }, + "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" }, + "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "catppuccin": { "branch": "main", "commit": "af58927c55c9f3272c940ff02b3cee94a1249f26" }, "cmp-dap": { "branch": "master", "commit": "ea92773e84c0ad3288c3bc5e452ac91559669087" }, - "everforest": { "branch": "master", "commit": "f40c2e6c8784c99c57c79edc94cd180e76450222" }, - "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, + "everforest": { "branch": "master", "commit": "3fffb096f6ac11372944ac964c60f8af41d8809f" }, + "flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, - "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, + "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "heirline.nvim": { "branch": "master", "commit": "fae936abb5e0345b85c3a03ecf38525b0828b992" }, + "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, - "lsp_signature.nvim": { "branch": "master", "commit": "d9c39937e4e0977357530e988aa8940078bb231f" }, + "lsp_signature.nvim": { "branch": "master", "commit": "62cadce83aaceed677ffe7a2d6a57141af7131ea" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" }, @@ -29,39 +32,46 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, - "mason.nvim": { "branch": "main", "commit": "7f265cd6ae56cecdd0aa50c8c73fc593b0604801" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "neo-tree.nvim": { "branch": "main", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, - "neoconf.nvim": { "branch": "main", "commit": "907a1fe4e346aab2989af6848d7d697098506c5e" }, - "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" }, + "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, + "neoconf.nvim": { "branch": "main", "commit": "7a8d7fd36f95f5cbbf57d4a5c463f6c54ad54cd3" }, + "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, + "none-ls.nvim": { "branch": "main", "commit": "6617d47fbf275d197e3335022a3d33ff310a4b93" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-highlight-colors": { "branch": "main", "commit": "b42a5ccec7457b44e89f7ed3b3afb1b375bb2093" }, + "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" }, "nvim-lspconfig": { "branch": "master", "commit": "fa2662510d30b06168b6e2e6915518decde6bbac" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-spider": { "branch": "main", "commit": "d4bdc45eac425e77108f068bd0706ff3ac20be7f" }, - "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-spider": { "branch": "main", "commit": "a7705d7233ac3c47f7a1e80172bbeaa11f1c722f" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, - "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, - "onedarkpro.nvim": { "branch": "main", "commit": "5ffd45b3602bc1ed75f0b2be6c5c1f6ba5c6b796" }, - "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "oil.nvim": { "branch": "master", "commit": "71948729cda5fc1b761d6ae60ff774b5525f1d50" }, + "onedarkpro.nvim": { "branch": "main", "commit": "eeac8847a46a02c4de4e887c4c6d34b282060b5d" }, + "org-roam.nvim": { "branch": "main", "commit": "34d1d113cd139ea903125305310be3d7c1067484" }, + "orgmode": { "branch": "master", "commit": "4da28a06d7a8b2563f1308c4550604f36e3c299f" }, + "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "poimandres.nvim": { "branch": "main", "commit": "a488957d803943a4201ac3b774913fcafa9e6b3a" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "quicker.nvim": { "branch": "master", "commit": "771437c3e3672dba9233156e1c2e2fc1888a5fff" }, + "render-markdown.nvim": { "branch": "main", "commit": "691651de4e02cbea9ff50c62d7d3a679abc95564" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, - "rose-pine": { "branch": "main", "commit": "f93360149e9ed4df8677fbb07c7231ea0fd03b97" }, + "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, "smart-splits.nvim": { "branch": "master", "commit": "ddb23c1a1cf1507bda487cda7f6e4690965ef9f5" }, - "snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "7bf55ed0ff5be182ad3301cff266581fc1c56cce" }, + "snacks.nvim": { "branch": "main", "commit": "da230e3ca8146da4b73752daaf0a1d07d343c12d" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "tokyonight.nvim": { "branch": "main", "commit": "d14614cbfc63b6037bfccd48bb982d2ad2003352" }, "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": "bbf1b6e4d6a94f1c362125dc927284086e9fad7d" } } diff --git a/lua/community.lua b/lua/community.lua index 2273d93..e31f3c8 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", @@ -44,4 +46,9 @@ return { { import = "astrocommunity.file-explorer.telescope-file-browser-nvim" }, { import = "astrocommunity.markdown-and-latex.markdown-preview-nvim" }, + { import = "astrocommunity.markdown-and-latex.render-markdown-nvim" }, + + { import = "astrocommunity.note-taking.neorg" }, + + { import = "astrocommunity.quickfix.quicker-nvim" }, } diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua index 894d619..7839ba2 100644 --- a/lua/plugins/astrocore.lua +++ b/lua/plugins/astrocore.lua @@ -71,12 +71,17 @@ return { desc = "Close buffer from tabline", }, - ["W"] = { desc = "VimWiki"}, - ["W"] = { desc = "Diary"}, + -- [""] = { function() require("smart-splits").move_cursor_left() end, desc = "Move to left split" }, + -- [""] = { function() require("smart-splits").move_cursor_down() end, desc = "Move to below split" }, + -- [""] = { function() require("smart-splits").move_cursor_up() end, desc = "Move to above split" }, + -- [""] = { function() require("smart-splits").move_cursor_right() end, desc = "Move to right split" }, + + -- ["W"] = { desc = "VimWiki" }, + -- ["W"] = { desc = "Diary" }, -- tables with just a `desc` key will be registered with which-key if it's installed -- this is useful for naming menus - -- ["b"] = { desc = "Buffers" }, + ["O"] = { desc = "Org-mode" }, -- setting a mapping to false will disable it -- [""] = false, diff --git a/lua/plugins/astroui.lua b/lua/plugins/astroui.lua index d998c46..85afd92 100644 --- a/lua/plugins/astroui.lua +++ b/lua/plugins/astroui.lua @@ -1,5 +1,3 @@ -if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE - -- AstroUI provides the basis for configuring the AstroNvim User Interface -- Configuration documentation can be found with `:h astroui` -- NOTE: We highly recommend setting up the Lua Language Server (`:LspInstall lua_ls`) diff --git a/lua/plugins/mappings.lua b/lua/plugins/mappings.lua new file mode 100644 index 0000000..4a8cc2b --- /dev/null +++ b/lua/plugins/mappings.lua @@ -0,0 +1,21 @@ +return { + { + "AstroNvim/astrocore", + ---@type AstroCoreOpts + opts = { + mappings = { + n = { + ["f/"] = require("telescope.builtin").current_buffer_fuzzy_find, + + -- for Neo layout + [""] = { function() require("smart-splits").move_cursor_left() end, desc = "Move to left split" }, + [""] = { function() require("smart-splits").move_cursor_down() end, desc = "Move to below split" }, + [""] = { function() require("smart-splits").move_cursor_up() end, desc = "Move to above split" }, + [""] = { function() require("smart-splits").move_cursor_right() end, desc = "Move to right split" }, + + [""] = { function() vim.cmd "redo" end, desc = "Redo" }, + }, + }, + }, + }, +} diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua new file mode 100644 index 0000000..382d99f --- /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 = "Oc", + org_agenda = "Oa", + }, + }, + } + 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, + }, } diff --git a/lua/polish.lua b/lua/polish.lua index 2fa6cc8..9f04b18 100644 --- a/lua/polish.lua +++ b/lua/polish.lua @@ -1,3 +1,11 @@ -- This will run last in the setup process. -- This is just pure lua so anything that doesn't -- fit in the normal config locations above can go here + +vim.api.nvim_create_user_command("Grg", function(opts) + -- print(table.concat({ "-g", opts.fargs[1] }, " ")) + require("telescope.builtin").live_grep { additional_args = { "-g", opts.fargs[1] } } +end, { + desc = "Add a glob-rule to the telescope live ripgrep", + nargs = 1, +})