summary refs log tree commit diff
path: root/.vim
diff options
context:
space:
mode:
Diffstat (limited to '.vim')
-rw-r--r--.vim/init.lua2
-rw-r--r--.vim/lua/internal/job.lua3
-rw-r--r--.vim/lua/internal/lsp.lua4
-rw-r--r--.vim/lua/plugins.lua22
4 files changed, 11 insertions, 20 deletions
diff --git a/.vim/init.lua b/.vim/init.lua
index a527204..daa991f 100644
--- a/.vim/init.lua
+++ b/.vim/init.lua
@@ -91,7 +91,7 @@ if vim.fn.executable('rg') then
 end
 
 -- persistent undo
-local undodir = vim.fn.stdpath('cache') .. '/undodir_' .. vim.env.USER
+local undodir = vim.fn.stdpath('cache') .. '/undodir'
 if vim.fn.isdirectory(undodir) == 0 then
   vim.fn.mkdir(undodir, 'p', '0700')
 end
diff --git a/.vim/lua/internal/job.lua b/.vim/lua/internal/job.lua
index 5e3b6e1..64d9837 100644
--- a/.vim/lua/internal/job.lua
+++ b/.vim/lua/internal/job.lua
@@ -1,4 +1,3 @@
-local Job = require ('plenary.job')
 local spinner_ok, spinner = pcall(require, 'spinner.core')
 
 local M = {
@@ -97,7 +96,7 @@ function M.jobstart(opts)
     opts.args[i] = vim.fn.expandcmd(opts.args[i])
   end
 
-  local j = Job:new(opts)
+  local j = require ('plenary.job'):new(opts)
   j:start()
 
   return j
diff --git a/.vim/lua/internal/lsp.lua b/.vim/lua/internal/lsp.lua
index 1e3dca3..aa2794e 100644
--- a/.vim/lua/internal/lsp.lua
+++ b/.vim/lua/internal/lsp.lua
@@ -113,9 +113,7 @@ local servers = {
       clang = { excludeArgs = { '-frounding-math' } },
     },
   },
-  clangd = {
-    root_dir = lsp.util.root_pattern('.ccls','meson.build','.git'),
-  },
+  clangd = {},
   elixirls = {
     cmd = { 'elixir-ls' },
     settings = {
diff --git a/.vim/lua/plugins.lua b/.vim/lua/plugins.lua
index 287d08f..1293989 100644
--- a/.vim/lua/plugins.lua
+++ b/.vim/lua/plugins.lua
@@ -1,12 +1,12 @@
 -- vim: fdm=marker fdl=0
 ---@diagnostic disable: undefined-global
-
 -- load by calling `lua require('plugins')` from init.vim
 
 local g = vim.g
 
 -- force packer into a system directory {{{
 if not vim.fn.filewritable(vim.fn.stdpath('cache')) == 2 then
+-- TODO: what does this check for?
   return
 end
 
@@ -51,11 +51,6 @@ if not (vim.fn.empty(vim.fn.glob(compilepath)) > 0) then
 end
 
 require('packer').startup({function()
-  -- run sync() if compilepath doesn't exist (this usually means first start)
-  if packer_bootstrapped then
-    require('packer').sync()
-  end
-
   -- auto-compile on save -- {{{
   do
     vim.api.nvim_create_user_command('PackerRecompile',
@@ -78,6 +73,12 @@ require('packer').startup({function()
     })
   end -- }}}
 
+  -- run sync() if packer was just bootstrapped, usually means fresh install
+  if packer_bootstrapped then
+    -- require('packer').sync()
+    vim.cmd.PackerRecompile()
+  end
+
   -- disable built-in plugins
   disable_distribution_plugins()
 
@@ -246,8 +247,6 @@ require('packer').startup({function()
     'zig',
 
     'org',
-    'norg_meta',
-    'norg_table',
     'hare',
     'gotmpl',
   } -- }}}
@@ -1279,12 +1278,7 @@ require('packer').startup({function()
       end
     end} -- }}}
 
-  use {'~/devel/projects/k2', rtp = 'nvim', module = {'k2'}, cmd = {'K2'}, -- {{{
-    config = function()
-      require('k2').setup()
-    end} -- }}}
-
-  use {'~/devel/projects/spinner.nvim', module = {'spinner'}, -- {{{
+  use {'https://git.sr.ht/~robertgzr/spinner.nvim', module = {'spinner'}, -- {{{
     config = function()
       require('spinner').setup {
         spinner = {'⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'},