things

4 files changed, 44 insertions, 17 deletions

diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
index c417026..116b9db 100644
--- a/.config/nvim/lua/lsp.lua
+++ b/.config/nvim/lua/lsp.lua
@@ -141,23 +141,6 @@ lspconfig.sqls.setup {
   },
 }
 
--- local lsp = require 'lspconfig'
--- local configs = require 'lspconfig.configs'
-
--- if not configs.jai_lsp then
--- configs.jai_lsp = {
--- default_config = {
--- cmd = { 'jails' },
--- filetypes = { 'jai' },
--- }
--- }
--- end
-
--- lspconfig.jai_lsp.setup({
--- on_attach = on_attach,
--- capabilities = capabilities,
--- })
-
 lspconfig.ols.setup({
   on_attach = on_attach,
   capabilities = capabilities,
@@ -169,6 +152,23 @@ lspconfig.ols.setup({
     enable_inlay_hints = true,
   }
 })
+local lsp = require("lsp-zero")
+local lspconfig = require("lspconfig")
+lsp.extend_lspconfig()
+
+local configs = require("lspconfig.configs")
+if not configs.jails then
+  configs.jails = {
+    default_config = {
+      cmd = { "jails" },
+      root_dir = lspconfig.util.root_pattern("jails.json", "build.jai", "main.jai"),
+      filetypes = { "jai" },
+      name = "Jails",
+    },
+  }
+end
+lspconfig.jails.setup({})
+vim.filetype.add({ extension = { jai = "jai", } })
 
 vim.api.nvim_create_autocmd('BufWritePre', {
   pattern = '*.go',
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index a68da80..dc855b9 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -138,5 +138,15 @@ return require('lazy').setup({
     event = "VeryLazy",
     opts = {
     },
+    },
+  {
+    "VonHeikemen/lsp-zero.nvim",
+    branch = "v2.x",
+    config = false,
+    init = function()
+      -- Disable automatic setup, we are doing it manually
+      vim.g.lsp_zero_extend_cmp = 0
+      vim.g.lsp_zero_extend_lspconfig = 0
+    end,
   },
 })
diff --git a/.config/nvim/lua/treesitter.lua b/.config/nvim/lua/treesitter.lua
index 011ea9f..ce17c70 100644
--- a/.config/nvim/lua/treesitter.lua
+++ b/.config/nvim/lua/treesitter.lua
@@ -23,3 +23,15 @@ require 'nvim-treesitter.configs'.setup {
     -- [options]
   },
 }
+local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+parser_config.jai = {
+  install_info = {
+    url = "/home/algo/code/github/tree-sitter-jai/",
+    files = { "src/parser.c", "src/scanner.c" },
+  },
+  filetype = "jai",
+  filetype_to_parsername = "jai",
+  indent = {
+    enable = true
+  }
+}
diff --git a/.config/sway/config b/.config/sway/config
index cecea05..4a9c559 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -282,6 +282,11 @@ output eDP-2 {
  	scale 1.25
 }
 
+output eDP-1 {
+	position 4000,640
+ 	scale 1.25
+}
+
 input type:touchpad {
     tap enabled
     natural_scroll enabled