diff --git a/nvim/dot-config/nvim/after/plugin/lspconfig.lua b/nvim/dot-config/nvim/after/plugin/lspconfig.lua index f5c5f0e..6f95a35 100644 --- a/nvim/dot-config/nvim/after/plugin/lspconfig.lua +++ b/nvim/dot-config/nvim/after/plugin/lspconfig.lua @@ -127,6 +127,7 @@ local servers = { globals = { "vim" }, }, workspace = { + checkThirdParty = false, library = vim.api.nvim_get_runtime_file("", true), }, telemetry = { diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 4823ad5..2d13d57 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -9,6 +9,7 @@ FD_EXISTS = vim.fn.executable("fd") RIPGREP_EXISTS = vim.fn.executable("rg") vim.g.mapleader = " " +vim.g.maplocalleader = " " -- vim.g.netrw_banner = 0 vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index 1f0d5d8..c6108d0 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -1,22 +1,32 @@ -local install_path = vim.fn.stdpath "data" .. "/site/pack/paqs/start/paq-nvim" -if vim.fn.empty(vim.fn.glob(install_path)) > 0 then - BOOTSTRAP = true - vim.fn.system { - "git", - "clone", - "--depth", - "1", - "https://github.com/savq/paq-nvim.git", - install_path, - } +local function clone_paq() + local path = vim.fn.stdpath "data" .. "/site/pack/paqs/start/paq-nvim" + local is_installed = vim.fn.empty(vim.fn.glob(path)) == 0 + if not is_installed then + vim.fn.system { + "git", + "clone", + "--depth", + "1", + "https://github.com/savq/paq-nvim.git", + path, + } + return true + end end -if BOOTSTRAP then +local function bootstrap_paq(packages) + local first_install = clone_paq() + local paq = require("paq") + + paq(packages) vim.cmd("packadd paq-nvim") - print "New installation. Run :PaqSync and restart nvim" + + if first_install then + paq.install() + end end -require "paq" { +bootstrap_paq { "savq/paq-nvim", "nvim-lua/plenary.nvim", "lewis6991/gitsigns.nvim", @@ -30,15 +40,11 @@ require "paq" { { "catppuccin/nvim", as = "catppuccin" }, { "williamboman/mason.nvim", branch = "v1.6.0" }, { "lukas-reineke/lsp-format.nvim", branch = "v2.5.1" }, - "stevearc/oil.nvim", - - -- Treesitter - { "nvim-treesitter/nvim-treesitter", branch = "master" }, + { "nvim-treesitter/nvim-treesitter", branch = "master" }, "nvim-treesitter/playground", "nvim-treesitter/nvim-treesitter-textobjects", "nvim-treesitter/nvim-treesitter-context", - - -- LSP & Completion + "stevearc/oil.nvim", "neovim/nvim-lspconfig", "hrsh7th/nvim-cmp", "hrsh7th/cmp-nvim-lsp",