From cd2b5591f950a7c9986edf2a6b167d89f3702f7e Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 17 Jan 2022 23:17:29 +0100 Subject: Rename installer to install --- init.lua | 2 +- lua/install.lua | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ lua/installer.lua | 55 ------------------------------------------------------- 3 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 lua/install.lua delete mode 100644 lua/installer.lua diff --git a/init.lua b/init.lua index cfaf83b..3f33435 100644 --- a/init.lua +++ b/init.lua @@ -1,5 +1,5 @@ -- Loads plugins for Neovim. require("settings") -require("installer") +require("install") require("config") diff --git a/lua/install.lua b/lua/install.lua new file mode 100644 index 0000000..8564aec --- /dev/null +++ b/lua/install.lua @@ -0,0 +1,55 @@ +-- Installs plugins with packer. + +local fn = vim.fn +local plugins = require("plugins") + +-- Automatically install packer +local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" +if fn.empty(fn.glob(install_path)) > 0 then + PACKER_BOOTSTRAP = fn.system({ + "git", + "clone", + "--depth", + "1", + "https://github.com/wbthomason/packer.nvim", + install_path, + }) + print("Installing packer close and reopen Neovim...") + vim.cmd([[packadd packer.nvim]]) +end + +-- Autocommand that reloads neovim whenever you save the plugins.lua file +vim.cmd([[ + augroup packer_user_config + autocmd! + autocmd BufWritePost plugins.lua source | PackerSync + augroup end +]]) + +-- Use a protected call so we don't error out on first use +local status_ok, packer = pcall(require, "packer") +if not status_ok then + return +end + +-- Have packer use a popup window +packer.init({ + display = { + open_fn = function() + return require("packer.util").float({ border = "rounded" }) + end, + }, +}) + +-- Install your plugins here +return packer.startup(function(use) + for _, plugin in ipairs(plugins) do + use(plugin) + end + + -- Automatically set up your configuration after cloning packer.nvim + -- Put this at the end after all plugins + if PACKER_BOOTSTRAP then + require("packer").sync() + end +end) diff --git a/lua/installer.lua b/lua/installer.lua deleted file mode 100644 index 96e9f57..0000000 --- a/lua/installer.lua +++ /dev/null @@ -1,55 +0,0 @@ --- Plugin installer using packer.. - -local fn = vim.fn -local plugins = require("plugins") - --- Automatically install packer -local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" -if fn.empty(fn.glob(install_path)) > 0 then - PACKER_BOOTSTRAP = fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - install_path, - }) - print("Installing packer close and reopen Neovim...") - vim.cmd([[packadd packer.nvim]]) -end - --- Autocommand that reloads neovim whenever you save the plugins.lua file -vim.cmd([[ - augroup packer_user_config - autocmd! - autocmd BufWritePost plugins.lua source | PackerSync - augroup end -]]) - --- Use a protected call so we don't error out on first use -local status_ok, packer = pcall(require, "packer") -if not status_ok then - return -end - --- Have packer use a popup window -packer.init({ - display = { - open_fn = function() - return require("packer.util").float({ border = "rounded" }) - end, - }, -}) - --- Install your plugins here -return packer.startup(function(use) - for _, plugin in ipairs(plugins) do - use(plugin) - end - - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins - if PACKER_BOOTSTRAP then - require("packer").sync() - end -end) -- cgit v1.2.3-70-g09d2