Skip to content

Commit af22c7f

Browse files
committed
config
1 parent 49a2c15 commit af22c7f

File tree

7 files changed

+83
-6
lines changed

7 files changed

+83
-6
lines changed

init.lua

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ vim.g.maplocalleader = ' '
2727
-- Set to true if you have a Nerd Font installed and selected in the terminal
2828
vim.g.have_nerd_font = true
2929

30-
require 'custom.settings'
30+
require 'custom.options'
3131
require 'custom.keymaps'
3232
require 'custom.basic-autocommands'
33+
require 'custom.macros'
3334

3435
-- [[ Install `lazy.nvim` plugin manager ]]
3536
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
@@ -112,6 +113,7 @@ require('lazy').setup({
112113
{ '<leader>s', group = '[S]earch' },
113114
{ '<leader>w', group = '[W]save' },
114115
{ '<leader>t', group = '[T]oggle' },
116+
{ '<leader>o', group = 'Harp[O]on' },
115117
{ '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
116118
},
117119
},
@@ -154,6 +156,11 @@ require('lazy').setup({
154156
['<c-enter>'] = 'to_fuzzy_refine',
155157
['<C-j>'] = 'move_selection_next',
156158
['<C-k>'] = 'move_selection_previous',
159+
['<C-d>'] = 'delete_buffer',
160+
},
161+
n = {
162+
['d'] = require('telescope.actions').delete_buffer,
163+
['q'] = require('telescope.actions').close,
157164
},
158165
},
159166
},
@@ -202,7 +209,8 @@ require('lazy').setup({
202209
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
203210
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
204211
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
205-
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
212+
-- vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
213+
vim.keymap.set('n', '<leader><leader>', '<cmd>Telescope buffers sort_mru=true sort_lastused=true theme=ivy<cr>', { desc = '[ ] Find existing buffers' })
206214

207215
-- It's also possible to pass additional configuration options.
208216
-- See `:help telescope.builtin.live_grep()` for information about particular keys

lua/custom/keymaps.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
-- [[ Basic Keymaps ]]
21
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
32
vim.keymap.set('n', '<leader>h', '<cmd>nohlsearch<CR>')
43
vim.keymap.set('i', 'jj', '<Esc>')

lua/custom/macros.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- console.log("cursor: , cursor)
2+
vim.fn.setreg('l', 'yiwoconsole.log("jjpa:" , jjpa);jj')
Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ vim.opt.smartcase = true
3737
vim.opt.signcolumn = 'yes'
3838

3939
-- Decrease update time
40-
vim.opt.updatetime = 250
40+
vim.opt.updatetime = 50
4141

4242
-- Decrease mapped sequence wait time
4343
vim.opt.timeoutlen = 300
@@ -65,3 +65,25 @@ vim.opt.scrolloff = 10
6565
-- instead raise a dialog asking if you wish to save the current file(s)
6666
-- See `:help 'confirm'`
6767
vim.opt.confirm = true
68+
69+
vim.opt.relativenumber = true
70+
71+
-- set to 0 becouse of empty line
72+
vim.opt.cmdheight = 0
73+
74+
-- set cmd height when entering command mode
75+
vim.api.nvim_command 'autocmd CmdlineEnter * set cmdheight=1'
76+
vim.api.nvim_command 'autocmd CmdlineLeave * set cmdheight=0'
77+
vim.api.nvim_command 'autocmd RecordingEnter * set cmdheight=1'
78+
vim.api.nvim_command 'autocmd RecordingLeave * set cmdheight=0'
79+
80+
-- auto resize screen
81+
-- Create an autocommand group for auto resizing
82+
vim.api.nvim_create_augroup('autoequalize', { clear = true })
83+
84+
vim.api.nvim_create_autocmd({ 'VimEnter', 'VimResized' }, {
85+
callback = function()
86+
vim.cmd 'wincmd ='
87+
end,
88+
group = 'autoequalize',
89+
})

lua/custom/plugins/avante.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ return {
88
provider = 'openai',
99
openai = {
1010
endpoint = 'https://api.openai.com/v1',
11-
model = 'gpt-4o-mini', -- your desired model (or use gpt-4o, etc.)
11+
model = 'gpt-4o', -- your desired model (or use gpt-4o, etc.)
1212
timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models
1313
temperature = 0,
1414
max_completion_tokens = 8192, -- Increase this to include reasoning tokens (for reasoning models)

lua/custom/plugins/harpoon.lua

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
return {
2+
'ThePrimeagen/harpoon',
3+
branch = 'harpoon2',
4+
dependencies = { 'nvim-lua/plenary.nvim' },
5+
config = function()
6+
local harpoon = require 'harpoon'
7+
8+
-- REQUIRED
9+
harpoon:setup()
10+
-- REQUIRED
11+
12+
vim.keymap.set('n', '<leader>oa', function()
13+
harpoon:list():add()
14+
end, { desc = 'Add File' })
15+
16+
vim.keymap.set('n', '<leader>oi', function()
17+
harpoon.ui:toggle_quick_menu(harpoon:list())
18+
end, { desc = 'Open L[I]st' })
19+
20+
vim.keymap.set('n', '<leader>1', function()
21+
harpoon:list():select(1)
22+
end, { desc = 'Select [1]' })
23+
24+
vim.keymap.set('n', '<leader>2', function()
25+
harpoon:list():select(2)
26+
end, { desc = 'Select [2]' })
27+
28+
vim.keymap.set('n', '<leader>3', function()
29+
harpoon:list():select(3)
30+
end, { desc = 'Select [3]' })
31+
32+
vim.keymap.set('n', '<leader>4', function()
33+
harpoon:list():select(4)
34+
end, { desc = 'Select [4]' })
35+
36+
-- Toggle previous & next buffers stored within Harpoon list
37+
vim.keymap.set('n', '<leader>oj', function()
38+
harpoon:list():prev()
39+
end, { desc = 'Previus File' })
40+
41+
vim.keymap.set('n', '<leader>ok', function()
42+
harpoon:list():next()
43+
end, { desc = 'Next File' })
44+
end,
45+
}

lua/custom/plugins/init.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ return {
1414
},
1515
-------------------------------------UTILS-------------------------------------
1616
require 'custom.plugins.avante',
17+
-- i use this so i can comment in TS components etc
1718
'JoosepAlviste/nvim-ts-context-commentstring',
1819
{
1920
'numToStr/Comment.nvim',
@@ -59,7 +60,7 @@ return {
5960
'<leader>y',
6061
mode = { 'n', 'v' },
6162
'<cmd>Yazi<cr>',
62-
desc = 'Open yazi at the current file',
63+
desc = 'Open [Y]azi at the current file',
6364
},
6465
},
6566
opts = {

0 commit comments

Comments
 (0)