aboutsummaryrefslogtreecommitdiff
path: root/lua/config
diff options
context:
space:
mode:
Diffstat (limited to 'lua/config')
-rw-r--r--lua/config/conform.lua12
-rw-r--r--lua/config/init.lua1
-rw-r--r--lua/config/keys.lua4
-rw-r--r--lua/config/lsp.lua26
4 files changed, 42 insertions, 1 deletions
diff --git a/lua/config/conform.lua b/lua/config/conform.lua
index c581bdb..984c728 100644
--- a/lua/config/conform.lua
+++ b/lua/config/conform.lua
@@ -13,6 +13,18 @@ end)
require("conform").setup({
formatters_by_ft = {
lua = { "stylua" }, -- os package manager stylua
+ swift = { "swift" }, -- included with swift
+ -- prettierd -- os package manager prettierd or npm i -g @fsouza/prettierd
+ -- prettier -- should be installed in the project
+ javascript = { "prettierd", "prettier" },
+ javascriptreact = { "prettierd", "prettier" },
+ typescript = { "prettierd", "prettier" },
+ typescriptreact = { "prettierd", "prettier" },
+ json = { "prettierd", "prettier" },
+ html = { "prettierd", "prettier" },
+ css = { "prettierd", "prettier" },
+ svelte = { "prettierd", "prettier" },
+ astro = { "prettierd", "prettier" },
},
format_on_save = {
timeout_ms = 1001,
diff --git a/lua/config/init.lua b/lua/config/init.lua
index 5bf32c2..618e84a 100644
--- a/lua/config/init.lua
+++ b/lua/config/init.lua
@@ -2,5 +2,6 @@ require("config.opts")
require("config.keys")
require("config.plugins")
require("config.lsp")
+require("config.treesitter")
require("config.telescope")
require("config.conform")
diff --git a/lua/config/keys.lua b/lua/config/keys.lua
index bf13e21..cdb5cb4 100644
--- a/lua/config/keys.lua
+++ b/lua/config/keys.lua
@@ -1,9 +1,13 @@
+-- this is generic keymaps, plugin files might have their own
local vim = vim
vim.g.mapleader = " "
vim.g.maplocalleader = ","
+-- paste better
vim.keymap.set("x", "p", [["_dP]])
+
+-- tab keys
vim.keymap.set("v", "<Tab>", ">gv")
vim.keymap.set("v", "<S-Tab>", "<gv")
vim.keymap.set("n", "<Tab>", "v><C-\\><C-N>")
diff --git a/lua/config/lsp.lua b/lua/config/lsp.lua
index 6e8f870..bdccde9 100644
--- a/lua/config/lsp.lua
+++ b/lua/config/lsp.lua
@@ -9,6 +9,30 @@ vim.pack.add({
vim.lsp.enable({
"bashls", -- npm install -g bash-language-server
"lua_ls", -- os pkg manager lua-language-server
+ "sourcekit", -- swift bundled
+ "ts_ls", -- npm install -g typescript-language-server typescript
+ "css_ls", -- npm install -g vscode-css-languageservice
+ "emmet_language_server", -- npm install -g @olrtg/emmet-language-server
+ "svelte", -- npm install -g svelte-language-server
+ "astro", -- npm install -g @astrojs/language-server
})
-require("blink.cmp").setup({})
+require("blink.cmp").setup({
+ signature = { enabled = true },
+})
+
+vim.keymap.set("n", "grd", function()
+ vim.lsp.buf.definition()
+end)
+
+vim.keymap.set("n", "grl", function()
+ vim.diagnostic.open_float()
+end)
+
+vim.keymap.set("n", "[d", function()
+ vim.diagnostic.goto_prev()
+end)
+
+vim.keymap.set("n", "]d", function()
+ vim.diagnostic.goto_next()
+end)