Skip to content

Commit 5cc342c

Browse files
committed
Restart neovim config from scratch using Lua
1 parent 2aa8eab commit 5cc342c

File tree

16 files changed

+571
-272
lines changed

16 files changed

+571
-272
lines changed

.config/nvim/init.lua

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
require 'plugins'
2+
require 'keymaps'
3+
require 'options'
4+
5+
require 'treesitter'
6+
require 'mylspconfig'
7+
require 'nullls'
8+
require 'mytelescope'
9+
10+
require('bufferline').setup {}
11+
require('Navigator').setup {}
12+
require('onedark').setup {
13+
style = 'deep',
14+
}
15+
require('onedark').load()
16+
require('gitsigns').setup {
17+
on_attach = function(bufnr)
18+
local gs = package.loaded.gitsigns
19+
20+
local function map(mode, l, r, opts)
21+
opts = opts or {}
22+
opts.buffer = bufnr
23+
vim.keymap.set(mode, l, r, opts)
24+
end
25+
26+
-- Navigation
27+
map('n', ']c', function()
28+
if vim.wo.diff then
29+
return ']c'
30+
end
31+
vim.schedule(function()
32+
gs.next_hunk()
33+
end)
34+
return '<Ignore>'
35+
end, { expr = true })
36+
37+
map('n', '[c', function()
38+
if vim.wo.diff then
39+
return '[c'
40+
end
41+
vim.schedule(function()
42+
gs.prev_hunk()
43+
end)
44+
return '<Ignore>'
45+
end, { expr = true })
46+
47+
-- Actions
48+
-- map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
49+
-- map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
50+
-- map('n', '<leader>hS', gs.stage_buffer)
51+
-- map('n', '<leader>hu', gs.undo_stage_hunk)
52+
-- map('n', '<leader>hR', gs.reset_buffer)
53+
-- map('n', '<leader>hp', gs.preview_hunk)
54+
map('n', '<leader>gb', function()
55+
gs.blame_line { full = true }
56+
end)
57+
-- map('n', '<leader>tb', gs.toggle_current_line_blame)
58+
-- map('n', '<leader>hd', gs.diffthis)
59+
-- map('n', '<leader>hD', function()
60+
-- gs.diffthis '~'
61+
-- end)
62+
-- map('n', '<leader>td', gs.toggle_deleted)
63+
64+
-- Text object
65+
-- map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
66+
end,
67+
}
68+
69+
-- Configuration
70+
71+
-- This didn't seem to be working...
72+
-- vim.cmd([[
73+
-- augroup packer_user_config
74+
-- autocmd!
75+
-- autocmd BufWritePost plugins.lua source <afile> | PackerCompile
76+
-- augroup end
77+
-- ]])

.config/nvim/lua/custom/chadrc.lua

Lines changed: 0 additions & 13 deletions
This file was deleted.

.config/nvim/lua/custom/init.lua

Lines changed: 0 additions & 12 deletions
This file was deleted.

.config/nvim/lua/custom/mappings.lua

Lines changed: 0 additions & 75 deletions
This file was deleted.

.config/nvim/lua/custom/plugins/init.lua

Lines changed: 0 additions & 56 deletions
This file was deleted.

.config/nvim/lua/custom/plugins/lspconfig.lua

Lines changed: 0 additions & 13 deletions
This file was deleted.

.config/nvim/lua/custom/plugins/null-ls.lua

Lines changed: 0 additions & 30 deletions
This file was deleted.

.config/nvim/lua/custom/plugins/overrides.lua

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)