Skip to content

Commit a5c19dd

Browse files
felipemagrassifelipemagrassi
committed
seg 12 ago 2024 13:12:32 -03
1 parent b90f82c commit a5c19dd

File tree

2 files changed

+121
-79
lines changed

2 files changed

+121
-79
lines changed

‎init.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,6 @@ require('lazy').setup({
911911
},
912912
})
913913

914-
vim.cmd.colorscheme 'catppuccin-latte'
914+
vim.cmd.colorscheme 'cyberdream'
915915
-- The line beneath this is called `modeline`. See `:help modeline`
916916
-- vim: ts=2 sts=2 sw=2 et

‎lua/custom/plugins/init.lua‎

Lines changed: 120 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,23 @@ return {
127127
harpoon:setup()
128128

129129
vim.keymap.set('n', '<leader>a', function()
130-
harpoon:list():append()
130+
harpoon:list():add()
131131
end)
132+
132133
vim.keymap.set('n', '<C-e>', function()
133134
harpoon.ui:toggle_quick_menu(harpoon:list())
134135
end)
135136

136-
vim.keymap.set('n', '<C-h>', function()
137+
vim.keymap.set('n', '<C-1>', function()
137138
harpoon:list():select(1)
138139
end)
139-
vim.keymap.set('n', '<C-j>', function()
140+
vim.keymap.set('n', '<C-2>', function()
140141
harpoon:list():select(2)
141142
end)
142-
vim.keymap.set('n', '<C-k>', function()
143+
vim.keymap.set('n', '<C-3>', function()
143144
harpoon:list():select(3)
144145
end)
145-
vim.keymap.set('n', '<C-l>', function()
146+
vim.keymap.set('n', '<C-4>', function()
146147
harpoon:list():select(4)
147148
end)
148149

@@ -153,6 +154,28 @@ return {
153154
vim.keymap.set('n', '<C-S-N>', function()
154155
harpoon:list():next()
155156
end)
157+
local conf = require('telescope.config').values
158+
local function toggle_telescope(harpoon_files)
159+
local file_paths = {}
160+
for _, item in ipairs(harpoon_files.items) do
161+
table.insert(file_paths, item.value)
162+
end
163+
164+
require('telescope.pickers')
165+
.new({}, {
166+
prompt_title = 'Harpoon',
167+
finder = require('telescope.finders').new_table {
168+
results = file_paths,
169+
},
170+
previewer = conf.file_previewer {},
171+
sorter = conf.generic_sorter {},
172+
})
173+
:find()
174+
end
175+
176+
vim.keymap.set('n', '<leader>se', function()
177+
toggle_telescope(harpoon:list())
178+
end, { desc = 'Open harpoon window' })
156179
end,
157180
},
158181
{
@@ -162,7 +185,8 @@ return {
162185
event = 'VimEnter',
163186
config = function()
164187
require('catppuccin').setup {
165-
transparent_background = false,
188+
transparent_background = true,
189+
term_colors = true,
166190
}
167191
end,
168192
},
@@ -191,77 +215,74 @@ return {
191215
vim.fn['mkdp#util#install']()
192216
end,
193217
},
194-
-- {
195-
-- 'nvim-neotest/neotest',
196-
-- dependencies = {
197-
-- 'nvim-neotest/nvim-nio',
198-
-- 'nvim-lua/plenary.nvim',
199-
-- 'nvim-neotest/neotest-go',
200-
-- 'nvim-neotest/neotest-jest',
201-
-- 'marilari88/neotest-vitest',
202-
-- 'olimorris/neotest-rspec',
203-
-- 'antoinemadec/FixCursorHold.nvim',
204-
-- 'nvim-treesitter/nvim-treesitter',
205-
-- },
206-
-- config = function()
207-
-- local neotest_ns = vim.api.nvim_create_namespace 'neotest'
208-
-- vim.diagnostic.config({
209-
-- virtual_text = {
210-
-- format = function(diagnostic)
211-
-- local message = diagnostic.message:gsub('\n', ' '):gsub('\t', ' '):gsub('%s+', ' '):gsub('^%s+', '')
212-
-- return message
213-
-- end,
214-
-- },
215-
-- }, neotest_ns)
216-
-- require('neotest').setup {
217-
-- adapters = {
218-
-- require 'neotest-vitest' {
219-
-- filter_dir = function(name, rel_path, root)
220-
-- return name ~= 'node_modules'
221-
-- end,
222-
-- },
223-
-- require 'neotest-jest' {
224-
-- jestCommand = 'npm test --',
225-
-- jestConfigFile = 'custom.jest.config.ts',
226-
-- env = { CI = true },
227-
-- cwd = function(path)
228-
-- return vim.fn.getcwd()
229-
-- end,
230-
-- },
231-
-- require 'neotest-go' {
232-
-- recursive_run = true,
233-
-- experimental = {
234-
-- test_table = true,
235-
-- },
236-
-- args = { '-v', '-count=1' },
237-
-- },
238-
-- require 'neotest-rspec' {
239-
-- rspec_cmd = function()
240-
-- return vim.tbl_flatten {
241-
-- 'bundle',
242-
-- 'exec',
243-
-- 'rspec',
244-
-- }
245-
-- end,
246-
-- },
247-
-- },
248-
-- }
249-
--
250-
-- vim.keymap.set('n', '<leader>fnn', function()
251-
-- require('neotest').run.run()
252-
-- end, { desc = 'Test Nearest' })
253-
-- vim.keymap.set('n', '<leader>fnf', function()
254-
-- require('neotest').run.run(vim.fn.expand '%')
255-
-- end, { desc = 'Test File' })
256-
-- vim.keymap.set('n', '<leader>fns', function()
257-
-- require('neotest').run.run(vim.fn.getcwd())
258-
-- end, { desc = 'Test Suite' })
259-
-- vim.keymap.set('n', '<leader>fnp', function()
260-
-- require('neotest').output_panel.toggle()
261-
-- require('neotest').summary.toggle()
262-
-- end, { desc = 'Toggle Neotest Panel' })
263-
-- end,
264-
-- },
218+
{
219+
'nvim-neotest/neotest',
220+
dependencies = {
221+
'nvim-neotest/nvim-nio',
222+
'nvim-lua/plenary.nvim',
223+
'nvim-neotest/neotest-go',
224+
'nvim-neotest/neotest-jest',
225+
'marilari88/neotest-vitest',
226+
'olimorris/neotest-rspec',
227+
'antoinemadec/FixCursorHold.nvim',
228+
'nvim-treesitter/nvim-treesitter',
229+
},
230+
config = function()
231+
local neotest_ns = vim.api.nvim_create_namespace 'neotest'
232+
vim.diagnostic.config({
233+
virtual_text = {
234+
format = function(diagnostic)
235+
local message = diagnostic.message:gsub('\n', ' '):gsub('\t', ' '):gsub('%s+', ' '):gsub('^%s+', '')
236+
return message
237+
end,
238+
},
239+
}, neotest_ns)
240+
require('neotest').setup {
241+
adapters = {
242+
require 'neotest-vitest' {
243+
filter_dir = function(name, rel_path, root)
244+
return name ~= 'node_modules'
245+
end,
246+
},
247+
require 'neotest-jest' {
248+
jestCommand = 'npm test --',
249+
jestConfigFile = 'custom.jest.config.ts',
250+
env = { CI = true },
251+
cwd = function(path)
252+
return vim.fn.getcwd()
253+
end,
254+
},
255+
require 'neotest-go' {
256+
recursive_run = true,
257+
experimental = {
258+
test_table = true,
259+
},
260+
args = { '-v', '-count=1' },
261+
},
262+
require 'neotest-rspec' {
263+
rspec_cmd = function()
264+
return vim.tbl_flatten {
265+
'bundle',
266+
'exec',
267+
'rspec',
268+
}
269+
end,
270+
},
271+
},
272+
}
273+
274+
vim.keymap.set('n', '<M-t>n', function()
275+
require('neotest').run.run()
276+
end, { desc = 'Test Nearest' })
277+
vim.keymap.set('n', '<M-t>f', function()
278+
require('neotest').run.run(vim.fn.expand '%')
279+
end, { desc = 'Test File' })
280+
vim.keymap.set('n', '<M-t>p', function()
281+
require('neotest').output_panel.toggle()
282+
require('neotest').summary.toggle()
283+
end, { desc = 'Toggle Neotest Panel' })
284+
end,
285+
},
265286
{
266287
'vim-test/vim-test',
267288
config = function()
@@ -313,7 +334,7 @@ return {
313334
hide_during_completion = false,
314335
debounce = 75,
315336
keymap = {
316-
accept = '<M-;>',
337+
accept = '<M-y>',
317338
accept_word = false,
318339
accept_line = false,
319340
next = '<M-]>',
@@ -611,6 +632,27 @@ return {
611632
},
612633
},
613634
},
635+
{
636+
'scottmckendry/cyberdream.nvim',
637+
lazy = false,
638+
priority = 1000,
639+
config = function()
640+
require('cyberdream').setup {
641+
transparent = true,
642+
-- Options will go here
643+
}
644+
end,
645+
},
646+
{
647+
'xiyaowong/nvim-transparent',
648+
lazy = false,
649+
priority = 1000,
650+
},
651+
{
652+
'pappasam/papercolor-theme-slim',
653+
lazy = false,
654+
priority = 1000,
655+
},
614656
{
615657
'sainnhe/everforest',
616658
lazy = false,

0 commit comments

Comments
 (0)