From eb6300a3d0b461e2fee6766799df3753ceaac5d8 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Fri, 1 Dec 2023 14:53:16 -0600 Subject: [PATCH] updates --- cspell.json | 97 +------------------------------- init.lua | 7 ++- lazy-lock.json | 14 ++--- lua/plugins/lsp.lua | 4 +- lua/plugins_disabled/profile.lua | 30 ---------- 5 files changed, 15 insertions(+), 137 deletions(-) delete mode 100644 lua/plugins_disabled/profile.lua diff --git a/cspell.json b/cspell.json index e0dd42d..116e466 100644 --- a/cspell.json +++ b/cspell.json @@ -1,96 +1 @@ -{ - "flagWords": [], - "version": "0.2", - "language": "en", - "words": [ - "nvim", - "builtins", - "stylua", - "rustfmt", - "pendo", - "tanstack", - "ripgrep", - "Typeahead", - "overscan", - "autorun", - "mediatype", - "BIOINF", - "Transitioner", - "pkce", - "ilike", - "arrayify", - "arrayified", - "komodo", - "wezterm", - "gcloud", - "pbpaste", - "Hasher", - "semvers", - "upserted", - "dtos", - "Yeatts", - "Mahon", - "Beaubier", - "Taussing", - "chakra", - "langchain", - "openai", - "getattr", - "llms", - "docstore", - "kwargs", - "svgr", - "healthcheck", - "venv", - "virtualenv", - "ringofstorms", - "nestjs", - "oneshot", - "templating", - "tiktoken", - "pydantic", - "NCCN", - "clsx", - "reactflow", - "Convo", - "DSAB", - "pgvector", - "postprocess", - "stylelua", - "sqlx", - "genemichaels", - "williamboman", - "substr", - "findfile", - "Hammerspoon", - "eventtap", - "OSTYPE", - "sccache", - "binstall", - "elif", - "autofocus", - "colours", - "Resizer", - "esac", - "pannable", - "zoomable", - "elkjs", - "Arrayible", - "Falsey", - "xyflow", - "leftnav", - "topnav", - "nodrag", - "nowheel", - "janky", - "draghandle", - "Sandboxed", - "Dismissable", - "dashdraw", - "chrono", - "serde", - "rustls", - "schemars", - "webserver" - ] -} +{"words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer"],"version":"0.2","flagWords":[],"language":"en"} diff --git a/init.lua b/init.lua index f12d732..df8db9d 100644 --- a/init.lua +++ b/init.lua @@ -15,9 +15,12 @@ if not vim.loop.fs_stat(lazypath) then vim.api.nvim_err_writeln("Error cloning lazy.nvim repository...\n\n" .. output) end end -vim.opt.rtp:prepend(lazypath) +vim.opt.rtp:prepend(vim.env.LAZY or lazypath) -require("lazy").setup("plugins", { +require("lazy").setup({ + spec = { + { import = "plugins" }, + }, change_detection = { enabled = false, }, diff --git a/lazy-lock.json b/lazy-lock.json index 99cca83..f303c8a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,7 +11,7 @@ "copilot.lua": { "branch": "master", "commit": "3665ed0f3ef3ad68673df7195789d134d0d1fdb0" }, "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "gitsigns.nvim": { "branch": "main", "commit": "175e74f87d3d2e4d20952d390af5f2a794f5ed7e" }, + "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "glow.nvim": { "branch": "advanced_window", "commit": "f1157d4cb7e46e830c72004e7e1adb81a1f9b04c" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, @@ -22,9 +22,9 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, "material.nvim": { "branch": "main", "commit": "d61da5decc7768769314c121a3232b6eadc73f2d" }, - "neo-tree.nvim": { "branch": "main", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, - "neodev.nvim": { "branch": "main", "commit": "e375edf6cf574639dc4b88cdfa306e4588987202" }, - "neogit": { "branch": "master", "commit": "763948abc669cf93ef0f33d20b350d309681d459" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, + "neodev.nvim": { "branch": "main", "commit": "eab4a55c43e0dec631acec992e52490b3f1b5a17" }, + "neogit": { "branch": "master", "commit": "bb538f12fa032c97d4632a6df71d5e0704088139" }, "nerdcommenter": { "branch": "master", "commit": "da948e160d9f54c2967c7927b9c74c5a68c8dc49" }, "nui.nvim": { "branch": "main", "commit": "257dccc43b4badc735978f0791d216f7d665b75a" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, @@ -32,19 +32,19 @@ "nvim-early-retirement": { "branch": "main", "commit": "1c89c003e4eeba3ac38482e62d29d66a42549ac6" }, "nvim-lspconfig": { "branch": "master", "commit": "39546f730bdff8eccf7cec344cfce694f19ac908" }, "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-treesitter": { "branch": "master", "commit": "bf982eb7dc9d54af748ea1dd8b9db3a7724b9a99" }, + "nvim-treesitter": { "branch": "master", "commit": "8f16c39f5b439bd9540336c4d5da705d180e34b9" }, "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "b8ff464f2afc2000f6c72fa331a8fc090cb46b39" }, "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, "openingh.nvim": { "branch": "main", "commit": "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, - "rest.nvim": { "branch": "main", "commit": "08e5876e1f5dc638d3214aaede71d3ecc24559fd" }, + "rest.nvim": { "branch": "main", "commit": "235bf4326e3a8a1ee520b939a4452a1a12fbe99b" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "c261d903a78c2cda47a5e44488621f10f9dd7fcf" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "text-case.nvim": { "branch": "main", "commit": "110b7e98ba1a3a2d001d60bbe5d1ff9f70fc2972" }, + "text-case.nvim": { "branch": "main", "commit": "f854ff31691002c7e6d20868e9a1ac9c93400ee6" }, "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index ddd86ec..0bab7c2 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -265,7 +265,7 @@ return { sources = { { name = "copilot", - priority = 8, + priority = 9, keyword_length = 1, filter = function(keyword) -- Check if keyword length is some number and not just whitespace @@ -275,7 +275,7 @@ return { return true end, }, - { name = "nvim_lsp", priority = 9 }, + { name = "nvim_lsp", priority = 8 }, { nane = "buffer", priority = 7 }, { name = "luasnip", priority = 6 }, { name = "path" }, diff --git a/lua/plugins_disabled/profile.lua b/lua/plugins_disabled/profile.lua deleted file mode 100644 index ad49b38..0000000 --- a/lua/plugins_disabled/profile.lua +++ /dev/null @@ -1,30 +0,0 @@ -return { - "stevearc/profile.nvim", - config = function() - local should_profile = os.getenv("NVIM_PROFILE") - if should_profile then - require("profile").instrument_autocmds() - if should_profile:lower():match("^start") then - require("profile").start("*") - else - require("profile").instrument("*") - end - end - - local function toggle_profile() - local prof = require("profile") - if prof.is_recording() then - prof.stop() - vim.ui.input({ prompt = "Save profile to:", completion = "file", default = "profile.json" }, function(filename) - if filename then - prof.export(filename) - vim.notify(string.format("Wrote %s", filename)) - end - end) - else - prof.start("*") - end - end - vim.keymap.set("", "", toggle_profile) - end, -}