f1a20c9dff5055785af73c83dab11fe7015374f2

Author
Pavle Portic <git@theedgeofrage.com>
Committer
Pavle Portic <git@theedgeofrage.com>
Date

Message

Update nvim config

Diff

 1diff --git a/dot_config/nvim/lua/lsp.lua b/dot_config/nvim/lua/lsp.lua
 2index de678f023dd8109954ab626c40a85121c2e76bad..58f283633fc0f0fd38559fa371d179d40e32d992 100644
 3--- a/dot_config/nvim/lua/lsp.lua
 4+++ b/dot_config/nvim/lua/lsp.lua
 5@@ -9,7 +9,6 @@ lsp_zero.on_attach(function(_, bufnr)
 6     lsp_zero.default_keymaps({buffer = bufnr})
 7 
 8     local opts = {buffer = bufnr, remap = false}
 9-    vim.keymap.set("n", "<leader>vw", function() vim.lsp.buf.workspace_symbol() end, opts)
10     vim.keymap.set("n", "<leader>vc", function() vim.lsp.buf.code_action() end, opts)
11     vim.keymap.set("n", "<leader>vr", function() vim.lsp.buf.rename() end, opts)
12 
13@@ -46,13 +45,6 @@ lsp_zero.format_on_save({
14 
15 -- Setup LSP servers
16 local lspconfig = require("lspconfig")
17-local prettier = {
18-    formatCommand = 'prettierd "${INPUT}"',
19-    formatStdin = true,
20-    env = {
21-        string.format('PRETTIERD_DEFAULT_CONFIG=%s', vim.fn.expand('~/.config/nvim/utils/linter-config/.prettierrc.json')),
22-    },
23-}
24 -- go
25 lspconfig.golangci_lint_ls.setup({})
26 lspconfig.gopls.setup({})
27@@ -61,8 +53,15 @@ lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
28 -- python
29 lspconfig.pylsp.setup({})
30 -- typescript
31-lspconfig.eslint.setup({})
32+-- lspconfig.eslint.setup({})
33 lspconfig.tsserver.setup({})
34+local prettier = {
35+    formatCommand = 'prettierd "${INPUT}"',
36+    formatStdin = true,
37+    env = {
38+        string.format('PRETTIERD_DEFAULT_CONFIG=%s', vim.fn.expand('~/.config/nvim/utils/linter-config/.prettierrc.json')),
39+    },
40+}
41 local languages = {
42     -- lua = { stylua },
43     typescript = { prettier },
44diff --git a/dot_config/nvim/lua/mappings.lua b/dot_config/nvim/lua/mappings.lua
45index f32422bbcd416ec5692fe0f99d9ac85a491f06ab..156c817edd80685d363de56b7b2ce2f15357e097 100644
46--- a/dot_config/nvim/lua/mappings.lua
47+++ b/dot_config/nvim/lua/mappings.lua
48@@ -76,7 +76,10 @@ require('telescope').setup({
49 local telescope = require('telescope.builtin')
50 
51 local git_files = function()
52-    telescope.git_files({show_untracked = true})
53+    telescope.git_files({
54+        show_untracked = true,
55+        use_git_root = false,
56+    })
57 end
58 
59 vim.keymap.set('n', '<leader>ff', git_files, opts)