Skip to content

Commit

Permalink
Restart neovim config from scratch using Lua
Browse files Browse the repository at this point in the history
  • Loading branch information
nickell committed Nov 10, 2022
1 parent 2aa8eab commit 5cc342c
Show file tree
Hide file tree
Showing 16 changed files with 571 additions and 272 deletions.
77 changes: 77 additions & 0 deletions .config/nvim/init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
require 'plugins'
require 'keymaps'
require 'options'

require 'treesitter'
require 'mylspconfig'
require 'nullls'
require 'mytelescope'

require('bufferline').setup {}
require('Navigator').setup {}
require('onedark').setup {
style = 'deep',
}
require('onedark').load()
require('gitsigns').setup {
on_attach = function(bufnr)
local gs = package.loaded.gitsigns

local function map(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end

-- Navigation
map('n', ']c', function()
if vim.wo.diff then
return ']c'
end
vim.schedule(function()
gs.next_hunk()
end)
return '<Ignore>'
end, { expr = true })

map('n', '[c', function()
if vim.wo.diff then
return '[c'
end
vim.schedule(function()
gs.prev_hunk()
end)
return '<Ignore>'
end, { expr = true })

-- Actions
-- map({ 'n', 'v' }, '<leader>hs', ':Gitsigns stage_hunk<CR>')
-- map({ 'n', 'v' }, '<leader>hr', ':Gitsigns reset_hunk<CR>')
-- map('n', '<leader>hS', gs.stage_buffer)
-- map('n', '<leader>hu', gs.undo_stage_hunk)
-- map('n', '<leader>hR', gs.reset_buffer)
-- map('n', '<leader>hp', gs.preview_hunk)
map('n', '<leader>gb', function()
gs.blame_line { full = true }
end)
-- map('n', '<leader>tb', gs.toggle_current_line_blame)
-- map('n', '<leader>hd', gs.diffthis)
-- map('n', '<leader>hD', function()
-- gs.diffthis '~'
-- end)
-- map('n', '<leader>td', gs.toggle_deleted)

-- Text object
-- map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
end,
}

-- Configuration

-- This didn't seem to be working...
-- vim.cmd([[
-- augroup packer_user_config
-- autocmd!
-- autocmd BufWritePost plugins.lua source <afile> | PackerCompile
-- augroup end
-- ]])
13 changes: 0 additions & 13 deletions .config/nvim/lua/custom/chadrc.lua

This file was deleted.

12 changes: 0 additions & 12 deletions .config/nvim/lua/custom/init.lua

This file was deleted.

75 changes: 0 additions & 75 deletions .config/nvim/lua/custom/mappings.lua

This file was deleted.

56 changes: 0 additions & 56 deletions .config/nvim/lua/custom/plugins/init.lua

This file was deleted.

13 changes: 0 additions & 13 deletions .config/nvim/lua/custom/plugins/lspconfig.lua

This file was deleted.

30 changes: 0 additions & 30 deletions .config/nvim/lua/custom/plugins/null-ls.lua

This file was deleted.

73 changes: 0 additions & 73 deletions .config/nvim/lua/custom/plugins/overrides.lua

This file was deleted.

Loading

0 comments on commit 5cc342c

Please sign in to comment.