14 files changed, 19 insertions, 20 deletions

diff --git a/ftplugin/bash.lua b/ftplugin/bash.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/bash.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/go.lua b/ftplugin/go.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/go.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/html.lua b/ftplugin/html.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/html.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/jai.lua b/ftplugin/jai.lua
index f3fb7eb..5b0f4e8 100644
--- a/ftplugin/jai.lua
+++ b/ftplugin/jai.lua
@@ -36,7 +36,7 @@ if SETUP_TREESITTER then
       cp ~/opt/tree-sitter-jai/queries/*  ~/.config/nvim-jai/queries/jai/
     ]]
   -- Tell neovim about the treesitter plugin and its DLL path
-  vim.treesitter.language.add('jai', { path = vim.fn.expand('~/opt/tree-sitter-jai/build/libtree-sitter-jai.so') })
+  vim.treesitter.language.add('jai', { path = vim.fn.expand('~/.local/share/jai-treesitter/tree-sitter-jai/build/libtree-sitter-jai.so') })
 
   -- Automatically start treesitter on filetypes that we have a treesitter installation for
   vim.api.nvim_create_autocmd('FileType', {
@@ -143,7 +143,7 @@ vim.o.errorformat = jai_errfmt .. ',' .. vim.o.errorformat
 
 -- keymap to open the Jai installation directory in a new tab, for :grep
 vim.keymap.set('n', '<space>jm', function()
-  local jaipath = '~/opt/jai'
+  local jaipath = '~/dox/jai'
   vim.cmd.tabedit(jaipath .. '/modules/Basic/Print.jai')
   vim.cmd.tcd(jaipath)
 end, { desc = 'Open Jai modules (and how_tos) directory' })
@@ -156,7 +156,7 @@ vim.keymap.set('n', '<space>jb', function()
   if jai_files then
     vim.ui.select(jai_files, { prompt='Select a file to build'}, function(item)
       if item then
-        vim.opt.makeprg = 'jai "' .. item .. '"'
+        vim.opt.makeprg = 'jai-linux "' .. item .. '"'
         print("Make program set to " .. vim.opt.makeprg:get())
         vim.cmd.make() -- optional, build it too
       end
@@ -174,6 +174,3 @@ vim.keymap.set({'n', 'v'}, '<F12>', function() vim.lsp.buf.definition() end, { d
 -- Recommended to use UI2 if available. See :help ui2
 local _, ui2 = pcall(require, 'vim._core.ui2')
 if ui2 then ui2.enable() end
-
--- Just for me ;)
-vim.opt_global.background = 'light'
diff --git a/ftplugin/json.lua b/ftplugin/json.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/json.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/just.lua b/ftplugin/just.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/just.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/markdown.lua b/ftplugin/markdown.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/markdown.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/nix.lua b/ftplugin/nix.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/nix.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/python.lua b/ftplugin/python.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/python.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/qml.lua b/ftplugin/qml.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/qml.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/yaml.lua b/ftplugin/yaml.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/yaml.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/ftplugin/zsh.lua b/ftplugin/zsh.lua
deleted file mode 100644
index fe6caae..0000000
--- a/ftplugin/zsh.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index 4284957..1624b62 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -2,9 +2,10 @@ vim.pack.add({
   { src = "https://github.com/nvim-treesitter/nvim-treesitter" },
 })
 ---@diagnostic disable: missing-fields
-require 'nvim-treesitter'.setup {}
-
-require 'nvim-treesitter'.install { 'go', 'nix', 'lua', 'json', 'html', 'markdown_inline', 'python', 'bash', 'zsh', 'just', 'yaml' }
+require 'nvim-treesitter'.setup {
+  ensure_installed = { 'go', 'nix', 'lua', 'json', 'html', 'markdown_inline', 'python', 'bash', 'zsh', 'just', 'yaml' },
+  auto_install = false,
+}
 
 -- run tsupdate when updating nvim-treesitter
 vim.api.nvim_create_autocmd('PackChanged', {
diff --git a/nvim-pack-lock.json b/nvim-pack-lock.json
index 15988b5..b9492a9 100644
--- a/nvim-pack-lock.json
+++ b/nvim-pack-lock.json
@@ -48,10 +48,22 @@
       "rev": "d97d85e01339f01b842e6ec1502f639b080cb0fc",
       "src": "https://github.com/hrsh7th/nvim-cmp"
     },
+    "nvim-dap": {
+      "rev": "45a69eba683a2c448dd9ecfc4de89511f0646b5f",
+      "src": "https://github.com/mfussenegger/nvim-dap"
+    },
+    "nvim-dap-ui": {
+      "rev": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49",
+      "src": "https://github.com/rcarriga/nvim-dap-ui"
+    },
     "nvim-lspconfig": {
       "rev": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
+    "nvim-nio": {
+      "rev": "21f5324bfac14e22ba26553caf69ec76ae8a7662",
+      "src": "https://github.com/nvim-neotest/nvim-nio"
+    },
     "nvim-treesitter": {
       "rev": "539abf6da5ee8702e37b82cc953131dadd570da2",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter"