Jan 24 updates

config/init.lua

@@ -1,3 +1,6 @@
 require("minimal-init")
 require("nvim-treesitter-conf")
 require("lsp-conf")
+require("colors")
+require("git-conf")
+require("oil-conf")

config/lua/git-conf.lua

@@ -6,10 +6,13 @@ require('gitsigns').setup{
         vim.keymap.set("n", "<leader>gg", gs.preview_hunk)
         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)
@@ -24,5 +27,6 @@ require('gitsigns').setup{
           if vim.wo.diff then return '[c' end
           vim.schedule(function() gs.prev_hunk() end)
           return '<Ignore>'
-        end, {expr=true})   end
+        end, {expr=true})
+    end
 }

config/lua/lsp-conf.lua

@@ -29,18 +29,15 @@ vim.api.nvim_create_autocmd('LspAttach', {
         -- See `:help vim.lsp.*` for documentation on any of the below functions
         local opts = { buffer = ev.buf }
         vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
-        vim.keymap.set('n', '<leader>dD', vim.lsp.buf.declaration, opts)
         vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, opts)
-        vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, opts)
+        vim.keymap.set({ 'n', 'v' }, '<leader>ac', vim.lsp.buf.code_action, opts)
         vim.keymap.set("n", "<leader>dd", "<cmd>Telescope lsp_definitions<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>di", "<cmd>Telescope lsp_implementations<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>dr", "<cmd>Telescope lsp_references<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>dt", "<cmd>Telescope lsp_type_definitions<cr>", { buffer = bufnr })
         vim.keymap.set("n", "<leader>ds", "<cmd>Telescope lsp_document_symbols<cr>", { buffer = bufnr })
-        vim.keymap.set("n", "<leader>dS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", { buffer = bufnr })
         vim.keymap.set('n', '<space>df', function()
             vim.lsp.buf.format { async = true }
         end, opts)
-
     end,
 })

config/lua/mini-conf.lua

@@ -2,10 +2,8 @@
 require('mini.ai').setup()
 -- gc gcc
 require('mini.comment').setup()
--- alt hjkl
-require('mini.move').setup()
 
---    Add surrounding with sa 
+--    Add surrounding with sa
 --    Delete surrounding with sd.
 --    Replace surrounding with sr.
 --    Find surrounding with sf or sF (move cursor right or left).
@@ -49,7 +47,18 @@ require('mini.splitjoin').setup({
     }
 })
 
-require('mini.pairs').setup()
+require('mini.pairs').setup(
+{
+  modes = { insert = true, command = false, terminal = false },
+  mappings = {
+    ['['] = { action = 'open', pair = '[]', neigh_pattern = '[^\\].' },
+    ['{'] = { action = 'open', pair = '{}', neigh_pattern = '[^\\].' },
+
+    [']'] = { action = 'close', pair = '[]', neigh_pattern = '[^\\].' },
+    ['}'] = { action = 'close', pair = '{}', neigh_pattern = '[^\\].' },
+  },
+}
+)
 vim.cmd([[ hi MiniCursorwordCurrent ctermfg=240 ]])
 
 -- f F t T
@@ -72,5 +81,9 @@ require('mini.completion').setup({
         info = { height = 25, width = 80, border = 'single' },
         signature = { height = 25, width = 80, border = 'single' },
     },
+    lsp_completion = {
+        source_func = 'completefunc',
+        auto_setup = true,
+    },
     fallback_action = "<C-x><C-n>"
 })

config/lua/nvim-treesitter-conf.lua

@@ -32,10 +32,10 @@ require("nvim-treesitter.configs").setup {
         swap = {
             enable = true,
             swap_next = {
-                ["p]"] = "@parameter.inner",
+                ["A]"] = "@parameter.inner",
             },
             swap_previous = {
-                ["p["] = "@parameter.inner",
+                ["A["] = "@parameter.inner",
             },
         }, },
     incremental_selection = {

config/lua/telescope-conf.lua

@@ -3,12 +3,10 @@ vim.keymap.set("n", "<leader>fb", telescope.buffers, {noremap = true, silent = t
 vim.keymap.set("n", "<leader>ff", telescope.find_files, {noremap = true, silent = true})
 vim.keymap.set("n", "<leader>fg", telescope.git_files, {noremap = true, silent = true})
 vim.keymap.set("n", "<leader>fv", telescope.command_history, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader><leader>", telescope.live_grep, {noremap = true, silent = true})
+vim.keymap.set("n", "<leader>fa", telescope.live_grep, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>8", telescope.grep_string, {noremap = true, silent = true})
+vim.keymap.set("n", "<leader>f8", telescope.grep_string, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader><BS>", telescope.resume, {noremap = true, silent = true})
+vim.keymap.set("n", "<leader>f<BS>", telescope.resume, {noremap = true, silent = true})
 vim.keymap.set("n", "<leader>fs", telescope.git_status, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>fd", telescope.lsp_definitions, {noremap = true, silent = true})
-vim.keymap.set("n", "<leader>fr", telescope.lsp_references, {noremap = true, silent = true})
 
 local telescope = require("telescope")
 telescope.setup({

config/lua/toggleterm-conf.lua

@@ -1,4 +1,5 @@
 require("toggleterm").setup{
     open_mapping = [[<C-\>]],
-    size = vim.o.lines * 0.4
+    direction = "float",
+    close_on_exit  = true,
 }

config/minimal-init.lua

@@ -1,8 +1,5 @@
-require("colors")
 require("mini-conf")
 require("toggleterm-conf")
 require("telescope-conf")
-require("git-conf")
-require("oil-conf")
 -- include our config last to override
 require("nvim-conf")

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1705309234,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1703499205,
+        "lastModified": 1705666311,
-        "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=",
+        "narHash": "sha256-VYdSQm7zq3AStyHhRr3SBCTA8fVzrl6WtIlXTs2Wlts=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870",
+        "rev": "a455c5fb3ee513e2f443838a0e84d52b035adb67",
         "type": "github"
       },
       "original": {

flake.nix

@@ -46,22 +46,21 @@
       pkgs.neovim-unwrapped
       { buildInputs = full-dependencies; }
     ];
+    baseRC = ''
+          lua << EOF
+          package.path = "${self}/config/?.lua;" .. "${self}/config/lua/?.lua;" .. package.path
+          vim.o.runtimepath = "${self}/config," .. vim.o.runtimepath
+          '';
   in rec {
     packages.full = pkgs.wrapNeovim neovim-with-full-deps (base // {
       withPython3 = true;
       extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath full-dependencies}"'';
       configure = {
         customRC =
-          ''
+          baseRC
-          lua << EOF
-          package.path = "${self}/config/?.lua;" .. "${self}/config/lua/?.lua;" .. package.path
-          vim.o.runtimepath = "${self}/config," .. vim.o.runtimepath
-          ''
           + pkgs.lib.readFile ./config/init.lua
-          + ''
+          + ''EOF'';
-          EOF
+          packages.plugins = {
-          '';
-          packages.plugins = with pkgs.vimPlugins; {
             start = plugins.base ++ plugins.extra;
           };
         };
@@ -70,16 +69,10 @@
         extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath dependencies}"'';
         configure = {
           customRC =
-            ''
+            baseRC
-            lua << EOF
-            package.path = "${self}/config/?.lua;" .. "${self}/config/lua/?.lua;" .. package.path
-            vim.o.runtimepath = "${self}/config," .. vim.o.runtimepath
-            ''
             + pkgs.lib.readFile ./config/minimal-init.lua
-            + ''
+            + ''EOF'';
-            EOF
+            packages.plugins = {
-            '';
-            packages.plugins = with pkgs.vimPlugins; {
               start = plugins.base;
             };
           };

plugins.nix

@@ -5,14 +5,13 @@
     telescope-fzf-native-nvim
     toggleterm-nvim
     mini-nvim
+  ];
+  extra = with pkgs.vimPlugins; [
+    rose-pine
     gitsigns-nvim
     oil-nvim
-    rose-pine
     nvim-lspconfig
     nvim-treesitter.withAllGrammars
     nvim-treesitter-textobjects
   ];
-  extra = with pkgs.vimPlugins; [
-    vim-nix
-  ];
 }