Merge branch 'main' of git.theadamcooper.com:adam/dotfiles
This commit is contained in:
commit
c646c3e7bc
4 changed files with 398 additions and 53 deletions
|
|
@ -1,43 +1,166 @@
|
|||
{
|
||||
"LazyVim": { "branch": "main", "commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d" },
|
||||
"SchemaStore.nvim": { "branch": "main", "commit": "97b08f928d355bd6d5dee595fdf667b5bfb6329f" },
|
||||
"blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" },
|
||||
"conform.nvim": { "branch": "master", "commit": "8ed162b0637d4c4f69ebe3e8e49b35662a82e137" },
|
||||
"crates.nvim": { "branch": "main", "commit": "1d92a7f449a2a76d8f4c3459bd98f450e76d2ea3" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a8e6efcf623b86bae6d2223eede7c43883329f80" },
|
||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||
"mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" },
|
||||
"mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
|
||||
"mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
|
||||
"mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" },
|
||||
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
|
||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||
"nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "31226f6736a8150e323b346e4748e3c9bdd6bef5" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "80e6de9d24eec68d82d5f4e6feae94c9c753ebd6" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
|
||||
"nvlime": { "branch": "master", "commit": "228e4fa8c7d10b1ed07b1649a63743613b77a828" },
|
||||
"paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" },
|
||||
"parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
|
||||
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" },
|
||||
"rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "eb81468b475f6251f5850ae956e19547e8f533ec" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"tokyonight.nvim": { "branch": "main", "commit": "84ea0b5f4651afdf50ececaf6f110fe9d9dc9458" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
|
||||
"LazyVim": {
|
||||
"branch": "main",
|
||||
"commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d"
|
||||
},
|
||||
"SchemaStore.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "97b08f928d355bd6d5dee595fdf667b5bfb6329f"
|
||||
},
|
||||
"blink.cmp": {
|
||||
"branch": "main",
|
||||
"commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3"
|
||||
},
|
||||
"bufferline.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3"
|
||||
},
|
||||
"catppuccin": {
|
||||
"branch": "main",
|
||||
"commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063"
|
||||
},
|
||||
"conform.nvim": {
|
||||
"branch": "master",
|
||||
"commit": "8ed162b0637d4c4f69ebe3e8e49b35662a82e137"
|
||||
},
|
||||
"crates.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "1d92a7f449a2a76d8f4c3459bd98f450e76d2ea3"
|
||||
},
|
||||
"flash.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "3c942666f115e2811e959eabbdd361a025db8b63"
|
||||
},
|
||||
"friendly-snippets": {
|
||||
"branch": "main",
|
||||
"commit": "efff286dd74c22f731cdec26a70b46e5b203c619"
|
||||
},
|
||||
"gitsigns.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "2bc3b472bbc2484214549af4d9f38c127b886a55"
|
||||
},
|
||||
"grug-far.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665"
|
||||
},
|
||||
"lazy.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3"
|
||||
},
|
||||
"lazydev.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc"
|
||||
},
|
||||
"lualine.nvim": {
|
||||
"branch": "master",
|
||||
"commit": "f4f791f67e70d378a754d02da068231d2352e5bc"
|
||||
},
|
||||
"markdown-preview.nvim": {
|
||||
"branch": "master",
|
||||
"commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee"
|
||||
},
|
||||
"mason-lspconfig.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "a8e6efcf623b86bae6d2223eede7c43883329f80"
|
||||
},
|
||||
"mason.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "e2f7f9044ec30067bc11800a9e266664b88cda22"
|
||||
},
|
||||
"mini.ai": {
|
||||
"branch": "main",
|
||||
"commit": "6e01c0e5a15554852546fac9853960780ac52ed4"
|
||||
},
|
||||
"mini.icons": {
|
||||
"branch": "main",
|
||||
"commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36"
|
||||
},
|
||||
"mini.pairs": {
|
||||
"branch": "main",
|
||||
"commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918"
|
||||
},
|
||||
"mini.surround": {
|
||||
"branch": "main",
|
||||
"commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb"
|
||||
},
|
||||
"noice.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59"
|
||||
},
|
||||
"nui.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46"
|
||||
},
|
||||
"nvim-lint": {
|
||||
"branch": "master",
|
||||
"commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8"
|
||||
},
|
||||
"nvim-lspconfig": {
|
||||
"branch": "master",
|
||||
"commit": "31226f6736a8150e323b346e4748e3c9bdd6bef5"
|
||||
},
|
||||
"nvim-treesitter": {
|
||||
"branch": "master",
|
||||
"commit": "80e6de9d24eec68d82d5f4e6feae94c9c753ebd6"
|
||||
},
|
||||
"nvim-treesitter-textobjects": {
|
||||
"branch": "master",
|
||||
"commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595"
|
||||
},
|
||||
"nvim-ts-autotag": {
|
||||
"branch": "main",
|
||||
"commit": "1cca23c9da708047922d3895a71032bc0449c52d"
|
||||
},
|
||||
"nvlime": {
|
||||
"branch": "master",
|
||||
"commit": "228e4fa8c7d10b1ed07b1649a63743613b77a828"
|
||||
},
|
||||
"paredit": {
|
||||
"branch": "master",
|
||||
"commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5"
|
||||
},
|
||||
"parsley": {
|
||||
"branch": "main",
|
||||
"commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc"
|
||||
},
|
||||
"persistence.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d"
|
||||
},
|
||||
"plenary.nvim": {
|
||||
"branch": "master",
|
||||
"commit": "857c5ac632080dba10aae49dba902ce3abf91b35"
|
||||
},
|
||||
"render-markdown.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee"
|
||||
},
|
||||
"rustaceanvim": {
|
||||
"branch": "master",
|
||||
"commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39"
|
||||
},
|
||||
"snacks.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "eb81468b475f6251f5850ae956e19547e8f533ec"
|
||||
},
|
||||
"todo-comments.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5"
|
||||
},
|
||||
"tokyonight.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "84ea0b5f4651afdf50ececaf6f110fe9d9dc9458"
|
||||
},
|
||||
"trouble.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3"
|
||||
},
|
||||
"ts-comments.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74"
|
||||
},
|
||||
"which-key.nvim": {
|
||||
"branch": "main",
|
||||
"commit": "0e76a87ac51772569aec678dc74baa8e2a86100c"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,7 @@
|
|||
{
|
||||
"extras": [
|
||||
"lazyvim.plugins.extras.coding.mini-surround",
|
||||
"lazyvim.plugins.extras.editor.fzf",
|
||||
"lazyvim.plugins.extras.lang.go",
|
||||
"lazyvim.plugins.extras.lang.json",
|
||||
"lazyvim.plugins.extras.lang.markdown",
|
||||
"lazyvim.plugins.extras.lang.python",
|
||||
"lazyvim.plugins.extras.lang.rust",
|
||||
"lazyvim.plugins.extras.lang.toml",
|
||||
"lazyvim.plugins.extras.lang.typescript",
|
||||
"lazyvim.plugins.extras.lang.yaml",
|
||||
"lazyvim.plugins.extras.vscode"
|
||||
|
||||
],
|
||||
"install_version": 8,
|
||||
"news": {
|
||||
"NEWS.md": "10960"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -148,6 +148,20 @@ return {
|
|||
vim.list_extend(opts.ensure_installed, {
|
||||
"tsx",
|
||||
"typescript",
|
||||
"bash",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"python",
|
||||
"query",
|
||||
"regex",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"vim",
|
||||
"yaml",
|
||||
})
|
||||
end,
|
||||
},
|
||||
219
nvim/lua/plugins/plugins.lua
Normal file
219
nvim/lua/plugins/plugins.lua
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
-- since this is just an example spec, don't actually load anything here and return an empty spec
|
||||
-- stylua: ignore
|
||||
-- if true then return {} end
|
||||
|
||||
-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim
|
||||
--
|
||||
-- In your plugin files, you can:
|
||||
-- * add extra plugins
|
||||
-- * disable/enabled LazyVim plugins
|
||||
-- * override the configuration of LazyVim plugins
|
||||
return {
|
||||
"kovisoft/paredit",
|
||||
{
|
||||
"monkoose/nvlime",
|
||||
event = "VeryLazy",
|
||||
dependencies = {
|
||||
"monkoose/parsley"
|
||||
}
|
||||
},
|
||||
-- add gruvbox
|
||||
-- { "ellisonleao/gruvbox.nvim" },
|
||||
|
||||
-- Configure LazyVim to load gruvbox
|
||||
-- {
|
||||
-- "LazyVim/LazyVim",
|
||||
-- opts = {
|
||||
-- colorscheme = "gruvbox",
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- change trouble config
|
||||
-- {
|
||||
-- "folke/trouble.nvim",
|
||||
-- -- opts will be merged with the parent spec
|
||||
-- opts = { use_diagnostic_signs = true },
|
||||
-- },
|
||||
|
||||
-- disable trouble
|
||||
-- { "folke/trouble.nvim", enabled = false },
|
||||
|
||||
-- override nvim-cmp and add cmp-emoji
|
||||
-- {
|
||||
-- "hrsh7th/nvim-cmp",
|
||||
-- dependencies = { "hrsh7th/cmp-emoji" },
|
||||
-- ---@param opts cmp.ConfigSchema
|
||||
-- opts = function(_, opts)
|
||||
-- table.insert(opts.sources, { name = "emoji" })
|
||||
-- end,
|
||||
-- },
|
||||
|
||||
-- change some telescope options and a keymap to browse plugin files
|
||||
-- {
|
||||
-- "nvim-telescope/telescope.nvim",
|
||||
-- keys = {
|
||||
-- -- add a keymap to browse plugin files
|
||||
-- -- stylua: ignore
|
||||
-- {
|
||||
-- "<leader>fp",
|
||||
-- function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end,
|
||||
-- desc = "Find Plugin File",
|
||||
-- },
|
||||
-- },
|
||||
-- -- change some options
|
||||
-- opts = {
|
||||
-- defaults = {
|
||||
-- layout_strategy = "horizontal",
|
||||
-- layout_config = { prompt_position = "top" },
|
||||
-- sorting_strategy = "ascending",
|
||||
-- winblend = 0,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- add pyright to lspconfig
|
||||
-- {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- ---@class PluginLspOpts
|
||||
-- opts = {
|
||||
-- ---@type lspconfig.options
|
||||
-- servers = {
|
||||
-- -- pyright will be automatically installed with mason and loaded with lspconfig
|
||||
-- pyright = {},
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- add tsserver and setup with typescript.nvim instead of lspconfig
|
||||
-- {
|
||||
-- "neovim/nvim-lspconfig",
|
||||
-- dependencies = {
|
||||
-- "jose-elias-alvarez/typescript.nvim",
|
||||
-- init = function()
|
||||
-- require("lazyvim.util").lsp.on_attach(function(_, buffer)
|
||||
-- -- stylua: ignore
|
||||
-- vim.keymap.set( "n", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
|
||||
-- vim.keymap.set("n", "<leader>cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer })
|
||||
-- end)
|
||||
-- end,
|
||||
-- },
|
||||
-- ---@class PluginLspOpts
|
||||
-- opts = {
|
||||
-- ---@type lspconfig.options
|
||||
-- servers = {
|
||||
-- -- tsserver will be automatically installed with mason and loaded with lspconfig
|
||||
-- tsserver = {},
|
||||
-- },
|
||||
-- -- you can do any additional lsp server setup here
|
||||
-- -- return true if you don't want this server to be setup with lspconfig
|
||||
-- ---@type table<string, fun(server:string, opts:_.lspconfig.options):boolean?>
|
||||
-- setup = {
|
||||
-- -- example to setup with typescript.nvim
|
||||
-- tsserver = function(_, opts)
|
||||
-- require("typescript").setup({ server = opts })
|
||||
-- return true
|
||||
-- end,
|
||||
-- -- Specify * to use this function as a fallback for any server
|
||||
-- -- ["*"] = function(server, opts) end,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- for typescript, LazyVim also includes extra specs to properly setup lspconfig,
|
||||
-- treesitter, mason and typescript.nvim. So instead of the above, you can use:
|
||||
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||
|
||||
-- add more treesitter parsers
|
||||
-- {
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- opts = {
|
||||
-- ensure_installed = {
|
||||
-- "bash",
|
||||
-- "html",
|
||||
-- "javascript",
|
||||
-- "json",
|
||||
-- "lua",
|
||||
-- "markdown",
|
||||
-- "markdown_inline",
|
||||
-- "python",
|
||||
-- "query",
|
||||
-- "regex",
|
||||
-- "tsx",
|
||||
-- "typescript",
|
||||
-- "vim",
|
||||
-- "yaml",
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
|
||||
-- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above
|
||||
-- would overwrite `ensure_installed` with the new value.
|
||||
-- If you'd rather extend the default config, use the code below instead:
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = function(_, opts)
|
||||
-- add tsx and treesitter
|
||||
vim.list_extend(opts.ensure_installed, {
|
||||
"tsx",
|
||||
"typescript",
|
||||
"bash",
|
||||
"html",
|
||||
"javascript",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"python",
|
||||
"query",
|
||||
"regex",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"vim",
|
||||
"yaml",
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- the opts function can also be used to change the default opts:
|
||||
-- {
|
||||
-- "nvim-lualine/lualine.nvim",
|
||||
-- event = "VeryLazy",
|
||||
-- opts = function(_, opts)
|
||||
-- table.insert(opts.sections.lualine_x, {
|
||||
-- function()
|
||||
-- return "😄"
|
||||
-- end,
|
||||
-- })
|
||||
-- end,
|
||||
-- },
|
||||
|
||||
-- or you can return new options to override all the defaults
|
||||
-- {
|
||||
-- "nvim-lualine/lualine.nvim",
|
||||
-- event = "VeryLazy",
|
||||
-- opts = function()
|
||||
-- return {
|
||||
-- --[[add your custom lualine config here]]
|
||||
-- }
|
||||
-- end,
|
||||
-- },
|
||||
|
||||
-- use mini.starter instead of alpha
|
||||
{ import = "lazyvim.plugins.extras.ui.mini-starter" },
|
||||
|
||||
-- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc
|
||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||
|
||||
-- add any tools you want to have installed below
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
opts = {
|
||||
ensure_installed = {
|
||||
"stylua",
|
||||
"shellcheck",
|
||||
"shfmt",
|
||||
"flake8",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue