diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index ccbd79c..4bce38d 100644 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -7,4 +7,4 @@ function ColorMyPencils(color) end -ColorMyPencils() +-- ColorMyPencils() diff --git a/lazy-lock.json b/lazy-lock.json index f538e2e..f0c01be 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,8 +1,11 @@ { "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, + "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "d1114ca5ff28ffcd0bc2a3fdd4c13019b1c41812" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "neovim": { "branch": "main", "commit": "17b466e79479758b332a3cac12544a3ad2be6241" }, @@ -10,12 +13,11 @@ "nvim-cmp": { "branch": "main", "commit": "cd2cf0c124d3de577fb5449746568ee8e601afc8" }, "nvim-lspconfig": { "branch": "master", "commit": "a3d9395455f2b2e3b50a0b0f37b8b4c23683f44a" }, "nvim-treesitter": { "branch": "master", "commit": "1be5aa99e3e0e4a36c31fa7066dcf46a4e0142dd" }, - "packer.nvim": { "branch": "master", "commit": "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "4d5fd21bae12ee6e9a79232e1c377f43c419d0c5" }, "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, - "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" } + "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/juliuswaldmann/lazynvim.lua b/lua/juliuswaldmann/lazynvim.lua index 1b76a14..34f43d6 100644 --- a/lua/juliuswaldmann/lazynvim.lua +++ b/lua/juliuswaldmann/lazynvim.lua @@ -1,22 +1,19 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then - vim.fn.system({ - "git", - "clone", - "--filter=blob:none", - "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release - lazypath, - }) + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end vim.opt.rtp:prepend(lazypath) local lazy = require('lazy') return lazy.setup({ - -- Packer can manage itself - 'wbthomason/packer.nvim', - -- Telescope with dependencies 'nvim-lua/plenary.nvim', 'nvim-telescope/telescope.nvim', @@ -35,17 +32,17 @@ return lazy.setup({ { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", - config = function () - local configs = require("nvim-treesitter.configs") + config = function() + local configs = require("nvim-treesitter.configs") - configs.setup({ - ensure_installed = {}, - sync_install = false, - highlight = { enable = true }, - indent = { enable = true }, + configs.setup({ + ensure_installed = {}, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true }, }) end - }, + }, -- Other useful plugins 'theprimeagen/harpoon', @@ -54,23 +51,24 @@ return lazy.setup({ 'tpope/vim-vinegar', { - "neovim/nvim-lspconfig", - - dependencies = { - "williamboman/mason.nvim", - "williamboman/mason-lspconfig.nvim", "neovim/nvim-lspconfig", - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-nvim-lsp', - 'L3MON4D3/LuaSnip' - }, - config = function() - local lspconfig = require("lspconfig") - local mason = require("mason") + dependencies = { + "williamboman/mason.nvim", + "VonHeikemen/lsp-zero.nvim", + "williamboman/mason-lspconfig.nvim", + "neovim/nvim-lspconfig", + 'hrsh7th/nvim-cmp', + 'hrsh7th/cmp-nvim-lsp', + 'L3MON4D3/LuaSnip' + }, - mason.setup() - end, + config = function() + local lspconfig = require("lspconfig") + local mason = require("mason") + + mason.setup() + end, }, -- Auto pairs { @@ -79,6 +77,29 @@ return lazy.setup({ require("nvim-autopairs").setup {} end }, + { + 'stevearc/conform.nvim', + opts = {}, + }, + { + "jbyuki/instant.nvim", + config = function() + vim.g.instant_username = "juliuswaldmann" + end + }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + } -- Uncomment these lines if you want to use the plugins -- use 'nvim-tree/nvim-tree.lua'