commit 632137599aa0f2052c291a287f01e78fc7d6a296 · ryan.freumh.org/nixos

+2 -2

home/nvim/default.nix

···

       416
       416
        
                   plugin = orgmode;

     

       417
       417
        
                   type = "lua";

     

       418
       418
        
                   config = ''

     

       419
       419
       -
                     -- Open agenda prompt: <Leader>oa

     

       420
       420
       -
                     -- Open capture prompt: <Leader>oc

     

       419
       419
       +
                     -- Open agenda prompt: <leader>oa

     

       420
       420
       +
                     -- Open capture prompt: <leader>oc

     

       421
       421
        
                     -- In any orgmode buffer press g? for help

     

       422
       422
        
                     require('orgmode').setup({

     

       423
       423
        
                      org_agenda_files = { '~/vault/*.org' },

+8 -7

home/nvim/init.lua

···

       68
       68
        
       

     

       69
       69
        
       vim.o.cursorcolumn = true

     

       70
       70
        
       

     

       71
       71
       -
       vim.keymap.set('n', '<leader>w', ':w<CR>', { desc = 'Write file' })

     

       72
       72
       -
       vim.keymap.set('n', '<leader>q', ':qa<CR>', { desc = 'Quit all' })

     

       71
       71
       +
       vim.keymap.set('n', '<leader>fs', ':w<CR>', { desc = 'Write file' })

     

       72
       72
       +
       vim.keymap.set('n', '<leader>qq', ':qa<CR>', { desc = 'Quit all' })

     

       73
       73
        
       

     

       74
       74
        
       vim.keymap.set('n', 'ZA', ':cquit<Enter>', { desc = 'Quit and fail' })

     

       75
       75
        
       

     
···

       80
       80
        
       

     

       81
       81
        
       vim.keymap.set('n', '!', ':term ', { desc = 'terminal' })

     

       82
       82
        
       

     

       83
       83
       -
       vim.keymap.set('n', '<leader>gn', ':Neogit', { desc = 'Neogit' })

     

       83
       83
       +
       vim.keymap.set('n', '<leader>gg', ':Neogit', { desc = 'Neogit' })

     

       84
       84
        
       

     

       85
       85
        
       vim.keymap.set('n', '<leader>m', ':make<Enter>', { desc = 'Make' })

     

       86
       86
       +
       

     

       87
       87
       +
       vim.keymap.set('n', '<leader>w', '<C-w>', { desc = 'Window commands' })

     

       86
       88
        
       

     

       87
       89
        
       -- go though spelling mistakes

     

       88
       90
        
       vim.keymap.set('n', '<C-s>', ']s1z=', { desc = 'correct next spelling mistake' })

     
···

       199
       201
        
       vim.api.nvim_create_user_command('SaveSession', save_session, { nargs = '?', complete = session_completion })

     

       200
       202
        
       vim.api.nvim_create_user_command('LoadSession', load_session, { nargs = '?', complete = session_completion })

     

       201
       203
        
       

     

       202
       202
       -
       vim.keymap.set('n', '<leader>ss', ':SaveSession<CR>')

     

       203
       203
       -
       vim.keymap.set('n', '<leader>sl', ':LoadSession<CR>')

     

       204
       204
       +
       vim.keymap.set('n', '<leader>qs', ':SaveSession<CR>')

     

       205
       205
       +
       vim.keymap.set('n', '<leader>ql', ':LoadSession<CR>')

     

       204
       206
        
       

     

       205
       207
        
       -- free real-estate

     

       206
       208
        
       -- <leader>n

     

       207
       209
        
       -- <leader>;

     

       208
       210
        
       -- <leader>e

     

       209
       211
        
       -- <leader>v

     

       210
       210
       -
       -- <leader>c

     

       211
       211
       -
       -- <leader>h

     

       212
       212
       +
       -- <leader>l

     

       212
       213
        
       -- <leader>j

     

       213
       214
        
       -- <leader>k

     

       214
       215
        
       -- <leader>z

+7 -7

home/nvim/lsp.lua

···

       18
       18
        
       	vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = 'Goto definition' })

     

       19
       19
        
       	vim.keymap.set('n', '[d', vim.diagnostic.goto_next, { desc = 'Goto next issue' })

     

       20
       20
        
       	vim.keymap.set('n', ']d', vim.diagnostic.goto_prev, { desc = 'Goto prev issue' })

     

       21
       21
       -
       	vim.keymap.set('n', '<leader>li', vim.lsp.buf.implementation, { desc = 'Goto implementation' })

     

       22
       22
       -
       	vim.keymap.set('n', '<leader>lt', vim.lsp.buf.type_definition, { desc = 'Goto type definition' })

     

       23
       23
       -
       	vim.keymap.set('n', '<leader>lr', vim.lsp.buf.references, { desc = 'Show references' })

     

       24
       24
       -
       	vim.keymap.set('n', '<leader>la', vim.lsp.buf.code_action, { desc = 'Code action' })

     

       25
       25
       -
       	vim.keymap.set('n', '<leader>lR', vim.lsp.buf.rename, { desc = 'Rename' })

     

       26
       26
       -
       	vim.keymap.set('n', '<leader>lf', function() vim.lsp.buf.format { async = true } end, { desc = 'Format' })

     

       27
       27
       -
       	vim.keymap.set('n', '<leader>le', vim.diagnostic.open_float, { desc = 'Get error' })

     

       21
       21
       +
       	vim.keymap.set('n', '<leader>ci', vim.lsp.buf.implementation, { desc = 'Goto implementation' })

     

       22
       22
       +
       	vim.keymap.set('n', '<leader>ct', vim.lsp.buf.type_definition, { desc = 'Goto type definition' })

     

       23
       23
       +
       	vim.keymap.set('n', '<leader>cr', vim.lsp.buf.references, { desc = 'Show references' })

     

       24
       24
       +
       	vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, { desc = 'Code action' })

     

       25
       25
       +
       	vim.keymap.set('n', '<leader>cR', vim.lsp.buf.rename, { desc = 'Rename' })

     

       26
       26
       +
       	vim.keymap.set('n', '<leader>cf', function() vim.lsp.buf.format { async = true } end, { desc = 'Format' })

     

       27
       27
       +
       	vim.keymap.set('n', '<leader>ce', vim.diagnostic.open_float, { desc = 'Get error' })

     

       28
       28
        
       end

     

       29
       29
        
       

     

       30
       30
        
       -- Add additional capabilities supported by nvim-cmp

+9 -9

home/nvim/telescope-nvim.lua

···

       32
       32
        
       }

     

       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' })

     

       35
       35
       +
       vim.keymap.set('n', '<leader>sd', 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' })

     

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

     

       38
       38
       +
       vim.keymap.set('n', '<leader>h', 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' })

     

       40
       40
       +
       vim.keymap.set('n', '<leader>f/', 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' })

     

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

     

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

     

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

     

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

     

       50
       50
       +
       vim.keymap.set('n', '<leader>cfi', 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' })