commit 3fe6df9a844afa919cdf104058a10c35d60a507b · ryan.freumh.org/nixos

+42 -23

home/nvim/default.nix

···

       124
       124
        
                     require('trouble').setup {

     

       125
       125
        
                     	icons = false,

     

       126
       126
        
                     }

     

       127
       127
       -
                     vim.keymap.set('n', '<leader>xx', function() require('trouble').toggle() end)

     

       128
       128
       -
                     vim.keymap.set('n', '<leader>xw', function() require('trouble').toggle('workspace_diagnostics') end)

     

       129
       129
       -
                     vim.keymap.set('n', '<leader>xd', function() require('trouble').toggle('document_diagnostics') end)

     

       130
       130
       -
                     vim.keymap.set('n', '<leader>xq', function() require('trouble').toggle('quickfix') end)

     

       131
       131
       -
                     vim.keymap.set('n', '<leader>xl', function() require('trouble').toggle('loclist') end)

     

       132
       132
       -
                     vim.keymap.set('n', '<leader>xr', function() require('trouble').toggle('lsp_references') end)

     

       127
       127
       +
                     vim.keymap.set('n', '<leader>xx', function() require('trouble').toggle() end, { desc = 'Trouble toggle' })

     

       128
       128
       +
                     vim.keymap.set('n', '<leader>xw', function() require('trouble').toggle('workspace_diagnostics') end, { desc = 'Trouble workspace' })

     

       129
       129
       +
                     vim.keymap.set('n', '<leader>xd', function() require('trouble').toggle('document_diagnostics') end, { desc = 'Trouble document' })

     

       130
       130
       +
                     vim.keymap.set('n', '<leader>xq', function() require('trouble').toggle('quickfix') end, { desc = 'Trouble quickfix' })

     

       131
       131
       +
                     vim.keymap.set('n', '<leader>xl', function() require('trouble').toggle('loclist') end, { desc = 'Trouble loclist' })

     

       132
       132
       +
                     vim.keymap.set('n', '<leader>xr', function() require('trouble').toggle('lsp_references') end, { desc = 'Trouble LSP references' })

     

       133
       133
        
                   '';

     

       134
       134
        
                 }

     

       135
       135
        
                 {

     
···

       162
       162
        
                           end

     

       163
       163
        
                         end)

     

       164
       164
        
       

     

       165
       165
       -
                         map('n', '<leader>hs', gitsigns.stage_hunk)

     

       166
       166
       -
                         map('n', '<leader>hr', gitsigns.reset_hunk)

     

       167
       167
       -
                         map('v', '<leader>hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)

     

       168
       168
       -
                         map('v', '<leader>hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)

     

       169
       169
       -
                         map('n', '<leader>hS', gitsigns.stage_buffer)

     

       170
       170
       -
                         map('n', '<leader>hu', gitsigns.undo_stage_hunk)

     

       171
       171
       -
                         map('n', '<leader>hR', gitsigns.reset_buffer)

     

       172
       172
       -
                         map('n', '<leader>hp', gitsigns.preview_hunk)

     

       173
       173
       -
                         map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end)

     

       174
       174
       -
                         map('n', '<leader>htb', gitsigns.toggle_current_line_blame)

     

       175
       175
       -
                         map('n', '<leader>hd', gitsigns.diffthis)

     

       176
       176
       -
                         map('n', '<leader>hD', function() gitsigns.diffthis('~') end)

     

       177
       177
       -
                         map('n', '<leader>htd', gitsigns.toggle_deleted)

     

       165
       165
       +
                         map('n', '<leader>gs', gitsigns.stage_hunk, { desc = 'Git stage hunk' })

     

       166
       166
       +
                         map('n', '<leader>gr', gitsigns.reset_hunk, { desc = 'Git reset hunk' })

     

       167
       167
       +
                         map('v', '<leader>gs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'Git stage hunk' })

     

       168
       168
       +
                         map('v', '<leader>gr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'Git reset hunk' })

     

       169
       169
       +
                         map('n', '<leader>gS', gitsigns.stage_buffer, { desc = 'Git stage buffer' })

     

       170
       170
       +
                         map('n', '<leader>gu', gitsigns.undo_stage_hunk, { desc = 'Git unstage hunk' })

     

       171
       171
       +
                         map('n', '<leader>gR', gitsigns.reset_buffer, { desc = 'Git reset buffer' })

     

       172
       172
       +
                         map('n', '<leader>gp', gitsigns.preview_hunk, { desc = 'Git preview hunk' })

     

       173
       173
       +
                         map('n', '<leader>gb', function() gitsigns.blame_line{full=true} end, { desc = 'Git blame' })

     

       174
       174
       +
                         map('n', '<leader>gtb', gitsigns.toggle_current_line_blame, { desc = 'Git toggle line blame' })

     

       175
       175
       +
                         map('n', '<leader>gd', gitsigns.diffthis, { desc = 'Git diff index' })

     

       176
       176
       +
                         map('n', '<leader>gD', function() gitsigns.diffthis('~') end, { desc = 'Git diff last' })

     

       177
       177
       +
                         map('n', '<leader>gtd', gitsigns.toggle_deleted, { desc = 'Git toggle deleted' })

     

       178
       178
        
       

     

       179
       179
        
                         -- vih

     

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

     

       180
       180
       +
                         map({'o', 'x'}, 'ih', ':<C-U>Git select_hunk<CR>', { desc = 'Gitsigns select hunk' })

     

       181
       181
        
                       end

     

       182
       182
        
                     }

     

       183
       183
        
                   '';

     
···

       329
       329
        
                   plugin = undotree;

     

       330
       330
        
                   type = "lua";

     

       331
       331
        
                   config = ''

     

       332
       332
       -
                     vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)

     

       332
       332
       +
                     vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle, { desc = 'Undotree toggle' })

     

       333
       333
        
                   '';

     

       334
       334
        
                 }

     

       335
       335
        
                 {

     
···

       341
       341
        
                     vim.keymap.set({'n', 'x', 'o'}, 'gs', '<Plug>(leap-from-window)')

     

       342
       342
        
                   '';

     

       343
       343
        
                 }

     

       344
       344
       -
                 which-key-nvim

     

       344
       344
       +
                 {

     

       345
       345
       +
                   plugin = pkgs.overlay-unstable.vimPlugins.which-key-nvim;

     

       346
       346
       +
                   type = "lua";

     

       347
       347
       +
                   config = ''

     

       348
       348
       +
                     local wk = require('which-key')

     

       349
       349
       +
                     wk.setup({

     

       350
       350
       +
                       icons = { mappings = false },

     

       351
       351
       +
                     })

     

       352
       352
       +
                     wk.add({

     

       353
       353
       +
                       { "<leader>f", group = 'Find' },

     

       354
       354
       +
                       { "<leader>l", group = 'LSP' },

     

       355
       355
       +
                       { "<leader>;", group = 'DAP' },

     

       356
       356
       +
                       { "<leader>s", group = 'Session' },

     

       357
       357
       +
                       { "<leader>t", group = 'Tab' },

     

       358
       358
       +
                       { "<leader>h", group = 'Hunk' },

     

       359
       359
       +
                       { "<leader>x", group = 'Trouble' },

     

       360
       360
       +
                       { "<leader>g", group = 'Git' },

     

       361
       361
       +
                     })

     

       362
       362
       +
                   '';

     

       363
       363
       +
                 }

     

       345
       364
        
       

     

       346
       365
        
                 {

     

       347
       366
        
                   plugin = pkgs.notmuch;

     
···

       370
       389
        
                     vim.g.ledger_date_format = '%Y-%m-%d'

     

       371
       390
        
       

     

       372
       391
        
                     vim.cmd([[

     

       373
       373
       -
                     autocmd FileType ledger nnoremap <buffer> <leader>e :call ledger#entry()<CR>

     

       392
       392
       +
                       autocmd FileType ledger nnoremap <buffer> <leader>e :call ledger#entry()<CR>

     

       374
       393
        
                     ]])

     

       375
       394
        
                   '';

     

       376
       395
        
                 }

+17 -13

home/nvim/init.lua

···

       73
       73
        
       vim.o.cursorcolumn = true

     

       74
       74
        
       vim.o.cursorline = true

     

       75
       75
        
       

     

       76
       76
       -
       local key_mapper = function(mode, key, result)

     

       76
       76
       +
       local key_mapper = function(mode, key, result, desc)

     

       77
       77
        
       	vim.api.nvim_set_keymap(

     

       78
       78
        
       		mode,

     

       79
       79
        
       		key,

     

       80
       80
        
       		result,

     

       81
       81
       -
       		{ noremap = true, silent = true }

     

       81
       81
       +
       		{ noremap = true, silent = true, desc = desc }

     

       82
       82
        
       	)

     

       83
       83
        
       end

     

       84
       84
        
       

     

       85
       85
       -
       key_mapper('n', '<leader>w', ':w<CR>')

     

       85
       85
       +
       key_mapper('n', '<leader>h', '<C-w>h')

     

       86
       86
       +
       key_mapper('n', '<leader>j', '<C-w>j')

     

       87
       87
       +
       key_mapper('n', '<leader>k', '<C-w>k')

     

       88
       88
       +
       key_mapper('n', '<leader>l', '<C-w>l')

     

       89
       89
       +
       key_mapper('n', '<leader>w', ':w<CR>', 'Write file')

     

       86
       90
        
       

     

       87
       87
       -
       key_mapper('n', 'ZA', ':cquit<Enter>')

     

       91
       91
       +
       key_mapper('n', 'ZA', ':cquit<Enter>', 'Quit and fail')

     

       88
       92
        
       

     

       89
       93
        
       key_mapper('t', '<Esc>', '<C-\\><C-n>')

     

       90
       94
        
       

     

       91
       91
       -
       key_mapper('n', '<leader>id',

     

       92
       92
       -
       	[[<Cmd>lua vim.api.nvim_put({vim.fn.strftime('%Y-%m-%d')}, 'c', true, true)<CR>]])

     

       95
       95
       +
       key_mapper('n', '<leader>id', [[<Cmd>lua vim.api.nvim_put({vim.fn.strftime('%Y-%m-%d')}, 'c', true, true)<CR>]],

     

       96
       96
       +
       	'insert date')

     

       93
       97
        
       

     

       94
       94
       -
       key_mapper('n', '!', ':term ')

     

       98
       98
       +
       key_mapper('n', '!', ':term ', 'terminal')

     

       95
       99
        
       

     

       96
       96
       -
       vim.keymap.set('n', '<leader>v', vim.cmd.Git)

     

       100
       100
       +
       key_mapper('n', '<leader>gn', ':Neogit', 'Neogit')

     

       97
       101
        
       

     

       98
       98
       -
       key_mapper('n', '<leader>m', ':make<Enter>')

     

       102
       102
       +
       key_mapper('n', '<leader>m', ':make<Enter>', 'Make')

     

       99
       103
        
       

     

       100
       104
        
       -- go though spelling mistakes

     

       101
       101
       -
       key_mapper('n', '<C-s>', ']s1z=')

     

       105
       105
       +
       key_mapper('n', '<C-s>', ']s1z=', 'correct next spelling mistake')

     

       102
       106
        
       

     

       103
       103
       -
       key_mapper('v', '<C-J>', ":m '>+1<CR>gv=gv")

     

       104
       104
       -
       key_mapper('v', '<C-K>', ":m '<-2<CR>gv=gv")

     

       107
       107
       +
       key_mapper('v', '<C-J>', ":m '>+1<CR>gv=gv", 'move up')

     

       108
       108
       +
       key_mapper('v', '<C-K>', ":m '<-2<CR>gv=gv", 'move down')

     

       105
       109
        
       

     

       106
       110
        
       key_mapper('n', '<C-d>', '<C-d>zz')

     

       107
       111
        
       key_mapper('n', '<C-u>', '<C-u>zz')

     
···

       215
       219
        
       -- <leader>q

     

       216
       220
        
       -- <leader>n

     

       217
       221
        
       -- <leader>;

     

       218
       218
       -
       -- <leader>h

     

       219
       222
        
       -- <leader>j

     

       220
       223
        
       -- <leader>k

     

       221
       224
        
       -- <leader>e

     

       222
       225
        
       -- <leader>b

     

       226
       226
       +
       -- <leader>v

     

       223
       227
        
       

     

       224
       228
        
       vim.cmd([[

     

       225
       229
        
       augroup RememberView

+10 -10

home/nvim/lsp.lua

···

       128
       128
        
       	},

     

       129
       129
        
       }

     

       130
       130
        
       

     

       131
       131
       -
       vim.keymap.set('n', '<leader>;c', function() require('dap').continue() end)

     

       132
       132
       -
       vim.keymap.set('n', '<leader>;s', function() require('dap').step_over() end)

     

       133
       133
       -
       vim.keymap.set('n', '<leader>;i', function() require('dap').step_into() end)

     

       134
       134
       -
       vim.keymap.set('n', '<leader>;o', function() require('dap').step_out() end)

     

       135
       135
       -
       vim.keymap.set('n', '<leader>;b', function() require('dap').toggle_breakpoint() end)

     

       131
       131
       +
       vim.keymap.set('n', '<leader>;c', function() require('dap').continue() end, { desc = 'DAP continue' })

     

       132
       132
       +
       vim.keymap.set('n', '<leader>;s', function() require('dap').step_over() end, { desc = 'DAP step over' })

     

       133
       133
       +
       vim.keymap.set('n', '<leader>;i', function() require('dap').step_into() end, { desc = 'DAP step into' })

     

       134
       134
       +
       vim.keymap.set('n', '<leader>;o', function() require('dap').step_out() end, { desc = 'DAP step out' })

     

       135
       135
       +
       vim.keymap.set('n', '<leader>;b', function() require('dap').toggle_breakpoint() end, { desc = 'DAP breakpoint' })

     

       136
       136
        
       vim.keymap.set('n', '<leader>;m',

     

       137
       137
       -
       	function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end)

     

       138
       138
       -
       vim.keymap.set('n', '<leader>;r', function() require('dap').repl.open() end)

     

       139
       139
       -
       vim.keymap.set('n', '<leader>;l', function() require('dap').run_last() end)

     

       137
       137
       +
       	function() require('dap').set_breakpoint(nil, nil, vim.fn.input('Log point message: ')) end, { desc = 'DAP breakpoint message' })

     

       138
       138
       +
       vim.keymap.set('n', '<leader>;r', function() require('dap').repl.open() end, { desc = 'DAP repl' })

     

       139
       139
       +
       vim.keymap.set('n', '<leader>;l', function() require('dap').run_last() end, { desc = 'DAP run last' })

     

       140
       140
        
       vim.keymap.set('n', '<leader>;f', function()

     

       141
       141
        
       	local widgets = require('dap.ui.widgets')

     

       142
       142
        
       	widgets.centered_float(widgets.frames)

     

       143
       143
       -
       end)

     

       143
       143
       +
       end, { desc = 'DAP frames' })

     

       144
       144
        
       vim.keymap.set('n', '<leader>;S', function()

     

       145
       145
        
       	local widgets = require('dap.ui.widgets')

     

       146
       146
        
       	widgets.centered_float(widgets.scopes)

     

       147
       147
       -
       end)

     

       147
       147
       +
       end, { desc = 'DAP scopes' })

+4 -4

home/nvim/luasnip.lua

···

       73
       73
        
       })

     

       74
       74
        
       

     

       75
       75
        
       

     

       76
       76
       -
       vim.keymap.set({ 'i' }, '<C-k>', function() ls.expand() end, { silent = true })

     

       77
       77
       -
       vim.keymap.set({ 'i', 's' }, '<C-l>', function() ls.jump(1) end, { silent = true })

     

       78
       78
       -
       vim.keymap.set({ 'i', 's' }, '<C-h>', function() ls.jump(-1) end, { silent = true })

     

       76
       76
       +
       vim.keymap.set({ 'i' }, '<C-k>', function() ls.expand() end, { silent = true; desc = 'Snip complete' })

     

       77
       77
       +
       vim.keymap.set({ 'i', 's' }, '<C-l>', function() ls.jump(1) end, { silent = true; desc = 'Snip next' })

     

       78
       78
       +
       vim.keymap.set({ 'i', 's' }, '<C-h>', function() ls.jump(-1) end, { silent = true; desc = 'Snip prev' })

     

       79
       79
        
       vim.keymap.set({ 'i', 's' }, '<C-j>', function()

     

       80
       80
        
       	if ls.choice_active() then

     

       81
       81
        
       		ls.change_choice(1)

     

       82
       82
        
       	end

     

       83
       83
       -
       end, { silent = true })

     

       83
       83
       +
       end, { silent = true; desc = 'Snip choice'  })

+20 -19

home/nvim/telescope-nvim.lua

···

       30
       30
        
       		},

     

       31
       31
        
       	},

     

       32
       32
        
       }

     

       33
       33
       -
       vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files, {})

     

       34
       34
       -
       vim.keymap.set('n', '<leader>fg', require('telescope.builtin').live_grep, {})

     

       35
       35
       -
       vim.keymap.set('n', '<leader>fv', require('telescope.builtin').git_files, {})

     

       36
       36
       -
       vim.keymap.set('n', '<leader>fb', function() require('telescope.builtin').buffers({ sort_mru = true }) end, {})

     

       37
       37
       -
       vim.keymap.set('n', '<leader>fh', require('telescope.builtin').help_tags, {})

     

       38
       38
       -
       vim.keymap.set('n', '<leader>fq', require('telescope.builtin').command_history, {})

     

       39
       39
       -
       vim.keymap.set('n', '<leader>fs', require('telescope.builtin').search_history, {})

     

       40
       40
       -
       vim.keymap.set('n', '<leader>fj', require('telescope.builtin').jumplist, {})

     

       41
       41
       -
       vim.keymap.set('n', '<leader>fm', require('telescope.builtin').marks, {})

     

       42
       42
       -
       vim.keymap.set('n', '<leader>fx', require('telescope.builtin').diagnostics, {})

     

       43
       43
       -
       vim.keymap.set('n', '<leader>fy', require('telescope.builtin').registers, {})

     

       44
       44
       -
       vim.keymap.set('v', '<leader>fy', require('telescope.builtin').registers, {})

     

       45
       45
       -
       vim.keymap.set('n', '<leader>fr', require('telescope.builtin').lsp_references, {})

     

       46
       46
       -
       vim.keymap.set('n', '<leader>fS', require('telescope.builtin').lsp_document_symbols, {})

     

       47
       47
       -
       vim.keymap.set('n', '<leader>fc', require('telescope.builtin').lsp_incoming_calls, {})

     

       48
       48
       -
       vim.keymap.set('n', '<leader>fo', require('telescope.builtin').lsp_outgoing_calls, {})

     

       49
       49
       -
       vim.keymap.set('n', '<leader>fi', require('telescope.builtin').lsp_implementations, {})

     

       50
       50
       -
       vim.keymap.set('n', '<leader>fu', require('telescope').extensions.undo.undo, {})

     

       51
       51
       -
       vim.keymap.set('n', '<leader>fd', function() require('telescope').extensions.file_browser.file_browser({ path = '%:p:h', select_buffer = true }) end, {})

     

       33
       33
       +
       

     

       34
       34
       +
       vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files, { desc = 'Find files' })

     

       35
       35
       +
       vim.keymap.set('n', '<leader>fg', require('telescope.builtin').live_grep, { desc = 'Find grep' })

     

       36
       36
       +
       vim.keymap.set('n', '<leader>fv', require('telescope.builtin').git_files, { desc = 'Find version control' })

     

       37
       37
       +
       vim.keymap.set('n', '<leader>fb', function() require('telescope.builtin').buffers({ sort_mru = true }) end, { desc = 'Find buffer' })

     

       38
       38
       +
       vim.keymap.set('n', '<leader>fh', require('telescope.builtin').help_tags, { desc = 'Find help' })

     

       39
       39
       +
       vim.keymap.set('n', '<leader>fq', require('telescope.builtin').command_history, { desc = 'Find command' })

     

       40
       40
       +
       vim.keymap.set('n', '<leader>fs', require('telescope.builtin').search_history, { desc = 'Find search' })

     

       41
       41
       +
       vim.keymap.set('n', '<leader>fj', require('telescope.builtin').jumplist, { desc = 'Find jumplist' })

     

       42
       42
       +
       vim.keymap.set('n', '<leader>fm', require('telescope.builtin').marks, { desc = 'Find marks' })

     

       43
       43
       +
       vim.keymap.set('n', '<leader>fx', require('telescope.builtin').diagnostics, { desc = 'Find diagnostics' })

     

       44
       44
       +
       vim.keymap.set('n', '<leader>fy', require('telescope.builtin').registers, { desc = 'Find registers' })

     

       45
       45
       +
       vim.keymap.set('v', '<leader>fy', require('telescope.builtin').registers, { desc = 'Find registers' })

     

       46
       46
       +
       vim.keymap.set('n', '<leader>fr', require('telescope.builtin').lsp_references, { desc = 'Find references' })

     

       47
       47
       +
       vim.keymap.set('n', '<leader>fS', require('telescope.builtin').lsp_document_symbols, { desc = 'Find LSP symbols' })

     

       48
       48
       +
       vim.keymap.set('n', '<leader>fc', require('telescope.builtin').lsp_incoming_calls, { desc = 'Find LSP incoming calls' })

     

       49
       49
       +
       vim.keymap.set('n', '<leader>fo', require('telescope.builtin').lsp_outgoing_calls, { desc = 'Find LSP outgoing calls' })

     

       50
       50
       +
       vim.keymap.set('n', '<leader>fi', require('telescope.builtin').lsp_implementations, { desc = 'Find LSP implementations' })

     

       51
       51
       +
       vim.keymap.set('n', '<leader>fu', require('telescope').extensions.undo.undo, { desc = 'Find undo' })

     

       52
       52
       +
       vim.keymap.set('n', '<leader>fd', function() require('telescope').extensions.file_browser.file_browser({ path = '%:p:h', select_buffer = true }) end, { desc = 'Find directory' })