btrbk, git

home/nvim/default.nix

@@ -23,16 +23,31 @@
       cmp-buffer
       cmp-cmdline
       cmp-emoji
+      cmp-fish
       cmp-nvim-lsp
       cmp-nvim-ultisnips
       cmp-path
 
+      {
+        plugin = fugitive;
+        config = ''
+          nnoremap <Leader>g :Git 
+        '';
+      }
+
       {
         plugin = fzf-vim;
         type = "lua";
         config = ''
-          vim.api.nvim_set_keymap('n', '<leader><tab>', ':Buffers<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('i', '<c-x><c-f>', '<Plug>(fzf-complete-path)', { silent = true })
+          vim.api.nvim_set_keymap('i', '<c-x><c-k>', '<Plug>(fzf-complete-word)', { silent = true })
+          vim.api.nvim_set_keymap('i', '<c-x><c-l>', '<Plug>(fzf-complete-line)', { silent = true })
+
+          vim.api.nvim_set_keymap('n', '<leader><tab>', '<Plug>(fzf-maps-n)', { silent = true })
+          vim.api.nvim_set_keymap('x', '<leader><tab>', '<Plug>(fzf-maps-x)', { silent = true })
+          vim.api.nvim_set_keymap('o', '<leader><tab>', '<Plug>(fzf-maps-o)', { silent = true })
+
+          vim.api.nvim_set_keymap('n', '<leader>b', ':Buffers<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>o', ':Files<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>O', ':Files ~/', { noremap = true })
           vim.api.nvim_set_keymap('n', '<leader>r', ':Read<return>', { noremap = true, silent = true })
@@ -40,6 +55,7 @@
           vim.api.nvim_set_keymap('n', '<leader>a', ':Ag<return>', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>A', ':Ag ~/', { noremap = true, silent = true })
           vim.api.nvim_set_keymap('n', '<leader>.', ':Files ~/devel/omniflake/<return>', { noremap = true, silent = true })
+
           vim.api.nvim_create_user_command(
             'Read', 
             'call fzf#run(fzf#wrap({\'sink\': \'read\', \'dir\': <q-args>}))',
@@ -47,6 +63,7 @@
           )
         '';
       }
+
       {
         plugin = goyo;
         config = ''
@@ -60,6 +77,7 @@
         config = ''
           set termguicolors
           let g:limelight_conceal_ctermfg = 'darkgray'
+
           nnoremap yof :Limelight!!<return>
           nnoremap [of :Limelight<return>
           nnoremap ]of :Limelight!<return>
@@ -67,7 +85,6 @@
       }
 
       nabla-nvim
-      neogit
 
       {
         plugin = nvim-cmp;
@@ -90,6 +107,8 @@
           vim.lsp.enable('r_language_server')
           vim.lsp.enable('texlab')
           vim.lsp.enable('ts_ls')
+
+          vim.api.nvim_del_keymap('i', '<c-s>')
         '';
       }
 
@@ -152,7 +171,18 @@
       vim-speeddating
       vim-surround
       vim-unimpaired
-      vimwiki
+      {
+        plugin = vimwiki;
+        config = ''
+          let g:vimwiki_list = [
+            {
+              'path': '~/notes/',
+              'syntax': 'markdown',
+              'ext': '.md'
+            }
+          ]
+        '';
+      }
     ];
   };
 

home/nvim/nvim-cmp.lua

@@ -18,12 +18,13 @@ cmp.setup({
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete(),
     ['<C-e>'] = cmp.mapping.abort(),
-    ['<Tab>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    ['<Tab>'] = cmp.mapping.confirm({ select = true }),
   }),
 
   sources = cmp.config.sources({
     { name = 'cmp_pandoc' },
     { name = 'emoji' },
+    { name = 'fish' },
     { name = 'nvim_lsp' },
     { name = 'path' },
     { name = 'ultisnips' },

system/desktop/btrbk.nix

@@ -10,7 +10,7 @@
       snapshot_dir = "/btrbk_snapshots";
       target = "/run/media/till/backup/${config.networking.hostName}";
       target_preserve_min = "no";
-      target_preserve = "10d 10w 24m";
+      target_preserve = "7d 4w 24m";
     };
   };
 }