From fd1d777f4593f53eabde2494eb40b080a421839f Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Sat, 23 Nov 2024 21:55:44 +0100 Subject: [PATCH] Update lazyvim config files --- .chezmoiignore | 12 ---- dot_config/nvim/lazy-lock.json | 58 +++++++++++++++++++ dot_config/nvim/lazyvim.json | 13 +++++ dot_config/nvim/lua/config/autocmds.lua | 8 --- dot_config/nvim/lua/config/lazy.lua | 24 +++++--- dot_config/nvim/lua/config/options.lua | 18 ------ dot_config/nvim/lua/plugins/core.lua | 4 -- dot_config/nvim/lua/plugins/disabled.lua | 5 -- dot_config/nvim/lua/plugins/disabled.lua.tmpl | 10 ++++ dot_config/nvim/lua/plugins/telescope.lua | 14 ----- 10 files changed, 98 insertions(+), 68 deletions(-) create mode 100644 dot_config/nvim/lazy-lock.json create mode 100644 dot_config/nvim/lazyvim.json delete mode 100644 dot_config/nvim/lua/plugins/core.lua delete mode 100644 dot_config/nvim/lua/plugins/disabled.lua create mode 100644 dot_config/nvim/lua/plugins/disabled.lua.tmpl delete mode 100644 dot_config/nvim/lua/plugins/telescope.lua diff --git a/.chezmoiignore b/.chezmoiignore index 49ad22c..0f270d5 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -10,20 +10,8 @@ LICENSE .Xresources .xsession .config/openbox/* -.config/nvim/after -.config/nvim/lua/plugins/editor.lua .config/nvim/lua/plugins/lsp.lua -.config/nvim/lua/plugins/git.lua -.config/nvim/lua/plugins/treesitter.lua -.config/nvim/lua/plugins/format.lua -.config/nvim/lua/plugins/telescope.lua {{ else }} -.config/nvim/lazyvim.json -.config/nvim/stylua.toml -.config/nvim/lua/config -.config/nvim/lua/plugins/telescope.lua -.config/nvim/lua/plugins/core.lua -.config/nvim/lua/plugins/disabled.lua .config/fish/conf.d/fish-ssh-agent.fish .config/fish/functions/__ssh_agent_* {{ end }} diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json new file mode 100644 index 0000000..54193e0 --- /dev/null +++ b/dot_config/nvim/lazy-lock.json @@ -0,0 +1,58 @@ +{ + "LazyVim": { "branch": "main", "commit": "adcbfc72fd8d0808d78bdfe0940d98c6432c4ef0" }, + "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, + "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" }, + "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "conform.nvim": { "branch": "master", "commit": "62d5accad8b29d6ba9b58d3dff90c43a55621c60" }, + "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" }, + "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, + "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, + "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" }, + "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" }, + "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "noice.nvim": { "branch": "main", "commit": "9ccd02965382922c33762933c5601318f93e19fb" }, + "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "6059927ee649f02fcc819efc213ea78ee9eb2a7d" }, + "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, + "nvim-lspconfig": { "branch": "master", "commit": "c646154d6e4db9b2979eeb517d0b817ad00c9c47" }, + "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, + "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, + "nvim-treesitter": { "branch": "master", "commit": "efb2e9c607cab1e4f7171493b7c6f63bd39073fc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "oil.nvim": { "branch": "master", "commit": "99ce32f4a2ecf76263b72fcc31efb163faa1a941" }, + "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "render-markdown.nvim": { "branch": "main", "commit": "e1879e0ea3d5cee295b48335fc90e76ae8a63081" }, + "rustaceanvim": { "branch": "master", "commit": "6e742b9fc6a37e46181879f6c32cecfa8cd2cebf" }, + "snacks.nvim": { "branch": "main", "commit": "f99aa0c46493c365f01aaacb4f34c98c8ad3bed2" }, + "telekasten.nvim": { "branch": "main", "commit": "6a10a7929421d6e696e46bbc5aa5627a8cbcf61d" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" }, + "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" }, + "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } +} diff --git a/dot_config/nvim/lazyvim.json b/dot_config/nvim/lazyvim.json new file mode 100644 index 0000000..620327b --- /dev/null +++ b/dot_config/nvim/lazyvim.json @@ -0,0 +1,13 @@ +{ + "extras": [ + "lazyvim.plugins.extras.lang.clangd", + "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.rust", + "lazyvim.plugins.extras.ui.dashboard-nvim" + ], + "news": { + "NEWS.md": "7429" + }, + "version": 7 +} \ No newline at end of file diff --git a/dot_config/nvim/lua/config/autocmds.lua b/dot_config/nvim/lua/config/autocmds.lua index 5b11f88..af027fb 100644 --- a/dot_config/nvim/lua/config/autocmds.lua +++ b/dot_config/nvim/lua/config/autocmds.lua @@ -1,14 +1,6 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here -vim.api.nvim_create_autocmd("FileType", { - pattern = { "norg" }, - callback = function() - vim.opt_local.wrap = true - vim.opt_local.spell = true - end, -}) - vim.api.nvim_create_autocmd("FileType", { pattern = { "markdown" }, callback = function() diff --git a/dot_config/nvim/lua/config/lazy.lua b/dot_config/nvim/lua/config/lazy.lua index ec08493..d73bfa1 100644 --- a/dot_config/nvim/lua/config/lazy.lua +++ b/dot_config/nvim/lua/config/lazy.lua @@ -1,16 +1,23 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then - -- bootstrap lazy.nvim - -- stylua: ignore - vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath }) +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end end -vim.opt.rtp:prepend(vim.env.LAZY or lazypath) +vim.opt.rtp:prepend(lazypath) require("lazy").setup({ spec = { -- add LazyVim and import its plugins { "LazyVim/LazyVim", import = "lazyvim.plugins" }, - -- import any extras modules here -- import/override with your plugins { import = "plugins" }, }, @@ -24,7 +31,10 @@ require("lazy").setup({ -- version = "*", -- try installing the latest stable version for plugins that support semver }, install = { colorscheme = { "tokyonight", "habamax" } }, - checker = { enabled = true, notify = false, frequency = 259200 }, -- automatically check for plugin updates + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates performance = { rtp = { -- disable some rtp plugins diff --git a/dot_config/nvim/lua/config/options.lua b/dot_config/nvim/lua/config/options.lua index 0bd805a..3ea1454 100644 --- a/dot_config/nvim/lua/config/options.lua +++ b/dot_config/nvim/lua/config/options.lua @@ -1,21 +1,3 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here - -if vim.g.neovide then - vim.g.neovide_cursor_animation_length = 0 - vim.o.guifont = "BrutalistMono Nerd Font Regular:h16" - vim.g.neovide_theme = "dark" - vim.keymap.set("n", "", ":w") -- Save - vim.keymap.set("v", "", '"+y') -- Copy - vim.keymap.set("n", "", '"+P') -- Paste normal mode - vim.keymap.set("v", "", '"+P') -- Paste visual mode - vim.keymap.set("c", "", "+") -- Paste command mode - vim.keymap.set("i", "", 'l"+Pli') -- Paste insert mode -end - --- Allow clipboard copy paste in neovim -vim.api.nvim_set_keymap("", "", "+p", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("!", "", "+", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("t", "", "+", { noremap = true, silent = true }) -vim.api.nvim_set_keymap("v", "", "+", { noremap = true, silent = true }) diff --git a/dot_config/nvim/lua/plugins/core.lua b/dot_config/nvim/lua/plugins/core.lua deleted file mode 100644 index 19d97fa..0000000 --- a/dot_config/nvim/lua/plugins/core.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - { "folke/lazy.nvim", version = false }, - { "LazyVim/LazyVim", version = false }, -} diff --git a/dot_config/nvim/lua/plugins/disabled.lua b/dot_config/nvim/lua/plugins/disabled.lua deleted file mode 100644 index 58cc82d..0000000 --- a/dot_config/nvim/lua/plugins/disabled.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - { "echasnovski/mini.pairs", enabled = false }, - { "nvim-neo-tree/neo-tree.nvim", enabled = false }, - { "akinsho/bufferline.nvim", enabled = false }, -} diff --git a/dot_config/nvim/lua/plugins/disabled.lua.tmpl b/dot_config/nvim/lua/plugins/disabled.lua.tmpl new file mode 100644 index 0000000..b6924f5 --- /dev/null +++ b/dot_config/nvim/lua/plugins/disabled.lua.tmpl @@ -0,0 +1,10 @@ +return { + { "echasnovski/mini.pairs", enabled = false }, + { "nvim-neo-tree/neo-tree.nvim", enabled = false }, + { "akinsho/bufferline.nvim", enabled = false }, +{{- if eq .chezmoi.os "openbsd" }} + { "lukas-reineke/indent-blankline.nvim", enabled = false }, + { "williamboman/mason-lspconfig.nvim", enabled = false }, + { "williamboman/mason.nvim", enabled = false }, +{{- end }} +} diff --git a/dot_config/nvim/lua/plugins/telescope.lua b/dot_config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index da00f32..0000000 --- a/dot_config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - -- add telescope-fzf-native - "nvim-telescope/telescope.nvim", - keys = { - { "", "Telescope find_files", desc = "Find Files" }, - }, - dependencies = { - "nvim-telescope/telescope-fzf-native.nvim", - build = "make", - config = function() - require("telescope").load_extension("fzf") - end, - }, -}