From 0f97642a4849443825c1ee53af009146200b8520 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Thu, 29 Jun 2023 11:40:34 -0500 Subject: [PATCH] remove specific hashes, the bug enter hack breaks on mac so diff on OS --- cspell.json | 2 +- lazy-lock.json | 34 ++++++------------- lua/autocommands.lua | 30 ++++++++-------- lua/plugins/auto-save.lua | 1 - lua/plugins/http_rest.lua | 1 - lua/plugins/markdown_glow.lua | 1 - lua/plugins/neo-tree.lua | 3 +- lua/plugins/open-github.lua | 1 - lua/plugins/theme_material.lua | 1 - lua/plugins/treesitter.lua | 1 - lua/plugins/undotree.lua | 1 - lua/plugins/util_plenary.lua | 1 - lua/plugins_disabled/autoswap.lua | 7 ---- .../lsp-zero.lua | 0 lua/plugins_disabled/rust-tools.lua | 1 - lua/plugins_disabled/which-key.lua | 20 ----------- 16 files changed, 27 insertions(+), 78 deletions(-) delete mode 100644 lua/plugins_disabled/autoswap.lua rename lua/{plugins => plugins_disabled}/lsp-zero.lua (100%) delete mode 100644 lua/plugins_disabled/which-key.lua diff --git a/cspell.json b/cspell.json index 918aec3..16d41c4 100644 --- a/cspell.json +++ b/cspell.json @@ -1 +1 @@ -{"language":"en","version":"0.2","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste"],"flagWords":[]} +{"language":"en","version":"0.2","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"],"flagWords":[]} diff --git a/lazy-lock.json b/lazy-lock.json index 1503aa3..a2a49d4 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,33 +1,21 @@ { - "LuaSnip": { "branch": "master", "commit": "a13af80734eb28f744de6c875330c9d3c24b5f3b" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "friendly-snippets": { "branch": "main", "commit": "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b" }, - "glow.nvim": { "branch": "advanced_window", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, - "lazy.nvim": { "branch": "main", "commit": "10d4371745f88837c78c8daab00c5be6e48abea4" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "cf38e6034f2d776ebd16304a334b79543d1ffa60" }, + "glow.nvim": { "branch": "advanced_window", "commit": "f1157d4cb7e46e830c72004e7e1adb81a1f9b04c" }, + "lazy.nvim": { "branch": "main", "commit": "4c8b625bc873ca76b76eee0c28c98f1f7148f17f" }, "lualine-lsp-progress": { "branch": "master", "commit": "21938e2a668982d1dbf3b33a43a96bc6d150a91d" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" }, - "mason.nvim": { "branch": "main", "commit": "4be1226f48bc2011024110f37b17f5ee468df58f" }, - "material.nvim": { "branch": "main", "commit": "0c725897bc3d22c45fbf25a602002ee02f06f619" }, + "mason.nvim": { "branch": "main", "commit": "b68d3be4b664671002221d43c82e74a0f1006b26" }, + "material.nvim": { "branch": "main", "commit": "f3783f2a8e55904887d3ea7cae8d7ab57d7f3e8e" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "20c2f2f5ba083bbb1e37b8bc3d590621434f31e9" }, - "nui.nvim": { "branch": "main", "commit": "d688cb0492ad6643cb5c6620f3b43f2a0e8c8d89" }, - "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, - "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, - "nvim-cmp": { "branch": "main", "commit": "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65" }, - "nvim-lspconfig": { "branch": "master", "commit": "fefba589c56a5568a089299e36a4c8242502faaa" }, - "nvim-treesitter": { "branch": "master", "commit": "150be01d47579ba70137813348a2f0a5be7a7866" }, - "openingh.nvim": { "branch": "main", "commit": "374c081409dc238018cd986410f16190d8f9f680" }, + "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "null-ls.nvim": { "branch": "main", "commit": "aac27a1fa550de3d0b2c651168167cc0d5366a9a" }, + "nvim-treesitter": { "branch": "master", "commit": "8d2eb35c5b72a2e2fdb713998bdc906d8f028114" }, + "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, + "openingh.nvim": { "branch": "main", "commit": "2719e5759ecf4b9a2d492fbf52d03d2e6fc6126a" }, "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, - "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, - "rest.nvim": { "branch": "main", "commit": "d8dc204e9f6fd930d9d1d709f0d19138f804431a" }, + "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" }, + "rest.nvim": { "branch": "main", "commit": "aea7c64bdff1073beed9bd7fddb60cce7796d7ff" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" } diff --git a/lua/autocommands.lua b/lua/autocommands.lua index 39b96e5..195427c 100644 --- a/lua/autocommands.lua +++ b/lua/autocommands.lua @@ -1,16 +1,14 @@ function isEmpty() return vim.api.nvim_buf_get_name(0) == "" or vim.fn.filereadable(vim.api.nvim_buf_get_name(0)) == 0 or vim.fn.line('$') == 1 and vim.fn.col('$') == 1 end --- #000000 --- --- -vim.api.nvim_create_autocmd({ "VimEnter" }, { - callback = function() - if isEmpty() then - require('telescope.builtin').find_files() - end - end -}) + +--vim.api.nvim_create_autocmd({ "VimEnter" }, { +-- callback = function() +-- if isEmpty() then +-- require('telescope.builtin').find_files() +-- end +-- end +--}) vim.api.nvim_create_autocmd('BufRead', { pattern = ".env*", @@ -33,9 +31,9 @@ vim.api.nvim_create_autocmd("BufRead", { end, }) -vim.api.nvim_create_autocmd('BufEnter', { - callback = function () - local ts_avail, parsers = pcall(require, "nvim-treesitter.parsers") - if ts_avail and parsers.has_parser() then vim.cmd.TSBufEnable "highlight" end - end, -}) +--vim.api.nvim_create_autocmd('BufEnter', { +-- callback = function () +-- local ts_avail, parsers = pcall(require, "nvim-treesitter.parsers") +-- if ts_avail and parsers.has_parser() then vim.cmd.TSBufEnable "highlight" end +-- end, +--}) diff --git a/lua/plugins/auto-save.lua b/lua/plugins/auto-save.lua index 6c48860..73ba86b 100644 --- a/lua/plugins/auto-save.lua +++ b/lua/plugins/auto-save.lua @@ -1,6 +1,5 @@ return { "Pocco81/auto-save.nvim", - commit = "979b6c82f60cfa80f4cf437d77446d0ded0addf0", -- May 22, 2023 event = "BufEnter", opts = { trigger_events = { "InsertLeave", "TextChanged", "TextChangedI", "BufLeave" }, diff --git a/lua/plugins/http_rest.lua b/lua/plugins/http_rest.lua index f59ed85..ae81f96 100644 --- a/lua/plugins/http_rest.lua +++ b/lua/plugins/http_rest.lua @@ -1,6 +1,5 @@ return { "rest-nvim/rest.nvim", - commit = "d8dc204e9f6fd930d9d1d709f0d19138f804431a", event = "BufEnter *.http", requires = { "nvim-lua/plenary.nvim" }, keys = { diff --git a/lua/plugins/markdown_glow.lua b/lua/plugins/markdown_glow.lua index 53e1ea2..9bd84da 100644 --- a/lua/plugins/markdown_glow.lua +++ b/lua/plugins/markdown_glow.lua @@ -1,6 +1,5 @@ return { "lnc3l0t/glow.nvim", - commit = "bbd0473d72a45094495ee5600b5577823543eefe", branch = "advanced_window", config = { default_type = "keep", diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 095b5b6..61f34b9 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -1,7 +1,6 @@ return { "nvim-neo-tree/neo-tree.nvim", - commit = "e5594d53986b34e584e8afe2ea6ad99d6f6d2105", - dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" }, + dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" }, cmd = "Neotree", init = function() vim.g.neo_tree_remove_legacy_commands = true end, pin = true, diff --git a/lua/plugins/open-github.lua b/lua/plugins/open-github.lua index 56ed205..b078554 100644 --- a/lua/plugins/open-github.lua +++ b/lua/plugins/open-github.lua @@ -1,6 +1,5 @@ return { "Almo7aya/openingh.nvim", - commit = "374c081409dc238018cd986410f16190d8f9f680", event = "BufEnter", keys = { { "gf", ":OpenInGHFile ", desc = "Open in git" } diff --git a/lua/plugins/theme_material.lua b/lua/plugins/theme_material.lua index e8ffa10..06a3e6a 100644 --- a/lua/plugins/theme_material.lua +++ b/lua/plugins/theme_material.lua @@ -1,6 +1,5 @@ return { "marko-cerovac/material.nvim", - commit = "0c725897bc3d22c45fbf25a602002ee02f06f619", -- May 22, 2023 config = function() vim.g.material_style = "darker" require("material").setup { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index d0f9bff..fc313c8 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,7 +1,6 @@ return { "nvim-treesitter/nvim-treesitter", dependencies = { "windwp/nvim-ts-autotag", "JoosepAlviste/nvim-ts-context-commentstring" }, - commit = "f2778bd1a28b74adf5b1aa51aa57da85adfa3d16", build = ":TSUpdate", event = "BufRead", cmd = { diff --git a/lua/plugins/undotree.lua b/lua/plugins/undotree.lua index 97e36fd..fcde095 100644 --- a/lua/plugins/undotree.lua +++ b/lua/plugins/undotree.lua @@ -1,6 +1,5 @@ return { "mbbill/undotree", - commit = "485f01efde4e22cb1ce547b9e8c9238f36566f21", event = "BufEnter", keys = { { "u", vim.cmd.UndotreeToggle, desc = "Undo Tree Toggle" }, diff --git a/lua/plugins/util_plenary.lua b/lua/plugins/util_plenary.lua index 427a216..e4b0a5c 100644 --- a/lua/plugins/util_plenary.lua +++ b/lua/plugins/util_plenary.lua @@ -1,5 +1,4 @@ return { "nvim-lua/plenary.nvim", - commit = "9ac3e9541bbabd9d73663d757e4fe48a675bb054", } diff --git a/lua/plugins_disabled/autoswap.lua b/lua/plugins_disabled/autoswap.lua deleted file mode 100644 index b024cf3..0000000 --- a/lua/plugins_disabled/autoswap.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Disabled this because of undotree, turniung off swap files entirely, adding in undo tree history instead - -return { - "gioele/vim-autoswap", - commit = "e587e4b14a605d8921942ba65a37583813289272", - event = "BufEnter", -} diff --git a/lua/plugins/lsp-zero.lua b/lua/plugins_disabled/lsp-zero.lua similarity index 100% rename from lua/plugins/lsp-zero.lua rename to lua/plugins_disabled/lsp-zero.lua diff --git a/lua/plugins_disabled/rust-tools.lua b/lua/plugins_disabled/rust-tools.lua index 853cdb7..15cf3a9 100644 --- a/lua/plugins_disabled/rust-tools.lua +++ b/lua/plugins_disabled/rust-tools.lua @@ -1,6 +1,5 @@ return { "simrat39/rust-tools.nvim", - commit = "71d2cf67b5ed120a0e31b2c8adb210dd2834242f", event = "BufEnter *.rs", after = { "mason-lspconfig.nvim", "inlay-hints." }, } diff --git a/lua/plugins_disabled/which-key.lua b/lua/plugins_disabled/which-key.lua deleted file mode 100644 index f98a2e7..0000000 --- a/lua/plugins_disabled/which-key.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - "folke/which-key.nvim", - commit = "e271c28118998c93a14d189af3395812a1aa646c", -- May 22, 2023 - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - opts = { - icons = { group = vim.g.icons_enabled and "" or "+", separator = "" }, - disable = { filetypes = { "TelescopePrompt" } }, - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, - setup = function(_, opts) - require("which-key").setup(opts) - require("keymaps").which_key_register() - end -}