work on better startup

tjdevries · tjdevries · commit 1cbcb01f7a0a · 2022-04-04T14:16:58.000-04:00
diff --git a/xdg_config/nvim/after/plugin/cmp_gh_source.lua b/xdg_config/nvim/after/plugin/cmp_gh_source.lua
@@ -1,4 +1,7 @@
-local Job = require "plenary.job"
+local ok, Job = pcall(require, "plenary.job")
+if not ok then
+  return
+end
 
 local source = {}
 
diff --git a/xdg_config/nvim/after/plugin/comments.lua b/xdg_config/nvim/after/plugin/comments.lua
@@ -1,3 +1,7 @@
+if not pcall(require, "Comment") then
+  return
+end
+
 require("Comment").setup {
 
   -- LHS of operator-pending mapping in NORMAL + VISUAL mode
diff --git a/xdg_config/nvim/after/plugin/completion.lua b/xdg_config/nvim/after/plugin/completion.lua
@@ -20,7 +20,11 @@ vim.api.nvim_set_keymap(
   { noremap = true }
 )
 
-local lspkind = require "lspkind"
+local ok, lspkind = pcall(require, "lspkind")
+if not ok then
+  return
+end
+
 lspkind.init()
 
 local cmp = require "cmp"
diff --git a/xdg_config/nvim/after/plugin/lsiftyped.lua b/xdg_config/nvim/after/plugin/lsiftyped.lua
@@ -1,4 +1,7 @@
-local Job = require "plenary.job"
+local ok, Job = pcall(require, "plenary.job")
+if not ok then
+  return
+end
 
 local group = vim.api.nvim_create_augroup("LsifTyped", { clear = true })
 vim.api.nvim_create_autocmd("BufReadCmd", {
diff --git a/xdg_config/nvim/after/plugin/luasnip.lua b/xdg_config/nvim/after/plugin/luasnip.lua
@@ -1,4 +1,4 @@
-if vim.g.snippets ~= "luasnip" then
+if vim.g.snippets ~= "luasnip" or not pcall(require, "luasnip") then
   return
 end
 
diff --git a/xdg_config/nvim/after/plugin/neorg.lua b/xdg_config/nvim/after/plugin/neorg.lua
@@ -1,3 +1,7 @@
+if not pcall(require, "neorg") then
+  return
+end
+
 require("neorg").setup {
   -- Tell Neorg what modules to load
   load = {
diff --git a/xdg_config/nvim/after/plugin/notify.lua b/xdg_config/nvim/after/plugin/notify.lua
@@ -1,12 +1,6 @@
--- Automatically opening the UI is deprecated.
--- You can replicate previous behaviour by adding the following to your config
-
--- local dap, dapui = require('dap'), require('dapui')
--- dap.listeners.after.event_initialized['dapui_config'] = function() dapui.open() end
--- dap.listeners.before.event_terminated['dapui_config'] = function() dapui.close() end
--- dap.listeners.before.event_exited['dapui_config'] = function() dapui.close() end
-
--- To hide this message, remove the `open_on_start` settings from your config
+if not pcall(require, "plenary") then
+  return
+end
 
 local log = require("plenary.log").new {
   plugin = "notify",
diff --git a/xdg_config/nvim/after/plugin/octo.lua b/xdg_config/nvim/after/plugin/octo.lua
@@ -1 +1,5 @@
+if not pcall(require, "octo") then
+  return
+end
+
 require("octo").setup {}
diff --git a/xdg_config/nvim/after/plugin/statusline.lua b/xdg_config/nvim/after/plugin/statusline.lua
@@ -1,4 +1,9 @@
 -- TODO: Need to add those sweet sweet lsp workspace diagnostic counts
+if not pcall(require, "el") then
+  -- TODO: Add in a nice default statusline here.
+  -- Would be good to research anyway for the course
+  return
+end
 
 RELOAD "el"
 require("el").reset_windows()
diff --git a/xdg_config/nvim/after/plugin/zen.lua b/xdg_config/nvim/after/plugin/zen.lua
@@ -1,3 +1,7 @@
+if not pcall(require, "zen-mode") then
+  return
+end
+
 require("zen-mode").setup {
   window = {
     backdrop = 0.999,
diff --git a/xdg_config/nvim/init.lua b/xdg_config/nvim/init.lua
@@ -48,10 +48,15 @@ Much of the configuration of individual plugins you can find in either:
 
 --]]
 
-pcall(require, "impatient")
+-- Attempt to run impatient, but it may not have been installed yet
+-- pcall(require, "impatient")
 
 require "tj.profile"
 
+-- Setup globals that I expect to be always available.
+--  See `./lua/tj/globals.lua` for more information.
+require "tj.globals"
+
 if require "tj.first_load"() then
   return
 end
@@ -67,10 +72,6 @@ vim.g.mapleader = ","
 -- These don't have any special meaning.
 vim.g.snippets = "luasnip"
 
--- Setup globals that I expect to be always available.
---  See `./lua/tj/globals/*.lua` for more information.
-require "tj.globals"
-
 -- Turn off builtin plugins I do not use.
 require "tj.disable_builtin"
 
diff --git a/xdg_config/nvim/lua/tj/first_load.lua b/xdg_config/nvim/lua/tj/first_load.lua
@@ -14,6 +14,7 @@ local download_packer = function()
   print(out)
   print "Downloading packer.nvim..."
   print "( You'll need to restart now )"
+  vim.cmd [[qa]]
 end
 
 return function()
diff --git a/xdg_config/nvim/lua/tj/globals.lua b/xdg_config/nvim/lua/tj/globals.lua
@@ -1,10 +1,17 @@
+local ok, plenary_reload = pcall(require, "plenary.reload")
+if not ok then
+  reloader = require
+else
+  reloader = plenary_reload.reload_module
+end
+
 P = function(v)
   print(vim.inspect(v))
   return v
 end
 
 RELOAD = function(...)
-  return require("plenary.reload").reload_module(...)
+  return reloader(...)
 end
 
 R = function(name)
diff --git a/xdg_config/nvim/lua/tj/lsp/init.lua b/xdg_config/nvim/lua/tj/lsp/init.lua
@@ -280,10 +280,12 @@ _ = require("nlua.lsp.nvim").setup(lspconfig, {
   },
 })
 
-require("sg.lsp").setup {
-  on_init = custom_init,
-  on_attach = custom_attach,
-}
+if pcall(require, "sg.lsp") then
+  require("sg.lsp").setup {
+    on_init = custom_init,
+    on_attach = custom_attach,
+  }
+end
 
 --[ An example of using functions...
 -- 0. nil -> do default (could be enabled or disabled)
diff --git a/xdg_config/nvim/lua/tj/plugins.lua b/xdg_config/nvim/lua/tj/plugins.lua
@@ -14,6 +14,9 @@ local is_wsl = (function()
   return not not string.find(output[1] or "", "WSL")
 end)()
 
+local is_mac = has "maxunix"
+local is_linx = not is_wsl and not is_mac
+
 -- require('packer.luarocks').cfg({ luarocks =
 
 return require("packer").startup {
@@ -48,7 +51,7 @@ return require("packer").startup {
     end
 
     use "wbthomason/packer.nvim"
-    use "lewis6991/impatient.nvim"
+    -- use "lewis6991/impatient.nvim"
     -- use "camspiers/snap"
 
     -- My Plugins
@@ -103,7 +106,7 @@ return require("packer").startup {
       ft = { "flutter", "dart" },
     }
 
-    use "/home/tjdevries/plugins/stackmap.nvim"
+    -- use "/home/tjdevries/plugins/stackmap.nvim"
     -- Plug "/home/bash/plugins/stackmap.nvim"
 
     -- use "simrat39/rust-tools.nvim"
@@ -142,7 +145,6 @@ return require("packer").startup {
     use { "nvim-telescope/telescope-hop.nvim" }
     use { "nvim-telescope/telescope-file-browser.nvim" }
     use { "nvim-telescope/telescope-ui-select.nvim" }
-    use { "nvim-telescope/telescope-smart-history.nvim" }
 
     -- local_use("nvim-telescope", "telescope-async-sorter-test.nvim")
 
@@ -157,13 +159,17 @@ return require("packer").startup {
     -- elianiva/telescope-npm.nvim
 
     local_use "telescope-hacks.nvim"
-    local_use "sg.nvim"
+    -- local_use "sg.nvim"
     local_use "green_light.nvim"
 
-    use { "tami5/sql.nvim", rocks = { "sqlite", "luv" } }
-    use "nvim-telescope/telescope-frecency.nvim"
-    use "nvim-telescope/telescope-cheat.nvim"
-    use { "nvim-telescope/telescope-arecibo.nvim", rocks = { "openssl", "lua-http-parser" } }
+    -- TODO: Need to figure out how to install all of this stuff on mac
+    if not is_mac then
+      use { "tami5/sql.nvim", rocks = { "sqlite", "luv" } }
+      use { "nvim-telescope/telescope-smart-history.nvim" }
+      use "nvim-telescope/telescope-frecency.nvim"
+      use "nvim-telescope/telescope-cheat.nvim"
+      use { "nvim-telescope/telescope-arecibo.nvim", rocks = { "openssl", "lua-http-parser" } }
+    end
 
     use {
       "antoinemadec/FixCursorHold.nvim",
@@ -267,23 +273,16 @@ return require("packer").startup {
     use "mkitt/tabline.vim"
 
     use "kyazdani42/nvim-web-devicons"
-    if not is_wsl then
+    if is_linux then
       use "yamatsum/nvim-web-nonicons"
     end
 
-    -- use { 'Shougo/defx.nvim', }
-    -- use "kyazdani42/nvim-tree.lua"
-
     -- TODO: This would be cool to add back, but it breaks sg.nvim for now.
     -- use "lambdalisue/vim-protocol"
 
     -- Undo helper
     use "sjl/gundo.vim"
 
-    -- TODO: This randomly disappeared? Find a replacement sometime.
-    -- Make cool signs for your files
-    -- use 'johannesthyssen/vim-signit'
-
     -- Crazy good box drawing
     use "gyim/vim-boxdraw"
 
@@ -295,19 +294,19 @@ return require("packer").startup {
     if use_folke then
       use "folke/zen-mode.nvim"
       use "folke/twilight.nvim"
-    end
-
-    use {
-      "junegunn/goyo.vim",
-      cmd = "Goyo",
-      disable = use_folke,
-    }
+    else
+      use {
+        "junegunn/goyo.vim",
+        cmd = "Goyo",
+        disable = use_folke,
+      }
 
-    use {
-      "junegunn/limelight.vim",
-      after = "goyo.vim",
-      disable = use_folke,
-    }
+      use {
+        "junegunn/limelight.vim",
+        after = "goyo.vim",
+        disable = use_folke,
+      }
+    end
 
     --
     --
@@ -340,7 +339,6 @@ return require("packer").startup {
 
       -- Godot
       use "habamax/vim-godot"
-      --
     end
 
     -- Wonder if I can make LSP do this and respect .prettier files.
@@ -399,10 +397,6 @@ return require("packer").startup {
     -- Completion stuff
     local_use "rofl.nvim"
 
-    -- use "hrsh7th/vim-vsnip"
-    -- use "hrsh7th/vim-vsnip-integ"
-    -- use 'norcalli/snippets.nvim'
-
     -- Cool tags based viewer
     --   :Vista  <-- Opens up a really cool sidebar with info about file.
     use { "liuchengxu/vista.vim", cmd = "Vista" }
@@ -414,11 +408,9 @@ return require("packer").startup {
     use "mfussenegger/nvim-dap"
     use "rcarriga/nvim-dap-ui"
     use "theHamsta/nvim-dap-virtual-text"
-    use "mfussenegger/nvim-dap-python"
     use "nvim-telescope/telescope-dap.nvim"
 
-    -- Pocco81/DAPInstall.nvim
-
+    use "mfussenegger/nvim-dap-python"
     use "jbyuki/one-small-step-for-vimkind"
 
     -- use {
@@ -546,7 +538,7 @@ return require("packer").startup {
       end,
     }
 
-    use "ThePrimeagen/harpoon"
+    -- use "ThePrimeagen/harpoon"
 
     -- use 'untitled-ai/jupyter_ascending.vim'
 
diff --git a/xdg_config/nvim/lua/tj/telescope/mappings.lua b/xdg_config/nvim/lua/tj/telescope/mappings.lua
@@ -1,3 +1,7 @@
+if not pcall(require, "telescope") then
+  return
+end
+
 local sorters = require "telescope.sorters"
 
 TelescopeMapArgs = TelescopeMapArgs or {}
diff --git a/xdg_config/nvim/lua/tj/telescope/setup.lua b/xdg_config/nvim/lua/tj/telescope/setup.lua
@@ -1,3 +1,7 @@
+if not pcall(require, "telescope") then
+  return
+end
+
 local actions = require "telescope.actions"
 local action_state = require "telescope.actions.state"
 local action_layout = require "telescope.actions.layout"
@@ -189,8 +193,9 @@ _ = require("telescope").load_extension "ui-select"
 _ = require("telescope").load_extension "fzf"
 _ = require("telescope").load_extension "git_worktree"
 _ = require("telescope").load_extension "neoclip"
-_ = require("telescope").load_extension "frecency"
-_ = require("telescope").load_extension "smart_history"
+
+pcall(require("telescope").load_extension, "smart_history")
+pcall(require("telescope").load_extension, "frecency")
 
 if vim.fn.executable "gh" == 1 then
   pcall(require("telescope").load_extension, "gh")
diff --git a/xdg_config/nvim/plugin/keymaps.lua b/xdg_config/nvim/plugin/keymaps.lua
@@ -1,5 +1,3 @@
-local curl = require "plenary.curl"
-
 local nmap = require("tj.keymap").nmap
 
 nmap {
@@ -38,6 +36,8 @@ nmap {
 }
 
 local markdown_paste = function(link)
+  local curl = require "plenary.curl"
+
   link = link or vim.fn.getreg "+"
 
   if not vim.startswith(link, "https://") then
diff --git a/xdg_config/nvim/plugin/packer_compiled.lua b/xdg_config/nvim/plugin/packer_compiled.lua

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if vim.g.snippets ~= "luasnip" then`
	`1`	`+if vim.g.snippets ~= "luasnip" or not pcall(require, "luasnip") then`
`2`	`2`	`return`
`3`	`3`	`end`
`4`	`4`
-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 +if not pcall(require, "octo") then
 +  return
 +end
++
 require("octo").setup {}