Major refactor of nvim

27 files changed, 21 insertions, 84 deletions

diff --git a/.config/nvim/ftplugin/c.lua b/.config/nvim/ftplugin/c.lua
index c4fbdd1..4fd8004 100644
--- a/.config/nvim/ftplugin/c.lua
+++ b/.config/nvim/ftplugin/c.lua
@@ -1,4 +1 @@
-require("lang.clang").format()
-require("lang.clang").lint()
-require("lang.clang").lsp()
-require("lang.clang").dap()
+require("lsp").setup "c"
diff --git a/.config/nvim/ftplugin/dart.lua b/.config/nvim/ftplugin/dart.lua
deleted file mode 100644
index 1db4fe0..0000000
--- a/.config/nvim/ftplugin/dart.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("lang.dart").format()
-require("lang.dart").lint()
-require("lang.dart").lsp()
-require("lang.dart").dap()
diff --git a/.config/nvim/ftplugin/dockerfile.lua b/.config/nvim/ftplugin/dockerfile.lua
index 8a43c76..72ec7f9 100644
--- a/.config/nvim/ftplugin/dockerfile.lua
+++ b/.config/nvim/ftplugin/dockerfile.lua
@@ -1,4 +1 @@
-require("lang.dockerfile").format()
-require("lang.dockerfile").lint()
-require("lang.dockerfile").lsp()
-require("lang.dockerfile").dap()
+require("lsp").setup "docker"
diff --git a/.config/nvim/ftplugin/elixir.lua b/.config/nvim/ftplugin/elixir.lua
deleted file mode 100644
index a93d6da..0000000
--- a/.config/nvim/ftplugin/elixir.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-
-require("lang.elixir").format()
-require("lang.elixir").lint()
-require("lang.elixir").lsp()
-require("lang.elixir").dap()
diff --git a/.config/nvim/ftplugin/go.lua b/.config/nvim/ftplugin/go.lua
index e5b8475..218b634 100644
--- a/.config/nvim/ftplugin/go.lua
+++ b/.config/nvim/ftplugin/go.lua
@@ -1,4 +1 @@
-require("lang.go").format()
-require("lang.go").lint()
-require("lang.go").lsp()
-require("lang.go").dap()
+require("lsp").setup "go"
diff --git a/.config/nvim/ftplugin/graphql.lua b/.config/nvim/ftplugin/graphql.lua
index 30bddcc..83e8878 100644
--- a/.config/nvim/ftplugin/graphql.lua
+++ b/.config/nvim/ftplugin/graphql.lua
@@ -1,4 +1 @@
-require("lang.graphql").format()
-require("lang.graphql").lint()
-require("lang.graphql").lsp()
-require("lang.graphql").dap()
+require("lsp").setup "graphql"
diff --git a/.config/nvim/ftplugin/haskell.lua b/.config/nvim/ftplugin/haskell.lua
new file mode 100644
index 0000000..374bed1
--- /dev/null
+++ b/.config/nvim/ftplugin/haskell.lua
@@ -0,0 +1 @@
+require("lsp").setup "haskell"
diff --git a/.config/nvim/ftplugin/html.lua b/.config/nvim/ftplugin/html.lua
index 70c3295..c60394c 100644
--- a/.config/nvim/ftplugin/html.lua
+++ b/.config/nvim/ftplugin/html.lua
@@ -1,4 +1 @@
-require("lang.html").format()
-require("lang.html").lint()
-require("lang.html").lsp()
-require("lang.html").dap()
+require("lsp").setup "html"
diff --git a/.config/nvim/ftplugin/javascript.lua b/.config/nvim/ftplugin/javascript.lua
index fc59ab6..37b95c7 100644
--- a/.config/nvim/ftplugin/javascript.lua
+++ b/.config/nvim/ftplugin/javascript.lua
@@ -1 +1 @@
-require "lsp.tsserver-ls"
+require("lsp").setup "javascript"
diff --git a/.config/nvim/ftplugin/javascriptreact.lua b/.config/nvim/ftplugin/javascriptreact.lua
index fac6a20..9092016 100644
--- a/.config/nvim/ftplugin/javascriptreact.lua
+++ b/.config/nvim/ftplugin/javascriptreact.lua
@@ -1,2 +1 @@
-require "lsp.tsserver-ls"
-vim.cmd "setl ts=2 sw=2"
+require("lsp").setup "javascriptreact"
diff --git a/.config/nvim/ftplugin/json.lua b/.config/nvim/ftplugin/json.lua
index 0408f9b..18368cf 100644
--- a/.config/nvim/ftplugin/json.lua
+++ b/.config/nvim/ftplugin/json.lua
@@ -1,4 +1 @@
-require("lang.json").format()
-require("lang.json").lint()
-require("lang.json").lsp()
-require("lang.json").dap()
+require("lsp").setup "json"
diff --git a/.config/nvim/ftplugin/kotlin.lua b/.config/nvim/ftplugin/kotlin.lua
index 2677c28..a0e6d5d 100644
--- a/.config/nvim/ftplugin/kotlin.lua
+++ b/.config/nvim/ftplugin/kotlin.lua
@@ -1,4 +1 @@
-require("lang.kotlin").format()
-require("lang.kotlin").lint()
-require("lang.kotlin").lsp()
-require("lang.kotlin").dap()
+require("lsp").setup "kotlin"
diff --git a/.config/nvim/ftplugin/lua.lua b/.config/nvim/ftplugin/lua.lua
index 37ebab4..2ed8831 100644
--- a/.config/nvim/ftplugin/lua.lua
+++ b/.config/nvim/ftplugin/lua.lua
@@ -1,4 +1 @@
-require("lang.lua").format()
-require("lang.lua").lint()
-require("lang.lua").lsp()
-require("lang.lua").dap()
+require("lsp").setup "lua"
diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua
index 85f08be..fbe1beb 100644
--- a/.config/nvim/ftplugin/python.lua
+++ b/.config/nvim/ftplugin/python.lua
@@ -1,4 +1 @@
-require("lang.python").format()
-require("lang.python").lint()
-require("lang.python").lsp()
-require("lang.python").dap()
+require("lsp").setup "python"
diff --git a/.config/nvim/ftplugin/rust.lua b/.config/nvim/ftplugin/rust.lua
index 7472840..3831055 100644
--- a/.config/nvim/ftplugin/rust.lua
+++ b/.config/nvim/ftplugin/rust.lua
@@ -1,4 +1 @@
-require("lang.rust").format()
-require("lang.rust").lint()
-require("lang.rust").lsp()
-require("lang.rust").dap()
+require("lsp").setup "rust"
diff --git a/.config/nvim/ftplugin/sh.lua b/.config/nvim/ftplugin/sh.lua
index ee3a27d..4f18fbc 100644
--- a/.config/nvim/ftplugin/sh.lua
+++ b/.config/nvim/ftplugin/sh.lua
@@ -1,4 +1 @@
-require("lang.sh").format()
-require("lang.sh").lint()
-require("lang.sh").lsp()
-require("lang.sh").dap()
+require("lsp").setup "sh"
diff --git a/.config/nvim/ftplugin/sql.lua b/.config/nvim/ftplugin/sql.lua
new file mode 100644
index 0000000..b465802
--- /dev/null
+++ b/.config/nvim/ftplugin/sql.lua
@@ -0,0 +1 @@
+require("lsp").setup "sql"
diff --git a/.config/nvim/ftplugin/swift.lua b/.config/nvim/ftplugin/swift.lua
deleted file mode 100644
index 64d87e1..0000000
--- a/.config/nvim/ftplugin/swift.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("lang.swift").format()
-require("lang.swift").lint()
-require("lang.swift").lsp()
-require("lang.swift").dap()
diff --git a/.config/nvim/ftplugin/terraform.lua b/.config/nvim/ftplugin/terraform.lua
new file mode 100644
index 0000000..3486663
--- /dev/null
+++ b/.config/nvim/ftplugin/terraform.lua
@@ -0,0 +1 @@
+require("lsp").setup "terraform"
diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua
index 3de774f..e9a98ec 100644
--- a/.config/nvim/ftplugin/tex.lua
+++ b/.config/nvim/ftplugin/tex.lua
@@ -1,4 +1 @@
-require("lang.tex").format()
-require("lang.tex").lint()
-require("lang.tex").lsp()
-require("lang.tex").dap()
+require("lsp").setup "tex"
diff --git a/.config/nvim/ftplugin/toml.lua b/.config/nvim/ftplugin/toml.lua
new file mode 100644
index 0000000..701685a
--- /dev/null
+++ b/.config/nvim/ftplugin/toml.lua
@@ -0,0 +1 @@
+vim.cmd [[setlocal commentstring=#%s]]
diff --git a/.config/nvim/ftplugin/typescript.lua b/.config/nvim/ftplugin/typescript.lua
deleted file mode 100644
index fac6a20..0000000
--- a/.config/nvim/ftplugin/typescript.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require "lsp.tsserver-ls"
-vim.cmd "setl ts=2 sw=2"
diff --git a/.config/nvim/ftplugin/typescriptreact.lua b/.config/nvim/ftplugin/typescriptreact.lua
deleted file mode 100644
index fac6a20..0000000
--- a/.config/nvim/ftplugin/typescriptreact.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-require "lsp.tsserver-ls"
-vim.cmd "setl ts=2 sw=2"
diff --git a/.config/nvim/ftplugin/vim.lua b/.config/nvim/ftplugin/vim.lua
index 0b5f5ea..88c00c1 100644
--- a/.config/nvim/ftplugin/vim.lua
+++ b/.config/nvim/ftplugin/vim.lua
@@ -1,4 +1 @@
-require("lang.vim").format()
-require("lang.vim").lint()
-require("lang.vim").lsp()
-require("lang.vim").dap()
+require("lsp").setup "vim"
diff --git a/.config/nvim/ftplugin/yaml.lua b/.config/nvim/ftplugin/yaml.lua
index f38f258..d21f978 100644
--- a/.config/nvim/ftplugin/yaml.lua
+++ b/.config/nvim/ftplugin/yaml.lua
@@ -1,4 +1 @@
-require("lang.yaml").format()
-require("lang.yaml").lint()
-require("lang.yaml").lsp()
-require("lang.yaml").dap()
+require("lsp").setup "yaml"
diff --git a/.config/nvim/ftplugin/zig.lua b/.config/nvim/ftplugin/zig.lua
deleted file mode 100644
index 9b39176..0000000
--- a/.config/nvim/ftplugin/zig.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require("lang.zig").format()
-require("lang.zig").lint()
-require("lang.zig").lsp()
-require("lang.zig").dap()
diff --git a/.config/nvim/ftplugin/zsh.lua b/.config/nvim/ftplugin/zsh.lua
index 4dfbb7b..4f18fbc 100644
--- a/.config/nvim/ftplugin/zsh.lua
+++ b/.config/nvim/ftplugin/zsh.lua
@@ -1,4 +1 @@
-require("lang.zsh").format()
-require("lang.zsh").lint()
-require("lang.zsh").lsp()
-require("lang.zsh").dap()
+require("lsp").setup "sh"