iofq/nvim.nix
1
0
Fork 0
mirror of https://github.com/iofq/nvim.nix.git synced 2026-01-23 08:55:16 -06:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

rice from work

Browse source
This commit is contained in:
Cal Jurgella 2024-02-16 19:08:46 -06:00
parent b6d3c5a7e2
commit 013643b21f
5 changed files with 351 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
config/lua/git-conf.lua
View file

@ -4,18 +4,11 @@ require('gitsigns').setup{
on_attach = function()
local gs = package.loaded.gitsigns
vim.keymap.set("n", "<leader>gg", gs.preview_hunk)
vim.keymap.set('n', '<leader>gb', function() gs.blame_line{full=true} end)
vim.keymap.set('n', '<leader>gs', gs.stage_hunk)
vim.keymap.set('n', '<leader>gr', gs.reset_hunk)
vim.keymap.set('v', '<leader>gs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
vim.keymap.set('v', '<leader>gr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
vim.keymap.set('n', '<leader>gu', gs.undo_stage_hunk)
vim.keymap.set('n', '<leader>gS', gs.stage_buffer)
vim.keymap.set('n', '<leader>gR', gs.reset_buffer)
vim.keymap.set('n', '<leader>gb', function() gs.blame_line{full=true} end)
vim.keymap.set('n', '<leader>gb', gs.toggle_current_line_blame)
vim.keymap.set('n', '<leader>gd', gs.diffthis)
vim.keymap.set('n', '<leader>gD', function() gs.diffthis('~') end)
vim.keymap.set('n', '<leader>gt', gs.toggle_deleted)
vim.keymap.set('v', '<leader>gs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-- Navigation
vim.keymap.set('n', ']g', function()
if vim.wo.diff then return ']c' end
@ -30,3 +23,7 @@ require('gitsigns').setup{
end, {expr=true})
end
}
local neogit = require('neogit')
neogit.setup {}
vim.keymap.set('n', '<leader>ng', neogit.open)

16
config/lua/nvim-conf.lua
View file

@ -7,8 +7,8 @@ vim.opt.expandtab = true -- insert tabs as spaces
vim.opt.inccommand = "split" -- incremental live completion
vim.opt.laststatus = 1
vim.opt.list = true
vim.opt.listchars:append("trail:·")
vim.opt.listchars:append("leadmultispace:╎ ")
-- vim.opt.listchars:append("trail:·")
-- vim.opt.listchars:append("leadmultispace:╎ ")
vim.opt.nrformats:append("alpha") -- let Ctrl-a do letters as well
vim.opt.path:append("**") -- enable fuzzy :find ing
vim.opt.relativenumber = true
@ -18,7 +18,7 @@ vim.opt.showmatch = true -- highlight matching brackets
vim.opt.showmode = true
vim.opt.softtabstop = -1 -- backspace removes tabstop
vim.opt.swapfile = false
vim.opt.tabstop = 4 -- 4 space tabs
vim.opt.tabstop = 2 -- 2 space tabs are based
vim.opt.updatetime = 250 -- decrease update time
vim.opt.virtualedit = "onemore"
@ -40,10 +40,12 @@ remap("v", "wq", "<esc>l")
remap("n","gr", "gT")
remap("n","n", "nzz")
remap("n", "N", "Nzz")
remap("n", "Y", "y$")
remap("n","[<space>", ":<c-u>put!=repeat([''],v:count)<bar>']+1<cr>")
remap("n","]<space>", ":<c-u>put =repeat([''],v:count)<bar>'[-1<cr><Esc>")
remap("n","M", "m0i<cr><Esc>`0")
remap("n","<CR>", "m0i<cr><Esc>`0")
-- Switch tab length on the fly
vim.keymap.set("n", "\\t", function()
vim.o.tabstop = vim.o.tabstop == 2 and 4 or 2
end, { silent = true })
-- autocmd
----------------------------------------