diff --git a/init.lua b/init.lua index 36ccdcf..d67b190 100644 --- a/init.lua +++ b/init.lua @@ -37,6 +37,7 @@ vim.opt.filetype = "on" vim.o.swapfile = false vim.o.wrap = false vim.o.clipboard = "unnamedplus" +require("vim._core.ui2").enable() -- Persistent undos vim.opt.undofile = true diff --git a/lazy-lock.json b/lazy-lock.json index 5f32fab..e166f1f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,32 +1,26 @@ { - "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, - "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, - "freeze.nvim": { "branch": "main", "commit": "590fdb0d724485f578e4fee0e3ae2b32040dfb1a" }, - "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, + "crates.nvim": { "branch": "main", "commit": "694357861ec9ebf12475ddcdd04ea45a0923c32d" }, + "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lsp-trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, + "mini.icons": { "branch": "main", "commit": "bac6317300e205335df425296570d84322730067" }, "mini.indentscope": { "branch": "main", "commit": "0308f949f31769e509696af5d5f91cebb2159c69" }, "mini.pairs": { "branch": "main", "commit": "d5a29b6254dad07757832db505ea5aeab9aad43a" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, - "nvim-coverage": { "branch": "main", "commit": "a939e425e363319d952a6c35fb3f38b34041ded2" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, - "nvim-lspconfig": { "branch": "master", "commit": "702f69fb167e9119f14adc4dfd4fcadf4d1b07a0" }, - "nvim-treesitter": { "branch": "main", "commit": "2b50ab5ccbcd9e5708deb351308edd738adbf84c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "9a8e39993e3b895601bf8227124a48ea8268149e" }, + "nvim-lspconfig": { "branch": "master", "commit": "e05fb8c3bd61d909dacff24f77f23beb644daf54" }, + "nvim-treesitter": { "branch": "master", "commit": "cf12346a3414fa1b06af75c79faebe7f76df080a" }, + "nvim-treesitter-context": { "branch": "master", "commit": "b0c45cefe2c8f7b55fc46f34e563bc428ef99636" }, "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "snacks.nvim": { "branch": "main", "commit": "a049339328e2599ad6e85a69fa034ac501e921b2" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, - "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, - "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" }, "zig.vim": { "branch": "master", "commit": "1a1112eec20e28c832a06ddb1d0060f6ce652372" } } diff --git a/lsp/pyright.lua b/lsp/pyright.lua deleted file mode 100644 index c86ecc0..0000000 --- a/lsp/pyright.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - settings = { - pyright = { - disableOrganizeImports = true, - }, - python = { - analysis = { - ignore = "*", - }, - }, - }, -} diff --git a/lua/mappings.lua b/lua/mappings.lua index 3194323..6625100 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -21,10 +21,7 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) map("n", "ca", vim.lsp.buf.code_action, { desc = "Code Action" }) map("n", "R", vim.lsp.buf.rename, { desc = "Rename" }) - map("n", "fl", require("telescope.builtin").lsp_document_symbols, { desc = "LSP Document Symbols" }) map("n", "gd", vim.lsp.buf.definition, { desc = "Goto Definition" }) - map("n", "gr", require("telescope.builtin").lsp_references, { desc = "References" }) - map("n", "gi", require("telescope.builtin").lsp_implementations, { desc = "Implementations" }) map("n", "K", vim.lsp.buf.hover, { desc = "Hover (LSP)" }) end, }) diff --git a/lua/plugins/coverage.lua b/lua/plugins/coverage.lua deleted file mode 100644 index 4565ed3..0000000 --- a/lua/plugins/coverage.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { - "andythigpen/nvim-coverage", - dependencies = { "nvim-lua/plenary.nvim", "EdenEast/nightfox.nvim" }, - -- lazy = true, - ft = { "python", "rust" }, - config = true, - }, -} diff --git a/lua/plugins/freeze.lua b/lua/plugins/freeze.lua deleted file mode 100644 index 1585719..0000000 --- a/lua/plugins/freeze.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "charm-and-friends/freeze.nvim", - opts = { - command = "freeze", - open = true, - output = function() - return "./" .. os.date("%Y-%m-%d") .. "_freeze.png" - end, - theme = "rose-pine-moon", - }, - }, -} diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index 088efcb..2d9f46e 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -3,6 +3,44 @@ return { "folke/snacks.nvim", opts = { input = {}, + picker = {}, + }, + keys = { + { + "ff", + function() + Snacks.picker.files() + end, + desc = "Find files", + }, + { + "fg", + function() + Snacks.picker.grep() + end, + desc = "Grep", + }, + { + "s", + function() + Snacks.picker.spelling() + end, + desc = "Spelling", + }, + { + "gr", + function() + Snacks.picker.lsp_references() + end, + desc = "References", + }, + { + "gi", + function() + Snacks.picker.lsp_implementations() + end, + desc = "Implementations", + }, }, }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua deleted file mode 100644 index dc7df9c..0000000 --- a/lua/plugins/telescope.lua +++ /dev/null @@ -1,90 +0,0 @@ -return { - { - "nvim-telescope/telescope.nvim", - branch = "0.1.x", - cmd = "Telescope", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope-fzf-native.nvim", - }, - config = function() - require("telescope").setup({ - pickers = { - find_files = { - find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*" }, - }, - }, - }) - - require("telescope").load_extension("fzf") - pcall(function() - require("telescope").load_extension("harpoon") - end) - end, - keys = { - { - "ff", - function() - require("telescope.builtin").find_files() - end, - desc = "Find File", - }, - { - "fg", - function() - require("telescope.builtin").live_grep() - end, - desc = "Live Grep", - }, - { - "fb", - function() - require("telescope.builtin").buffers() - end, - desc = "Buffer List", - }, - { - "fh", - function() - require("telescope.builtin").help_tags() - end, - desc = "Help Tags", - }, - { - "fc", - function() - require("telescope.builtin").colorscheme() - end, - desc = "Colorscheme", - }, - { - "fq", - function() - local ok, telescope = pcall(require, "telescope") - if ok and telescope.extensions.harpoon then - telescope.extensions.harpoon.marks() - end - end, - desc = "Harpoon Marks", - }, - { - "fs", - function() - require("telescope.builtin").grep_string() - end, - desc = "Grep String", - }, - { - "s", - function() - require("telescope.builtin").spell_suggest() - end, - desc = "Spell Suggest", - }, - }, - }, - { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - }, -} diff --git a/lua/plugins/todo.lua b/lua/plugins/todo.lua deleted file mode 100644 index 931bee0..0000000 --- a/lua/plugins/todo.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, -} diff --git a/lua/plugins/zen.lua b/lua/plugins/zen.lua deleted file mode 100644 index bfe9ee6..0000000 --- a/lua/plugins/zen.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "folke/zen-mode.nvim", - opts = { - window = { - width = 0.50, - }, - }, -} diff --git a/snippets/package.json b/snippets/package.json deleted file mode 100644 index 0e38654..0000000 --- a/snippets/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "personal-snippet", - "contributes": { - "snippets": [ - {"language": "yaml", "path": "./yaml.json"} - ] - } -} diff --git a/snippets/yaml.json b/snippets/yaml.json deleted file mode 100644 index 7cc2a13..0000000 --- a/snippets/yaml.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "omsf-directory-snippets": { - "prefix": "omsf-dir", - "body": [ - "name: ${1:package-name}", - "description: ${2:Package description}", - "docs: ${3:https://example.com/docs}", - "licenses:", - " - ${4:MIT}", - "link: ${5:https://example.com}", - "repository: ${6:https://github.com/user/repo}", - "tags:", - " - ${7:tag1}", - " - ${8:tag2}", - "languages:", - " - ${9:Python}", - "project: ${10|Open Force Field,Open Free Energy,OpenFold|}" - ], - "description": "Generate YAML for OMSF Directory based on JSON schema" - } -}