Winborder set to rounded

colors/lunaperche-sl.vim

@@ -0,0 +1,4 @@
+runtime colors/lunaperche.vim
+
+" fix VertSplit for lunaperche
+hi VertSplit guifg=#aaaaaa

lua/colorscheme.lua

@@ -1,5 +1,5 @@
 -- define your colorscheme here
-local colorscheme = 'lunaperche'
+local colorscheme = 'lunaperche-sl'
 
 local is_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not is_ok then

lua/lsp.lua

@@ -1,3 +1,55 @@
+-- attach using autocommand, much better than doing it during mason
+vim.api.nvim_create_autocmd('LspAttach', {
+  group = vim.api.nvim_create_augroup('sl.lsp', {}),
+  callback = function(args)
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
+    local bufopts = { noremap = true, silent = true, buffer = args.buf }
+    vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "LSP show signature", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder,
+      { desc = "Workspace add folder", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder,
+      { desc = "Workspace remove folder", unpack(bufopts) })
+    vim.keymap.set('n', '<space>wl', function()
+      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+    end, { desc = "Workspace list folders", unpack(bufopts) })
+    vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { desc = "LSP Rename", unpack(bufopts) })
+    vim.keymap.set("n", "<space>f", function()
+      vim.lsp.buf.format({ async = true })
+    end, { desc = "LSP Format buffer", unpack(bufopts) })
+    vim.keymap.set("v", "<space>f", LSPRangeFormatFunction, { desc = "LSP Format region" })
+
+    -- 2024-09-09 - some ccflow commands for diagnostics, symbols and code actions
+    local fzf = require('fzf-lua')
+    vim.keymap.set('n', '<space>d', fzf.diagnostics_document, { desc = "Document diagnostics" })
+    vim.keymap.set('n', '<space>D', fzf.diagnostics_workspace, { desc = "Workspace diagnostics" })
+    vim.keymap.set('n', '<space>e', function()
+      local new_config = not vim.diagnostic.config().virtual_lines
+      vim.diagnostic.config({ virtual_lines = new_config })
+    end, { desc = "Virtual line diagnostics" })
+    vim.keymap.set('n', '<space>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
+    vim.keymap.set('n', '<space>c', fzf.lsp_code_actions, { desc = "Code Actions" })
+    vim.keymap.set('n', '<space>[', vim.diagnostic.goto_prev, { desc = "Previous diagnostics" })
+    vim.keymap.set('n', '<space>]', vim.diagnostic.goto_next, { desc = "Previous diagnostics" })
+
+    local gitsigns = require('gitsigns')
+    vim.keymap.set('n', '<space>==', gitsigns.preview_hunk_inline, { desc = "Git hunk preview" })
+    vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" })
+    vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" })
+    vim.keymap.set('n', '<space>=R', gitsigns.reset_buffer, { desc = "Git reset file" })
+    vim.keymap.set('n', '<space>=S', gitsigns.stage_buffer, { desc = "Git stage file" })
+    vim.keymap.set('n', '<space>=[', gitsigns.prev_hunk, { desc = "Git previous hunk" })
+    vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" })
+    vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" })
+    vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" })
+    vim.keymap.set('n', '<space>=r', gitsigns.reset_hunk, { desc = "Git reset hunk" })
+    vim.keymap.set('n', '<space>=s', gitsigns.stage_hunk, { desc = "Git stage hunk" })
+
+    -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
+    vim.keymap.set('n', '<C-,>', fzf.lsp_references, { desc = "Find References" })
+    vim.keymap.set('n', '<C-.>', fzf.lsp_definitions, { desc = "Find References" })
+  end
+})
+
 require('mason').setup({
   ui = {
     icons = {
@@ -31,59 +83,6 @@ function LSPRangeFormatFunction()
   })
 end
 
--- Use an on_attach function to only map the following keys
--- after the language server attaches to the current buffer
-local on_attach = function(client, bufnr)
-  -- Enable completion triggered by <c-x><c-o>
-  -- vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-
-  -- See `:help vim.lsp.*` for documentation on any of the below functions
-  local bufopts = { noremap = true, silent = true, buffer = bufnr }
-  vim.keymap.set('n', 'K', vim.lsp.buf.hover, { desc = "LSP show signature", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder,
-    { desc = "Workspace add folder", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder,
-    { desc = "Workspace remove folder", unpack(bufopts) })
-  vim.keymap.set('n', '<space>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, { desc = "Workspace list folders", unpack(bufopts) })
-  vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { desc = "LSP Rename", unpack(bufopts) })
-  vim.keymap.set("n", "<space>f", function()
-    vim.lsp.buf.format({ async = true })
-  end, { desc = "LSP Format buffer", unpack(bufopts) })
-  vim.keymap.set("v", "<space>f", LSPRangeFormatFunction, { desc = "LSP Format region" })
-
-  -- 2024-09-09 - some ccflow commands for diagnostics, symbols and code actions
-  local fzf = require('fzf-lua')
-  vim.keymap.set('n', '<space>d', fzf.diagnostics_document, { desc = "Document diagnostics" })
-  vim.keymap.set('n', '<space>D', fzf.diagnostics_workspace, { desc = "Workspace diagnostics" })
-  -- vim.keymap.set('n', '<space>E', vim.diagnostic.open_float, { desc = "Popup diagnostics" })
-  vim.keymap.set('n', '<space>e', function()
-    local new_config = not vim.diagnostic.config().virtual_lines
-    vim.diagnostic.config({ virtual_lines = new_config })
-  end, { desc = "Virtual line diagnostics" })
-  vim.keymap.set('n', '<space>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
-  vim.keymap.set('n', '<space>c', fzf.lsp_code_actions, { desc = "Code Actions" })
-  vim.keymap.set('n', '<space>[', vim.diagnostic.goto_prev, { desc = "Previous diagnostics" })
-  vim.keymap.set('n', '<space>]', vim.diagnostic.goto_next, { desc = "Previous diagnostics" })
-
-  local gitsigns = require('gitsigns')
-  vim.keymap.set('n', '<space>==', gitsigns.preview_hunk_inline, { desc = "Git hunk preview" })
-  vim.keymap.set('n', '<space>=B', gitsigns.blame, { desc = "Git blame file" })
-  vim.keymap.set('n', '<space>=D', function() gitsigns.diffthis('~') end, { desc = "Git diff this (~)" })
-  vim.keymap.set('n', '<space>=R', gitsigns.reset_buffer, { desc = "Git reset file" })
-  vim.keymap.set('n', '<space>=S', gitsigns.stage_buffer, { desc = "Git stage file" })
-  vim.keymap.set('n', '<space>=[', gitsigns.prev_hunk, { desc = "Git previous hunk" })
-  vim.keymap.set('n', '<space>=]', gitsigns.next_hunk, { desc = "Git next hunk" })
-  vim.keymap.set('n', '<space>=b', gitsigns.blame_line, { desc = "Git blame line" })
-  vim.keymap.set('n', '<space>=d', gitsigns.diffthis, { desc = "Git diff this" })
-  vim.keymap.set('n', '<space>=r', gitsigns.reset_hunk, { desc = "Git reset hunk" })
-  vim.keymap.set('n', '<space>=s', gitsigns.stage_hunk, { desc = "Git stage hunk" })
-
-  -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
-  vim.keymap.set('n', '<C-,>', fzf.lsp_references, { desc = "Find References" })
-  vim.keymap.set('n', '<C-.>', fzf.lsp_definitions, { desc = "Find References" })
-end
 
 -- Set different settings for different languages' LSP
 -- LSP list: https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md
@@ -98,19 +97,6 @@ require('mason-lspconfig').setup_handlers({
   -- and will be called for each installed server that doesn't have
   -- a dedicated handler.
   function(server_name) -- default handler (optional)
-    -- 2024-10-29 Solargraph shall handle ruby AND sonicpi files, add on_init according to documentation
-    if server_name == "solargraph" then
-      lspconfig[server_name].setup {
-        on_attach = on_attach,
-        config = {
-          on_init = function(client)
-            require('sonicpi').lsp_on_init(client, {})
-          end
-        },
-        filetypes = { 'ruby', 'sonicpi' },
-      }
-    end
-
     if server_name == 'ts_ls' then
       -- taken from https://github.com/vuejs/language-tools
       -- If you are using mason.nvim, you can get the ts_plugin_path like this
@@ -119,7 +105,6 @@ require('mason-lspconfig').setup_handlers({
           '/node_modules/@vue/language-server'
 
       lspconfig[server_name].setup {
-        on_attach = on_attach,
         init_options = {
           plugins = {
             {
@@ -133,7 +118,6 @@ require('mason-lspconfig').setup_handlers({
       }
     else
       lspconfig[server_name].setup {
-        on_attach = on_attach
       }
     end
   end
@@ -142,9 +126,6 @@ require('mason-lspconfig').setup_handlers({
 
 -- setup sqls support
 lspconfig.sqls.setup {
-  on_attach = function(client, bufnr)
-    require('sqls').on_attach(client, bufnr)
-  end,
   settings = {
     sqls = {
       connections = {
@@ -160,11 +141,3 @@ lspconfig.sqls.setup {
     },
   },
 }
-
--- use on_attach to get lsp related shortcuts
-vim.g.rustaceanvim = {
-  -- LSP configuration
-  server = {
-    on_attach = on_attach
-  }
-}

lua/options.lua

@@ -25,6 +25,7 @@ vim.opt.splitright = true      -- open new horizontal splits right
 vim.opt.termguicolors = true   -- enable 24-bit RGB color in the TUI
 vim.opt.showmode = false       -- we are experienced, wo don't need the "-- INSERT --" mode hint
 vim.opt.showtabline = 0        -- never show top line with tabs, not used anyways
+vim.opt.winborder = 'rounded'  -- UI borders are rounded
 
 -- Searching
 vim.opt.incsearch = true  -- search as characters are entered

lua/plugins.lua

@@ -94,7 +94,7 @@ require("lazy").setup({
             action = function(exporter)
               local current_file = vim.api.nvim_buf_get_name(0)
               local target = vim.fn.fnamemodify(current_file, ':p:r') .. '.html'
-              local command = { 'pandoc', '--filter', 'pandoc-plot', current_file, '--standalone', '--output', target }
+              local command = { 'pandoc', '--filter', 'pandoc-plot', current_file, '--standalone', '--toc', '--number-sections', '--output', target }
               local on_success = function(output)
                 print('Success!')
                 vim.api.nvim_echo({ { table.concat(output, '\n') } }, true, {})
@@ -142,8 +142,11 @@ require("lazy").setup({
       -- your configuration comes here
       -- or leave it empty to use the default settings
       -- refer to the configuration section below
-      preset = 'helix',
+      -- preset = 'helix',
-      expand = 4,
+      -- preset = 'classic',
+      -- preset = 'modern',
+      preset = false,
+      expand = 3,
       keys = {
         scroll_down = "<c-d>", -- binding to scroll down inside the popup
         scroll_up = "<c-u>",   -- binding to scroll up inside the popup
@@ -154,6 +157,23 @@ require("lazy").setup({
           g = true,
         }
       },
+      win = {
+        -- no_overlap = false,
+        height = { min = 4 },
+        -- height = { min = 4, max = math.huge },
+        width = { min = 25, max = 120 },
+        -- title = true,
+        -- title_pos = "center",
+        -- border = "rounded",
+        col = -1,
+        row = -1,
+        padding = { 1, 3 },
+      },
+      layout = {
+        spacing = 2,
+        -- width = { min = math.huge },
+        width = { min = 20 },
+      },
     },
     keys = {
       {