21 files changed, 24 insertions, 21 deletions
diff --git a/.config/nvim/ftplugin/c.lua b/.config/nvim/ftplugin/c.lua
deleted file mode 100644
index 4fd8004..0000000
--- a/.config/nvim/ftplugin/c.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "c"
diff --git a/.config/nvim/ftplugin/dockerfile.lua b/.config/nvim/ftplugin/dockerfile.lua
deleted file mode 100644
index 98fa710..0000000
--- a/.config/nvim/ftplugin/dockerfile.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "dockerfile"
diff --git a/.config/nvim/ftplugin/go.lua b/.config/nvim/ftplugin/go.lua
deleted file mode 100644
index 218b634..0000000
--- a/.config/nvim/ftplugin/go.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "go"
diff --git a/.config/nvim/ftplugin/graphql.lua b/.config/nvim/ftplugin/graphql.lua
deleted file mode 100644
index 83e8878..0000000
--- a/.config/nvim/ftplugin/graphql.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "graphql"
diff --git a/.config/nvim/ftplugin/haskell.lua b/.config/nvim/ftplugin/haskell.lua
deleted file mode 100644
index 374bed1..0000000
--- a/.config/nvim/ftplugin/haskell.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "haskell"
diff --git a/.config/nvim/ftplugin/html.lua b/.config/nvim/ftplugin/html.lua
deleted file mode 100644
index c60394c..0000000
--- a/.config/nvim/ftplugin/html.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "html"
diff --git a/.config/nvim/ftplugin/javascript.lua b/.config/nvim/ftplugin/javascript.lua
deleted file mode 100644
index 37b95c7..0000000
--- a/.config/nvim/ftplugin/javascript.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "javascript"
diff --git a/.config/nvim/ftplugin/javascriptreact.lua b/.config/nvim/ftplugin/javascriptreact.lua
deleted file mode 100644
index 9092016..0000000
--- a/.config/nvim/ftplugin/javascriptreact.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "javascriptreact"
diff --git a/.config/nvim/ftplugin/json.lua b/.config/nvim/ftplugin/json.lua
index 18368cf..9483cd0 100644
--- a/.config/nvim/ftplugin/json.lua
+++ b/.config/nvim/ftplugin/json.lua
@@ -1 +1,6 @@
-require("lsp").setup "json"
+options.lang.json.formatters = {
+  {
+    exe = "prettier",
+    args = {},
+  },
+}
diff --git a/.config/nvim/ftplugin/kotlin.lua b/.config/nvim/ftplugin/kotlin.lua
deleted file mode 100644
index a0e6d5d..0000000
--- a/.config/nvim/ftplugin/kotlin.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "kotlin"
diff --git a/.config/nvim/ftplugin/lua.lua b/.config/nvim/ftplugin/lua.lua
index 2ed8831..d0408a1 100644
--- a/.config/nvim/ftplugin/lua.lua
+++ b/.config/nvim/ftplugin/lua.lua
@@ -1 +1,5 @@
-require("lsp").setup "lua"
+options.lang.lua.formatters = {
+  {
+    exe = "stylua",
+  },
+}
diff --git a/.config/nvim/ftplugin/python.lua b/.config/nvim/ftplugin/python.lua
index fbe1beb..81812fc 100644
--- a/.config/nvim/ftplugin/python.lua
+++ b/.config/nvim/ftplugin/python.lua
@@ -1 +1,13 @@
-require("lsp").setup "python"
+options.lang.python.formatters = {
+  {
+    exe = "black",
+    args = {},
+  },
+}
+
+options.lang.python.linters = {
+  {
+    exe = "flake8",
+    args = {},
+  },
+}
diff --git a/.config/nvim/ftplugin/rust.lua b/.config/nvim/ftplugin/rust.lua
deleted file mode 100644
index 3831055..0000000
--- a/.config/nvim/ftplugin/rust.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "rust"
diff --git a/.config/nvim/ftplugin/sh.lua b/.config/nvim/ftplugin/sh.lua
deleted file mode 100644
index 4f18fbc..0000000
--- a/.config/nvim/ftplugin/sh.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "sh"
diff --git a/.config/nvim/ftplugin/sql.lua b/.config/nvim/ftplugin/sql.lua
deleted file mode 100644
index b465802..0000000
--- a/.config/nvim/ftplugin/sql.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "sql"
diff --git a/.config/nvim/ftplugin/terraform.lua b/.config/nvim/ftplugin/terraform.lua
deleted file mode 100644
index 3486663..0000000
--- a/.config/nvim/ftplugin/terraform.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "terraform"
diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua
deleted file mode 100644
index e9a98ec..0000000
--- a/.config/nvim/ftplugin/tex.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "tex"
diff --git a/.config/nvim/ftplugin/toml.lua b/.config/nvim/ftplugin/toml.lua
deleted file mode 100644
index 701685a..0000000
--- a/.config/nvim/ftplugin/toml.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.cmd [[setlocal commentstring=#%s]]
diff --git a/.config/nvim/ftplugin/vim.lua b/.config/nvim/ftplugin/vim.lua
deleted file mode 100644
index 88c00c1..0000000
--- a/.config/nvim/ftplugin/vim.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "vim"
diff --git a/.config/nvim/ftplugin/yaml.lua b/.config/nvim/ftplugin/yaml.lua
deleted file mode 100644
index d21f978..0000000
--- a/.config/nvim/ftplugin/yaml.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "yaml"
diff --git a/.config/nvim/ftplugin/zsh.lua b/.config/nvim/ftplugin/zsh.lua
deleted file mode 100644
index 4f18fbc..0000000
--- a/.config/nvim/ftplugin/zsh.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("lsp").setup "sh"