merge with master

2022-12-06 01:15:25 +01:00
parent 9e32359f2d
commit 2b5a09d902
17 changed files with 252 additions and 173 deletions
--- a/.config/nvim/after/plugin/gitsigns.rc.lua
+++ b/.config/nvim/after/plugin/gitsigns.rc.lua
@@ -1,48 +1,87 @@
 require('gitsigns').setup {
-    signs = {
-    add          = {hl = 'GitSignsAdd'   , text = '+', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
-    change       = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
-    delete       = {hl = 'GitSignsDelete', text = '-', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+  signs = {
+    add          = {hl = 'GitSignsAdd'   , text = '│', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+    change       = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+    delete       = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
    topdelete    = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
    changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
  },
  signcolumn = true,  -- Toggle with `:Gitsigns toggle_signs`
-  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
+  numhl      = true, -- Toggle with `:Gitsigns toggle_numhl`
  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
-  keymaps = {
-    -- Default keymap options
-    noremap = true,
+  --keymaps = {
+  --  -- Default keymap options
+  --  noremap = true,

-    ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>Gitsigns next_hunk<CR>'"},
-    ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>Gitsigns prev_hunk<CR>'"},
+  --  ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>Gitsigns next_hunk<CR>'"},
+  --  ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>Gitsigns prev_hunk<CR>'"},

-    ['n <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
-    ['v <leader>hs'] = ':Gitsigns stage_hunk<CR>',
-    ['n <leader>hu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
-    ['n <leader>hr'] = '<cmd>Gitsigns reset_hunk<CR>',
-    ['v <leader>hr'] = ':Gitsigns reset_hunk<CR>',
-    ['n <leader>hR'] = '<cmd>Gitsigns reset_buffer<CR>',
-    ['n <leader>hp'] = '<cmd>Gitsigns preview_hunk<CR>',
-    ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
-    ['n <leader>hS'] = '<cmd>Gitsigns stage_buffer<CR>',
-    ['n <leader>hU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+  --  ['n <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
+  --  ['v <leader>hs'] = '<cmd>Gitsigns stage_hunk<CR>',
+  --  ['n <leader>hu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
+  --  ['n <leader>hr'] = '<cmd>Gitsigns reset_hunk<CR>',
+  --  ['v <leader>hr'] = '<cmd>:Gitsigns reset_hunk<CR>',
+  --  ['n <leader>hR'] = '<cmd>Gitsigns reset_buffer<CR>',
+  --  ['n <leader>hp'] = '<cmd>Gitsigns preview_hunk<CR>',
+  --  ['n <leader>hb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
+  --  ['n <leader>hS'] = '<cmd>Gitsigns stage_buffer<CR>',
+  --  ['n <leader>hU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+
+  --  -- Text objects
+  --  ['o ih'] = '<cmd><C-U>Gitsigns select_hunk<CR>',
+  --  ['x ih'] = '<cmd><C-U>Gitsigns select_hunk<CR>'
+  --},
+  on_attach = function(bufnr)
+    local gs = package.loaded.gitsigns
+
+    local function map(mode, l, r, opts)
+      opts = opts or {}
+      opts.buffer = bufnr
+      vim.keymap.set(mode, l, r, opts)
+    end
+
+    -- Navigation
+    map('n', ']c', function()
+      if vim.wo.diff then return ']c' end
+      vim.schedule(function() gs.next_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    map('n', '[c', function()
+      if vim.wo.diff then return '[c' end
+      vim.schedule(function() gs.prev_hunk() end)
+      return '<Ignore>'
+    end, {expr=true})
+
+    -- Actions
+    map({'n', 'v'}, '<leader>hs', '<cmd>Gitsigns stage_hunk<CR>')
+    map({'n', 'v'}, '<leader>hr', '<cmd>Gitsigns reset_hunk<CR>')
+    map('n', '<leader>hS', gs.stage_buffer)
+    map('n', '<leader>hu', gs.undo_stage_hunk)
+    map('n', '<leader>hR', gs.reset_buffer)
+    map('n', '<leader>hp', gs.preview_hunk)
+    map('n', '<leader>hb', function() gs.blame_line{full=true} end)
+    map('n', '<leader>tb', gs.toggle_current_line_blame)
+    map('n', '<leader>hd', gs.diffthis)
+    map('n', '<leader>hD', function() gs.diffthis('~') end)
+    map('n', '<leader>td', gs.toggle_deleted)
+
+    -- Text object
+    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+  end,

-    -- Text objects
-    ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
-    ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
-  },
  watch_gitdir = {
    interval = 1000,
    follow_files = true
  },
  attach_to_untracked = true,
-  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
+  current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame`
  current_line_blame_opts = {
    virt_text = true,
    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
    delay = 1000,
-    ignore_whitespace = false,
+    ignore_whitespace = true,
  },
  current_line_blame_formatter_opts = {
    relative_time = false
--- a/.config/nvim/after/plugin/icons.rc.lua
+++ b/.config/nvim/after/plugin/icons.rc.lua
@@ -1,5 +1,5 @@
-require("icon-picker")
-
-local opts = { noremap = true, silent = true }
-
-vim.keymap.set("n", "<leader>o", "<cmd>PickIcons<cr>", opts)
+-- require("icon-picker")
+-- 
+-- local opts = { noremap = true, silent = true }
+-- 
+-- vim.keymap.set("n", "<leader>o", "<cmd>PickIcons<cr>", opts)
--- a/.config/nvim/after/plugin/indent.rc.lua
+++ b/.config/nvim/after/plugin/indent.rc.lua
@@ -1,22 +1,22 @@
-require("indent_blankline").setup {
-    char = "",
-    show_current_context = true,
-    --show_current_context_start = true,
-    space_char_blankline = " ",
-    char_highlight_list = {
-        "IndentBlanklineIndent1",
-        "IndentBlanklineIndent2",
-        "IndentBlanklineIndent3",
-        "IndentBlanklineIndent4",
-        "IndentBlanklineIndent5",
-        "IndentBlanklineIndent6",
-    },
-    space_char_highlight_list = {
-        "IndentBlanklineIndent1",
-        "IndentBlanklineIndent2",
-        "IndentBlanklineIndent3",
-        "IndentBlanklineIndent4",
-        "IndentBlanklineIndent5",
-        "IndentBlanklineIndent6",
-    },
-}
+--require("indent_blankline").setup {
+--    char = "",
+--    show_current_context = true,
+--    --show_current_context_start = true,
+--    space_char_blankline = " ",
+--    char_highlight_list = {
+--        "IndentBlanklineIndent1",
+--        "IndentBlanklineIndent2",
+--        "IndentBlanklineIndent3",
+--        "IndentBlanklineIndent4",
+--        "IndentBlanklineIndent5",
+--        "IndentBlanklineIndent6",
+--    },
+--    space_char_highlight_list = {
+--        "IndentBlanklineIndent1",
+--        "IndentBlanklineIndent2",
+--        "IndentBlanklineIndent3",
+--        "IndentBlanklineIndent4",
+--        "IndentBlanklineIndent5",
+--        "IndentBlanklineIndent6",
+--    },
+--}
--- a/.config/nvim/after/plugin/lspconfig.rc.lua
+++ b/.config/nvim/after/plugin/lspconfig.rc.lua
@@ -34,6 +34,12 @@ local on_attach = function(client, bufnr)

  require'illuminate'.on_attach(client)
  require'virtualtypes'.on_attach()
+  require'lsp_signature'.on_attach({
+    floating_window = true,
+    floating_window_above_cur_line = false,
+    floating_window_off_x = 500,
+    floating_window_off_y = -5,
+  })
 end

 local signs = {
--- a/.config/nvim/after/plugin/signature.rc.vim
+++ b/.config/nvim/after/plugin/signature.rc.vim
@@ -1,9 +0,0 @@
-"let g:signature_help_config = {
-"      \ 'border': v:true,
-"      \ 'maxWidth': 80,
-"      \ 'maxHeight': 30,
-"      \ 'style': "virtual",
-"      \ 'onTriggerChar': v:false,
-"      \ 'multiLabel': v:false,
-"      \ }
-"call signature_help#enable()
--- a/.config/nvim/after/plugin/telescope.rc.vim
+++ b/.config/nvim/after/plugin/telescope.rc.vim
@@ -12,7 +12,8 @@ EOF

 " Using Lua functions
 nnoremap <leader>f <cmd>lua require('telescope.builtin').find_files()<cr>
-nnoremap <leader>a <cmd>lua require('telescope.builtin').live_grep()<cr>
+nnoremap <leader>a <cmd>lua require('telescope.builtin').grep_string()<cr>
+nnoremap <leader>A <cmd>lua require('telescope.builtin').live_grep()<cr>
 nnoremap <leader>b <cmd>lua require('telescope.builtin').buffers()<cr>
 nnoremap <leader>r <cmd>lua require('telescope.builtin').resume()<cr>
 "nnoremap <leader>fh <cmd>lua require('telescope.builtin').help_tags()<cr>
--- a/.config/nvim/after/plugin/themer.rc.lua
+++ b/.config/nvim/after/plugin/themer.rc.lua
@@ -1,11 +1,11 @@
-require("themer").setup({
-    colorscheme = "scery",
-    enable_installer = true,
-    styles = {
-        ["function"] = { style = 'italic' },
-            functionbuiltin = { style = 'italic' },
-            variable = { style = 'italic' },
-            variableBuiltIn = { style = 'italic' },
-            parameter  = { style = 'italic' },
-    },
-})
+--require("themer").setup({
+--    colorscheme = "scery",
+--    enable_installer = true,
+--    styles = {
+--        ["function"] = { style = 'italic' },
+--            functionbuiltin = { style = 'italic' },
+--            variable = { style = 'italic' },
+--            variableBuiltIn = { style = 'italic' },
+--            parameter  = { style = 'italic' },
+--    },
+--})
--- a/.config/nvim/after/plugin/treesitter.rc.lua
+++ b/.config/nvim/after/plugin/treesitter.rc.lua
@@ -23,7 +23,7 @@ ts.setup {
  incremental_selection = {
    enable = true,
    keymaps = {
-      init_selection = "tis",
+      init_selection = "ti",
      node_incremental = "ti",
      scope_incremental = "ts",
      node_decremental = "td",
--- a/.config/nvim/after/plugin/vim-cmake.rc.vim
+++ b/.config/nvim/after/plugin/vim-cmake.rc.vim
@@ -1,5 +1,7 @@
 let g:cmake_build_options = [ "-j10" ]

+let g:cmake_root_markers = ['.svn']
+

 let g:cmake_jump_on_error = 0 " We do not want to focus the console
 augroup vim-cmake-group