From 8eed75d67f9cbcefb91c4cb5aac0ffd013be25cc Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 13 Sep 2021 11:28:15 +0200
Subject: refactor: use more flexible paths (#1381)

---
 lua/plugin-loader.lua | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'lua/plugin-loader.lua')

diff --git a/lua/plugin-loader.lua b/lua/plugin-loader.lua
index aa1e888d..5921e9f1 100644
--- a/lua/plugin-loader.lua
+++ b/lua/plugin-loader.lua
@@ -1,9 +1,13 @@
 local plugin_loader = {}
 
-function plugin_loader:init()
-  local install_path = "~/.local/share/lunarvim/site/pack/packer/start/packer.nvim"
-  if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
-    vim.fn.system { "git", "clone", "https://github.com/wbthomason/packer.nvim", install_path }
+function plugin_loader:init(opts)
+  opts = opts or {}
+
+  local package_root = opts.package_root or vim.fn.stdpath "data" .. "/site/pack"
+  local compile_path = opts.compile_path or vim.fn.stdpath "config" .. "/plugin/packer_compile.lua"
+
+  if vim.fn.empty(vim.fn.glob(package_root)) > 0 then
+    vim.fn.system { "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", package_root }
     vim.cmd "packadd packer.nvim"
   end
 
@@ -12,15 +16,13 @@ function plugin_loader:init()
     return
   end
 
-  local util = require "packer.util"
-
   packer.init {
-    package_root = util.join_paths "~/.local/share/lunarvim/site/pack/",
-    compile_path = util.join_paths("~/.config/lvim", "plugin", "packer_compiled.lua"),
+    package_root = package_root,
+    compile_path = compile_path,
     git = { clone_timeout = 300 },
     display = {
       open_fn = function()
-        return util.float { border = "rounded" }
+        return require("packer.util").float { border = "rounded" }
       end,
     },
   }
@@ -39,8 +41,4 @@ function plugin_loader:load(configurations)
   end)
 end
 
-return {
-  init = function()
-    return plugin_loader:init()
-  end,
-}
+return plugin_loader
-- 
cgit v1.2.3


From 414777077fc8cd76a83fe3b97c80c149f7dd7d0d Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 13 Sep 2021 17:22:27 +0200
Subject: fix: use correct install path for packer (#1540)

---
 lua/plugin-loader.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lua/plugin-loader.lua')

diff --git a/lua/plugin-loader.lua b/lua/plugin-loader.lua
index 5921e9f1..08f0e5a0 100644
--- a/lua/plugin-loader.lua
+++ b/lua/plugin-loader.lua
@@ -3,11 +3,12 @@ local plugin_loader = {}
 function plugin_loader:init(opts)
   opts = opts or {}
 
+  local install_path = opts.install_path or vim.fn.stdpath "data" .. "/site/pack/packer/start/packer.nvim"
   local package_root = opts.package_root or vim.fn.stdpath "data" .. "/site/pack"
   local compile_path = opts.compile_path or vim.fn.stdpath "config" .. "/plugin/packer_compile.lua"
 
-  if vim.fn.empty(vim.fn.glob(package_root)) > 0 then
-    vim.fn.system { "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", package_root }
+  if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+    vim.fn.system { "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }
     vim.cmd "packadd packer.nvim"
   end
 
-- 
cgit v1.2.3


From e22f9a21c179901e6dfcbdb68d035e70eae4d9e8 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Thu, 16 Sep 2021 09:58:32 +0200
Subject: fix: more robust reloading (#1556)

---
 lua/plugin-loader.lua | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'lua/plugin-loader.lua')

diff --git a/lua/plugin-loader.lua b/lua/plugin-loader.lua
index 08f0e5a0..c20dd21a 100644
--- a/lua/plugin-loader.lua
+++ b/lua/plugin-loader.lua
@@ -1,11 +1,15 @@
 local plugin_loader = {}
 
+local utils = require "utils"
+local Log = require "core.log"
+-- we need to reuse this outside of init()
+local compile_path = get_config_dir() .. "/plugin/packer_compiled.lua"
+
 function plugin_loader:init(opts)
   opts = opts or {}
 
   local install_path = opts.install_path or vim.fn.stdpath "data" .. "/site/pack/packer/start/packer.nvim"
   local package_root = opts.package_root or vim.fn.stdpath "data" .. "/site/pack"
-  local compile_path = opts.compile_path or vim.fn.stdpath "config" .. "/plugin/packer_compile.lua"
 
   if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
     vim.fn.system { "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }
@@ -32,6 +36,20 @@ function plugin_loader:init(opts)
   return self
 end
 
+function plugin_loader:cache_clear()
+  if vim.fn.delete(compile_path) == 0 then
+    Log:debug "deleted packer_compiled.lua"
+  end
+end
+
+function plugin_loader:cache_reset()
+  self.cache_clear()
+  require("packer").compile()
+  if utils.is_file(compile_path) then
+    Log:debug "generated packer_compiled.lua"
+  end
+end
+
 function plugin_loader:load(configurations)
   return self.packer.startup(function(use)
     for _, plugins in ipairs(configurations) do
-- 
cgit v1.2.3