From 1f52e22b17923848a292279324357f039b1b8c95 Mon Sep 17 00:00:00 2001 From: Crony Akatsuki Date: Mon, 20 Oct 2025 18:51:25 +0200 Subject: [PATCH] feat(neovim): use built-in package manager. --- init.lua | 5 ++--- lazy-lock.json | 6 ----- lua/config/init.lua | 3 +++ lua/config/lazy.lua | 45 ------------------------------------- lua/config/pack.lua | 5 +++++ lua/config/settings.lua | 5 ++--- lua/plugins/colorscheme.lua | 14 ++---------- lua/plugins/init.lua | 1 + lua/plugins/lsp.lua | 12 +++------- lua/plugins/treesitter.lua | 39 +++++++++++++------------------- nvim-pack-lock.json | 16 +++++++++++++ 11 files changed, 50 insertions(+), 101 deletions(-) delete mode 100644 lazy-lock.json create mode 100644 lua/config/init.lua delete mode 100644 lua/config/lazy.lua create mode 100644 lua/config/pack.lua create mode 100644 lua/plugins/init.lua create mode 100644 nvim-pack-lock.json diff --git a/init.lua b/init.lua index 8976f87..a75bc2d 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,2 @@ -require("config.settings") -require("config.lazy") -require("config.keybindings") +require("config") +require("plugins") diff --git a/lazy-lock.json b/lazy-lock.json deleted file mode 100644 index 44ff11f..0000000 --- a/lazy-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, - "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" } -} diff --git a/lua/config/init.lua b/lua/config/init.lua new file mode 100644 index 0000000..33773ad --- /dev/null +++ b/lua/config/init.lua @@ -0,0 +1,3 @@ +require('config.settings') +require('config.keybindings') +require('config.pack') diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua deleted file mode 100644 index b5bab23..0000000 --- a/lua/config/lazy.lua +++ /dev/null @@ -1,45 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -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(lazypath) - ---setup lazy.nvim -require("lazy").setup({ - spec = { - -- import plugins from specific directory - { import = "plugins" }, - }, - -- setup correct colorscheme - install = { colorscheme = { "gruvbox"} }, - -- automatically check for plugin updates - checker = { enabled = true }, - rocks = { - enabled = false - }, - performance = { - rtp = { - disabled_plugins = { - "gzip", - "matchit", - "matchparen", - "netrwPlugin", - "tarPlugin", - "tohtml", - "tutor", - "zipPlugin", - }, - }, - }, -}) diff --git a/lua/config/pack.lua b/lua/config/pack.lua new file mode 100644 index 0000000..a24bd02 --- /dev/null +++ b/lua/config/pack.lua @@ -0,0 +1,5 @@ +vim.pack.add({ + {src = "https://github.com/ellisonleao/gruvbox.nvim"}, + {src = "https://github.com/nvim-treesitter/nvim-treesitter"}, + {src = "https://github.com/neovim/nvim-lspconfig"}, +}) diff --git a/lua/config/settings.lua b/lua/config/settings.lua index 50c5be3..3fdff37 100644 --- a/lua/config/settings.lua +++ b/lua/config/settings.lua @@ -26,6 +26,5 @@ vim.opt.inccommand = "split" -- ignore case vim.opt.ignorecase = true --- setup leader and local leader -vim.g.mapleader = " " -vim.g.maplocalleader = ";" +-- disable neovim swap files +vim.opt.swapfile = false diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 696deb4..f82912a 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -1,12 +1,2 @@ -return { - { - "ellisonleao/gruvbox.nvim", - lazy = false, - priority = 1000, - config = function() - -- load colorscheme here - vim.o.background = "dark" - vim.cmd([[colorscheme gruvbox]]) - end, - }, -} +vim.o.background = "dark" +vim.cmd([[colorscheme gruvbox]]) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua new file mode 100644 index 0000000..cb496ab --- /dev/null +++ b/lua/plugins/init.lua @@ -0,0 +1 @@ +require("plugins.colorscheme") diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index aa96f78..22ce210 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,9 +1,3 @@ -return { - { - "neovim/nvim-lspconfig", - config = function() - - vim.lsp.enable("nixd") - end, - }, -} +vim.lsp.enable( + "nixd" +) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index e51ef9b..e9d94e8 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,26 +1,19 @@ -return { - { - "nvim-treesitter/nvim-treesitter", - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "go", "nix" }, +require("nvim-treesitter.configs").setup({ + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "go", "nix" }, - auto_install = true, + auto_install = true, - highlight = { - enable = true, - }, - - incremental_selection = { - enable = true, - keymaps = { - init_selection = "ss", - node_incremental = "si", - scope_incremental = "sc", - node_decremental = "sd", - }, - }, - }) - end, + highlight = { + enable = true, }, -} + + incremental_selection = { + enable = true, + keymaps = { + init_selection = "ss", + node_incremental = "si", + scope_incremental = "sc", + node_decremental = "sd", + }, + }, +}) diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json new file mode 100644 index 0000000..b6d8b78 --- /dev/null +++ b/nvim-pack-lock.json @@ -0,0 +1,16 @@ +{ + "plugins": { + "gruvbox.nvim": { + "rev": "5e0a460", + "src": "https://github.com/ellisonleao/gruvbox.nvim" + }, + "nvim-lspconfig": { + "rev": "ac98db2", + "src": "https://github.com/neovim/nvim-lspconfig" + }, + "nvim-treesitter": { + "rev": "42fc28ba", + "src": "https://github.com/nvim-treesitter/nvim-treesitter" + } + } +} \ No newline at end of file