From ca6d1e654b0ac6da3a841d87ee31dac11bd17c71 Mon Sep 17 00:00:00 2001
From: Ivar Fatland <ivar.fatland@bouvet.no>
Date: Mon, 5 May 2025 15:04:15 +0200
Subject: [PATCH] latest

---
 init.lua | 55 ++++++++++++++++++++++---------------------------------
 1 file changed, 22 insertions(+), 33 deletions(-)

diff --git a/init.lua b/init.lua
index 5315e79..1a10675 100644
--- a/init.lua
+++ b/init.lua
@@ -115,12 +115,12 @@ vim.opt.rtp:prepend(lazypath)
 require'lazy'.setup{ --{{{1
     { 'github/copilot.vim', --{{{2
         config = function()
-            vim.keymap.set('i', '<c-m>', 'copilot#Accept("\\<CR>")', {
+            vim.keymap.set('i', '<c-;>', 'copilot#Accept("\\<CR>")', {
                 expr = true,
                 replace_keycodes = false,
             })
             vim.g.copilot_no_tab_map = true
-            vim.keymap.set('n', '<c-m>', ':Copilot panel<CR>', { noremap = true, silent = true })
+            vim.keymap.set('n', '<c-;>', ':Copilot panel<CR>', { noremap = true, silent = true })
         end,
     },
     { 'rafaelsq/nvim-goc.lua', --{{{2
@@ -176,15 +176,17 @@ require'lazy'.setup{ --{{{1
     { 'nvim-tree/nvim-tree.lua', --{{{2
         dependencies = {"nvim-tree/nvim-web-devicons"},
         config = function ()
-
+            ---@param mode 'n'
+            ---@param lhs string
+            ---@param rhs string | function
             ---@param bufnr integer
-            local function always_active_mappings(bufnr)
-                local api = require("nvim-tree.api")
-                api.config.mappings.default_on_attach(bufnr)
+            ---@param desc string
+            local function map(mode, lhs, rhs, bufnr, desc)
                 vim.keymap.set(
-                    "n", "-", api.tree.toggle,
+                    mode, lhs, rhs,
                     {
-                        desc = "nvim-tree: Toggle",
+                        desc = desc,
+                        buffer = bufnr,
                         noremap = true,
                         silent = true,
                         nowait = true,
@@ -193,38 +195,25 @@ require'lazy'.setup{ --{{{1
             end
 
             ---@param bufnr integer
-            local function tree_specific_mappings(bufnr)
+            local function always(bufnr)
+                local api = require("nvim-tree.api")
+                api.config.mappings.default_on_attach(bufnr)
+                map('n', '-', api.tree.toggle, bufnr, 'nvim-tree: Toggle')
+            end
+
+            ---@param bufnr integer
+            local function in_tree(bufnr)
                 local api = require'nvim-tree.api'
-
-                vim.keymap.set(
-                    "n", '<CR>', api.node.open.no_window_picker,
-                    {
-                        desc = "nvim-tree: Open",
-                        buffer = bufnr,
-                        noremap = true,
-                        silent = true,
-                        nowait = true,
-                    }
-                )
-
-                vim.keymap.set(
-                    "n", '<c-j>', api.node.open.no_window_picker,
-                    {
-                        desc = "nvim-tree: Open",
-                        buffer = bufnr,
-                        noremap = true,
-                        silent = true,
-                        nowait = true,
-                    }
-                )
+                map('n', '<CR>', api.node.open.no_window_picker, bufnr, 'nvim-tree: Open')
+                map('n', '<c-j>', api.node.open.no_window_picker, bufnr, 'nvim-tree: Open')
             end
 
             local function my_on_attach(bufnr)
-                always_active_mappings(bufnr)
+                always(bufnr)
                 local api = require'nvim-tree.api'
                 local is_tree_buf = api.tree.is_tree_buf(bufnr)
                 if is_tree_buf then
-                    tree_specific_mappings(bufnr)
+                    in_tree(bufnr)
                 end
 
             end