Diff
1diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json
2index f4ae0709b32a5c575b82b3bc7f9de5d27e639714..0e1bdc1665a5407cbb0418f165e99c21b5d80884 100644
3--- a/dot_config/nvim/lazy-lock.json
4+++ b/dot_config/nvim/lazy-lock.json
5@@ -9,6 +9,7 @@
6 "go.nvim": { "branch": "master", "commit": "d73ea5bc00f0d7b726b0ddfc29cea17a544459ba" },
7 "gruvbox.nvim": { "branch": "main", "commit": "477c62493c82684ed510c4f70eaf83802e398898" },
8 "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" },
9+ "jester": { "branch": "main", "commit": "424b96970ac49da7b1298502e03143a8f11d5bcf" },
10 "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" },
11 "lsp-zero.nvim": { "branch": "v3.x", "commit": "22d2186bee730d68f6fd3bb2d19a389784c37a96" },
12 "lualine.nvim": { "branch": "master", "commit": "7533b0ead663d80452210c0c089e5105089697e5" },
13diff --git a/dot_config/nvim/lua/lsp.lua b/dot_config/nvim/lua/lsp.lua
14index 58f283633fc0f0fd38559fa371d179d40e32d992..d60cf5aa14338496c94f210ac777597297d2462b 100644
15--- a/dot_config/nvim/lua/lsp.lua
16+++ b/dot_config/nvim/lua/lsp.lua
17@@ -9,12 +9,13 @@ lsp_zero.on_attach(function(_, bufnr)
18 lsp_zero.default_keymaps({buffer = bufnr})
19
20 local opts = {buffer = bufnr, remap = false}
21- vim.keymap.set("n", "<leader>vc", function() vim.lsp.buf.code_action() end, opts)
22- vim.keymap.set("n", "<leader>vr", function() vim.lsp.buf.rename() end, opts)
23+ vim.keymap.set("n", "<leader>vc", vim.lsp.buf.code_action, opts)
24+ vim.keymap.set("n", "<leader>vr", vim.lsp.buf.rename, opts)
25
26- vim.keymap.set("n", "<leader>en", function() vim.diagnostic.goto_next() end, opts)
27- vim.keymap.set("n", "<leader>ep", function() vim.diagnostic.goto_prev() end, opts)
28- vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
29+ vim.keymap.set("n", "<leader>en", vim.diagnostic.goto_next, opts)
30+ vim.keymap.set("n", "<leader>ep", vim.diagnostic.goto_prev, opts)
31+ vim.keymap.set("n", "<leader>ei", vim.diagnostic.open_float, opts)
32+ vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
33
34 vim.keymap.set("n", "gr", function() telescope.lsp_references({
35 include_declaration = false,
36@@ -53,7 +54,7 @@ lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
37 -- python
38 lspconfig.pylsp.setup({})
39 -- typescript
40--- lspconfig.eslint.setup({})
41+lspconfig.eslint.setup({})
42 lspconfig.tsserver.setup({})
43 local prettier = {
44 formatCommand = 'prettierd "${INPUT}"',
45diff --git a/dot_config/nvim/lua/mappings.lua b/dot_config/nvim/lua/mappings.lua
46index 156c817edd80685d363de56b7b2ce2f15357e097..c394795df7e4d619d9f0589b27ce99eb21749bc1 100644
47--- a/dot_config/nvim/lua/mappings.lua
48+++ b/dot_config/nvim/lua/mappings.lua
49@@ -75,16 +75,29 @@ require('telescope').setup({
50
51 local telescope = require('telescope.builtin')
52
53-local git_files = function()
54- telescope.git_files({
55+local files =function() xpcall(
56+ function() telescope.git_files{
57 show_untracked = true,
58 use_git_root = false,
59- })
60-end
61+ } end,
62+ function() telescope.find_files{
63+ hidden = true,
64+ } end
65+)end
66
67-vim.keymap.set('n', '<leader>ff', git_files, opts)
68-vim.keymap.set('n', '<c-p>', git_files, opts)
69-vim.keymap.set('n', '<leader>fp', function() telescope.find_files({hidden=true}) end, opts)
70-vim.keymap.set('n', '<leader>rg', telescope.live_grep, opts)
71+vim.keymap.set('n', '<leader>ff', files, opts)
72+vim.keymap.set('n', '<c-p>', files, opts)
73+vim.keymap.set('n', '<leader>rg', function()
74+ telescope.grep_string{ shorten_path = true, word_match = "-w", only_sort_text = true, search = '' }
75+end, opts)
76 vim.keymap.set('n', '<leader>fb', telescope.buffers, opts)
77 vim.keymap.set('n', '<leader>fh', telescope.help_tags, opts)
78+
79+-- Neotest
80+local jester = require("jester")
81+vim.keymap.set("n", "<leader>tt", jester.run, opts)
82+vim.keymap.set("n", "<leader>tl", jester.run_last, opts)
83+vim.keymap.set("n", "<leader>tf", jester.run_file, opts)
84+vim.keymap.set("n", "<leader>tdt", jester.debug, opts)
85+vim.keymap.set("n", "<leader>tdl", jester.debug_last, opts)
86+vim.keymap.set("n", "<leader>tdf", jester.debug_file, opts)
87diff --git a/dot_config/nvim/lua/plugins/tools.lua b/dot_config/nvim/lua/plugins/tools.lua
88new file mode 100644
89index 0000000000000000000000000000000000000000..5bc3ee2b05f84539e57c55e7fdda2d263417b36e
90--- /dev/null
91+++ b/dot_config/nvim/lua/plugins/tools.lua
92@@ -0,0 +1,11 @@
93+return {
94+ {
95+ "David-Kunz/jester",
96+ config = function()
97+ require('jester').setup({
98+ cmd = "yarn test -t '$result' $file",
99+ terminal_cmd = ":15split | terminal",
100+ })
101+ end
102+ },
103+}
104diff --git a/dot_config/nvim/lua/sets.lua b/dot_config/nvim/lua/sets.lua
105index 17fab3ba0ab5c587c0e63243991ea4828b10cb73..4dad9a4747ff82ad047527336333a88b85c8a5c2 100644
106--- a/dot_config/nvim/lua/sets.lua
107+++ b/dot_config/nvim/lua/sets.lua
108@@ -33,3 +33,4 @@ vim.opt.undodir = "/home/pavle/.local/share/nvim/undodir"
109 vim.opt.scrolloff = 8
110 vim.opt.ignorecase = true
111 vim.opt.smartcase = true
112+vim.opt.shell = '/usr/bin/zsh'