diff --git a/nvim/after/lsp/sqls.lua b/nvim/after/lsp/sqls.lua new file mode 100644 index 0000000..087999c --- /dev/null +++ b/nvim/after/lsp/sqls.lua @@ -0,0 +1,19 @@ +return { + settings = { + sqls = { + lowercaseKeywords = true, + connections = { + { + driver = "postgresql", + dataSourceName = os.getenv("DATABASEURL"), + proto = "tcp", + user = os.getenv("PGUSER"), + passwd = os.getenv("PGPASSWORD"), + host = os.getenv("PGHOST"), + port = 5432, + dbName = os.getenv("PGDATABASE"), + }, + }, + }, + }, +} diff --git a/nvim/default.nix b/nvim/default.nix index 4a2b7f7..4cce0a8 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -139,7 +139,7 @@ in zls lua-language-server bash-language-server - hyprls + sqls # gopls also needs go /shame gopls @@ -156,5 +156,9 @@ in csharpier biome ruff + + # repl + usql + lua ]; } diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 6a3a454..2976d76 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -1,23 +1,25 @@ -vim.lsp.enable("lua_ls") -vim.lsp.enable("hls") -vim.lsp.enable("rust_analyzer") -vim.lsp.enable("clangd") -vim.lsp.enable("basedpyright") -vim.lsp.enable("nil_ls") -vim.lsp.enable("ts_ls") -vim.lsp.enable("yamlls") -vim.lsp.enable("marksman") -vim.lsp.enable("texlab") -vim.lsp.enable("html") -vim.lsp.enable("cssls") -vim.lsp.enable("helm_ls") -vim.lsp.enable("zls") -vim.lsp.enable("gopls") -vim.lsp.enable("bashls") -vim.lsp.enable("jsonls") -vim.lsp.enable("hyprls") -vim.lsp.enable("biome") --- vim.lsp.enable("roslyn_ls") +vim.lsp.enable({ + "lua_ls", + "hls", + "rust_analyzer", + "clangd", + "basedpyright", + "nil_ls", + "ts_ls", + "yamlls", + "marksman", + "texlab", + "html", + "cssls", + "helm_ls", + "zls", + "gopls", + "bashls", + "jsonls", + "biome", + "sqls", + -- "roslyn_ls" +}) vim.api.nvim_create_autocmd("LspAttach", { desc = "Custom lsp attach", diff --git a/nvim/lua/plugins/sniprun.lua b/nvim/lua/plugins/sniprun.lua index 864c30f..be05efd 100644 --- a/nvim/lua/plugins/sniprun.lua +++ b/nvim/lua/plugins/sniprun.lua @@ -2,8 +2,9 @@ return { { "sniprun", keys = { - { "r", "SnipRun", desc = "Run code", mode = { "n", "v" } }, - { "r", "SnipRunOperator", desc = "Run code", mode = { "o" } }, + { "r", "SnipRun", desc = "Run code", mode = { "v" } }, + { "r", "SnipRunOperator", desc = "Run code", mode = { "n" } }, + { "rr", "SnipRun", desc = "Run code", mode = { "n" } }, }, opts = { repl_enable = {}, @@ -12,6 +13,11 @@ return { live_display = { "VirtualTextOk" }, show_no_output = { "Classic" }, + snipruncolors = { + SniprunVirtualTextOk = { link = "Delimiter" }, + SniprunVirtualTextErr = { link = "Error" }, + }, + ansi_escape = true, }, after = function(plug)