Added org mode insert <C-CR> to be meta_return

Keymaps:

- key binding for viewing git log of current file: <space>=l
- blink keybindings simplified, added orgmode as source

Plugins:
- folke todo comments disabled
- dropped all AI integration
- added tiny-inline-diagnostic for easier and(!) wrapped diagnostic
  messages
- added sqlua.ncim plugin to connect to SQL databases

after/ftplugin/asciidoc.lua

@@ -0,0 +1,3 @@
+-- Options for AsciiDoc files, mainly used in diary situations
+-- (pun intended)
+vim.opt.textwidth = 80

after/ftplugin/org.lua

@@ -0,0 +1,13 @@
+-- make C-CR in insert mode behave like org_meta_return
+-- in normal mode
+
+vim.keymap.set(
+  "i",
+  "<C-CR>",
+
+  '<cmd>lua require("orgmode").action("org_mappings.meta_return")<CR>', {
+    silent = true,
+    buffer = true,
+    desc = 'ORG: meta return'
+  }
+)

after/ftplugin/rust.lua

@@ -0,0 +1,37 @@
+local bufnr = vim.api.nvim_get_current_buf()
+
+vim.keymap.set(
+  "n",
+  "<space>x",
+  function()
+    vim.cmd.RustLsp({ 'explainError', 'current' })
+  end,
+  { silent = true, buffer = bufnr, desc = 'RustLSP: explain error at cursor' }
+)
+
+
+-- show run targets
+vim.keymap.set(
+  "n",
+  "<f5>",
+  function()
+    vim.cmd.RustLsp({ 'runnables' })
+  end,
+  { silent = true, buffer = bufnr, desc = 'RustLSP: show runnables' }
+)
+
+-- run last target
+vim.keymap.set(
+  "n",
+  "<S-f5>",
+  function()
+    vim.cmd.RustLsp({ 'runnables', bang = true })
+  end,
+  { silent = true, buffer = bufnr, desc = 'RustLSP: show runnables' }
+)
+
+
+-- override signature hover to use RustLsp
+vim.keymap.set('n', 'K', ":RustLsp hover actions<cr>", { desc = "RustLSP show signature" })
+vim.keymap.set('n', 'J', ":RustLsp joinLines<cr>", { desc = "RustLSP join lines" })
+

colors/lunaperche-sl.vim

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

init.lua

@@ -1,7 +1,10 @@
 -- load configurations files from lua/*
+require('filetype')
 require('options')
 require('functions')
 require('plugins')
 require('colorscheme')
 require('lsp')
 require('keybindings')
+require('diary')
+require('layout')

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/config/alpha-nvim.lua

@@ -0,0 +1,109 @@
+local alpha = require 'alpha'
+local dashboard = require 'alpha.themes.dashboard'
+
+_Gopts = {
+  position = 'center',
+  hl = 'Type',
+  wrap = 'overflow',
+}
+
+-- DASHBOARD HEADER
+
+local function getGreeting()
+  local tableTime = os.date '*t'
+  local datetime = os.date ' %Y-%m-%d-%A   %H:%M:%S '
+  local hour = tableTime.hour
+  local greetingsTable = {
+    [1] = '  Sleep well',
+    [2] = '  Good morning',
+    [3] = '  Good afternoon',
+    [4] = '  Good evening',
+    [5] = '󰖔  Good night',
+  }
+  local greetingIndex = 0
+  if hour == 23 or hour < 7 then
+    greetingIndex = 1
+  elseif hour < 12 then
+    greetingIndex = 2
+  elseif hour >= 12 and hour < 18 then
+    greetingIndex = 3
+  elseif hour >= 18 and hour < 21 then
+    greetingIndex = 4
+  elseif hour >= 21 then
+    greetingIndex = 5
+  end
+  return datetime .. '  ' .. greetingsTable[greetingIndex]
+end
+
+local logo = [[
+
+                                              
+       ████ ██████           █████      ██
+      ███████████             █████ 
+      █████████ ███████████████████ ███   ███████████
+     █████████  ███    █████████████ █████ ██████████████
+    █████████ ██████████ █████████ █████ █████ ████ █████
+  ███████████ ███    ███ █████████ █████ █████ ████ █████
+ ██████  █████████████████████ ████ █████ █████ ████ ██████
+
+      ]]
+
+local greeting = getGreeting()
+local marginBottom = 0
+
+-- Split logo into lines
+local logoWidth = 0
+for line in logo:gmatch '[^\n]+' do
+  logoWidth = math.max(logoWidth, #line / 2)
+end
+logoWidth = 75       -- code above does not work with utf8 strings in lua 5.1
+
+-- Calculate padding for centering the greeting
+local greetingWidth = #greeting - 3
+local padding = math.floor((logoWidth - greetingWidth) / 2)
+-- Generate spaces for padding
+local paddedGreeting = string.rep(' ', padding) .. greeting
+
+
+local userName = "You work as '" .. vim.env.USER .. "'."
+
+-- Calculate padding for centering the username
+local userNameWidth = #userName
+local padding = math.floor((logoWidth - userNameWidth) / 2)
+-- Generate spaces for padding
+local userNamePadded = string.rep(' ', padding) .. userName
+
+
+-- Add margin lines below the padded greeting
+local margin = string.rep('\n', marginBottom * 5)
+
+-- Concatenate logo, padded greeting, and margin
+local adjustedLogo = logo .. '\n' .. paddedGreeting .. '\n\n' .. userNamePadded .. '\n' .. margin
+dashboard.section.header.val = vim.split(adjustedLogo, '\n')
+
+dashboard.section.buttons.val = {
+  dashboard.button('d', '  Diary Entry', '<cmd>Diary<CR>'),
+  dashboard.button('n', '  New file', ':ene <BAR> startinsert <CR>'),
+  dashboard.button('s', '  Settings', '<cmd>WorkspacesOpen config-nvim<CR>'),
+  dashboard.button('u', '󱐥  Update plugins', '<cmd>Lazy update<CR>'),
+  dashboard.button('w', '  Workspaces', '<cmd>WorkspacesOpen<CR>'),
+  dashboard.button('q', '󰤆  Quit', '<cmd>qa<CR>'),
+}
+
+-- dashboard.section.footer.val = greeting
+
+vim.api.nvim_create_autocmd('User', {
+  pattern = 'LazyVimStarted',
+  desc = 'Add Alpha dashboard footer',
+  once = true,
+  callback = function()
+    local stats = require('lazy').stats()
+    local ms = math.floor(stats.startuptime * 100 + 0.5) / 100
+    dashboard.section.footer.val = { ' ', ' ', ' ', ' Loaded ' .. stats.count .. ' plugins  in ' .. ms .. ' ms ' }
+    dashboard.section.header.opts.hl = 'DashboardFooter'
+    pcall(vim.cmd.AlphaRedraw)
+  end,
+})
+
+dashboard.opts.opts.noautocmd = true
+alpha.setup(dashboard.opts)

lua/config/lualine.lua

@@ -0,0 +1,41 @@
+require("lualine").setup {
+  options = {
+    icons_enabled = false,
+    theme = 'papercolor_light',
+    component_separators = {},
+    section_separators = {},
+    disabled_filetypes = {
+      statusline = {},
+      winbar = { "neo-tree" },
+    },
+    ignore_focus = {},
+    always_divide_middle = true,
+    globalstatus = false,
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+  sections = {
+    lualine_a = { { 'filename', path = 1, shorting_target = 50 } },
+    lualine_b = { 'branch', 'diff', 'diagnostics' },
+    lualine_c = {},
+    lualine_x = { 'encoding', 'fileformat', 'filetype', 'lsp_status' },
+    lualine_y = { 'filesize' },
+    lualine_z = { 'progress', 'location' }
+  },
+  inactive_sections = {
+    lualine_a = { { 'filename', path = 1, shorting_target = 50 } },
+    lualine_b = {},
+    lualine_c = {},
+    -- lualine_x = { 'encoding', 'fileformat', 'filetype' },
+    lualine_x = {},
+    lualine_y = { 'filesize' },
+    lualine_z = { 'location' }
+  },
+  tabline = {},
+  winbar = {}, -- formerly breadcrumb here
+  inactive_winbar = {},
+  extensions = {}
+}

lua/config/nvim-cmp.lua

@@ -1,86 +0,0 @@
-local has_words_before = function()
-  unpack = unpack or table.unpack
-  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-end
-
-local luasnip = require("luasnip")
-local cmp = require("cmp")
-
-cmp.setup({
-  snippet = {
-    -- REQUIRED - you must specify a snippet engine
-    expand = function(args)
-      require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
-    end,
-  },
-  mapping = cmp.mapping.preset.insert({
-    -- Use <C-b/f> to scroll the docs
-    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
-    -- Use <C-k/j> to switch in items
-    ['<C-k>'] = cmp.mapping.select_prev_item(),
-    ['<C-j>'] = cmp.mapping.select_next_item(),
-    ['<C-Space>'] = cmp.mapping.complete(),
-
-    -- Use <CR>(Enter) to confirm selection
-    -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-    ['<CR>'] = cmp.mapping.confirm({ select = true }),
-
-    -- A super tab
-    -- sourc: https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings#luasnip
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      -- Hint: if the completion menu is visible select next one
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif luasnip.jumpable(1) then
-        luasnip.jump(1)
-      elseif has_words_before() then
-        cmp.complete()
-      else
-        fallback()
-      end
-    end, { "i", "s" }), -- i - insert mode; s - select mode
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif luasnip.jumpable(-1) then
-        luasnip.jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  }),
-
-  -- Let's configure the item's appearance
-  -- source: https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance
-  formatting = {
-    -- Set order from left to right
-    -- kind: single letter indicating the type of completion
-    -- abbr: abbreviation of "word"; when not empty it is used in the menu instead of "word"
-    -- menu: extra text for the popup menu, displayed after "word" or "abbr"
-    fields = { 'abbr', 'menu' },
-
-    -- customize the appearance of the completion menu
-    format = function(entry, vim_item)
-      vim_item.menu = ({
-        nvim_lsp = '[Lsp]',
-        luasnip = '[Luasnip]',
-        buffer = '[File]',
-        path = '[Path]',
-      })[entry.source.name]
-      return vim_item
-    end,
-  },
-
-  -- Set source precedence
-  sources = cmp.config.sources({
-    { name = 'nvim_lsp' }, -- For nvim-lsp
-    { name = 'luasnip' },  -- For luasnip user
-    { name = 'buffer' },   -- For buffer word completion
-    { name = 'path' },     -- For path completion
-    { name = 'rpncalc' },  -- for RPN calculations
-    { name = 'orgmode' },  -- for nvim-orgmode
-    { name = 'sonicpi' },  -- for sonic-pi integration
-  })
-})

lua/diary.lua

@@ -0,0 +1,22 @@
+local diary_open = function(opts)
+  local date = opts.args ~= '' and opts.args or os.date('%Y-%m-%d')
+  local year, month = date:match('(%d%d%d%d)-(%d%d)')
+  local file = string.format('~/.diary/asciidoc/%s/diary-%s-%s.adoc', year, year, month)
+  print("file is:", file)
+  vim.cmd('e ' .. file)
+  vim.cmd('normal! G')
+
+  -- NOTE.2025-06-08 [1] and [2] should be replaced with snippet name, but I
+  -- don't know how -- neither do grok nor chatgpt ...
+  local snips = require('luasnip')
+  local asnippets = snips.get_snippets('asciidoc')
+  if vim.fn.getfsize(file) == 0 then
+    snips.snip_expand(asnippets[1])
+    vim.cmd('normal! G')
+  end
+
+  vim.cmd('normal! 3o') -- insert some newlines before new entry
+  snips.snip_expand(asnippets[2])
+end
+
+vim.api.nvim_create_user_command("Diary", diary_open, { nargs = '?' })

lua/filetype.lua

@@ -0,0 +1,5 @@
+vim.filetype.add({
+  extension = {
+    CON = 'confile',
+  },
+})

lua/keybindings.lua

@@ -9,7 +9,6 @@ vim.keymap.set('n', '<leader>fg', fzf.live_grep, { desc = "Grep" })
 vim.keymap.set('n', '<leader>fm', fzf.manpages, { desc = "Manpages" })
 vim.keymap.set('n', '<leader>fr', fzf.resume, { desc = "Resume last search" })
 vim.keymap.set('n', '<leader>fs', fzf.blines, { desc = "Search buffer" })
-
 vim.keymap.set('n', '<leader>ft', ":TodoFzfLua<CR>", { desc = "Todos" })
 
 -- use fzf buffer lines as default search
@@ -21,7 +20,23 @@ vim.keymap.set('n', '<leader>g', ":Neogit<CR>", { desc = "Neogit" })
 vim.keymap.set('n', '<leader>T', ":Neotree reveal<CR>", { desc = "File Manager" })
 
 -- calendar
-vim.keymap.set('n', '<leader>c', ":Calendar -split=horizontal -position=below -height=12<CR>", { desc = "Show calendar" })
+vim.keymap.set('n', '<leader>c', ":Calendar -split=horizontal -position=below -height=12<CR>", { desc = "Show calendar below" })
+vim.keymap.set('n', '<leader>C', ":Calendar -view=year -split=vertical -width=27<CR>", { desc = "Show calendar right" })
+
+-- Open current file in browser (chromium)
+vim.keymap.set('n', '<space>o', ":silent !chromium '%'<cr>", { desc = "Open in browser" })
+
+-- Open org file folder in neotree 
+vim.keymap.set('n', '<leader>of', ':silent :Neotree dir=/home/saschal/Documents/Eigene\\ (Briefe\\ etc.)/org<cr>', { desc = "Open org folder" })
+
+-- toggle colorscheme between dark and light
+vim.keymap.set('n', '<leader>m', function()
+  if vim.opt.background:get() == "dark" then
+    vim.o.background = "light"
+   else
+    vim.o.background = "dark"
+   end
+end, { desc = "Toggle dark/light mode" })
 
 --
 -- configure workspaces
@@ -44,11 +59,27 @@ local workspaces_fzf_picker = function(opts)
     for i = 1, #ws do
       fzf_cb(ws[i].name)
     end
-    fzf_cb()     -- EOF
+    fzf_cb() -- EOF
   end, opts)
 end
 vim.keymap.set('n', '<leader>w', workspaces_fzf_picker, { desc = "Workspaces" })
 
+------------------------------------------
+--
+-- Window layout save and restore
+--
+------------------------------------------
+
+local layout = require('layout')
+vim.keymap.set('n', '<leader>ss', function()
+  layout.save('default')
+  print("Window layout saved")
+end, { desc = "Save window layout" })
+vim.keymap.set('n', '<leader>sr', function()
+  layout.restore('default')
+  print("Window layout restored")
+end, { desc = "Restore window layout" })
+
 ------------------------------------------
 --
 -- Word higlighting
@@ -60,18 +91,30 @@ vim.keymap.set('n', '<space>mr', mywords.hl_toggle_regex, { desc = "Highlight re
 vim.keymap.set('n', '<space>mc', mywords.uhl_all, { desc = "Clear all highlights" })
 
 
+------------------------------------------
+--
+-- Moving lines up and down
+--
+------------------------------------------
+
+vim.keymap.set('n', '<M-Up>', ":m -2<cr>", { desc = "Move current line up" })
+vim.keymap.set('n', '<M-Down>', ":m +1<cr>", { desc = "Move current line down" })
+
+vim.keymap.set('i', '<M-Up>', "<c-o>:m -2<cr>", { desc = "Move current line up" })
+vim.keymap.set('i', '<M-Down>', "<c-o>:m +1<cr>", { desc = "Move current line down" })
+
 ------------------------------------------
 --
 -- Shortcuts which are known from Emacs
 --
 ------------------------------------------
-vim.keymap.set('n', '<C-W>0', ":hide<CR>", { desc = "Win: close current" })
-vim.keymap.set('n', '<C-W>1', ":only<CR>", { desc = "Win: close others" })
-vim.keymap.set('n', '<C-W>2', ":split<CR>", { desc = "Win: split horizontally" })
-vim.keymap.set('n', '<C-W>2', ":vsplit<CR>", { desc = "Win: split vertically" })
 vim.keymap.set('n', '<space>q', "gwap", { desc = "Wrap paragraph" })
 vim.keymap.set('n', '<esc><esc>', ":silent! nohls<CR>", { desc = "Clear search" })
+vim.keymap.set('i', '<c-Del>', '<c-o>dW', {desc = "Delete word right" })
 
 -- horizontally scroll with mouse
 vim.keymap.set('n', '<S-ScrollWheelUp>', 'zh')
 vim.keymap.set('n', '<S-ScrollWheelDown>', 'zl')
+
+vim.keymap.set('i', '<S-ScrollWheelUp>', '<c-o>zh')
+vim.keymap.set('i', '<S-ScrollWheelDown>', '<c-o>zl')

lua/layout.lua

@@ -0,0 +1,71 @@
+-- save and restore current window layout
+-- inspired by:
+-- - https://github.com/dedowsdi/.vim/blob/master/autoload/ddd/layout.vim
+-- - https://vi.stackexchange.com/a/22545/53081
+--
+-- added cursor position handling
+
+local M = {}
+local layouts = {}
+local resize_cmds = {}
+
+function M.save(name)
+  layouts[name] = vim.fn.winlayout()
+  resize_cmds[name] = vim.fn.winrestcmd()
+  M.add_buf_to_layout(layouts[name])
+end
+
+function M.add_buf_to_layout(layout)
+  if layout[1] == "leaf" then
+    local win_id = layout[2]
+    table.insert(layout, vim.fn.winbufnr(win_id))
+    table.insert(layout, vim.api.nvim_win_get_cursor(win_id))
+  else
+    for _, child_layout in ipairs(layout[2]) do
+      M.add_buf_to_layout(child_layout)
+    end
+  end
+end
+
+function M.restore(name)
+  if not layouts[name] then
+    return
+  end
+
+  -- Create clean window
+  vim.cmd("new")
+  vim.cmd("wincmd o")
+
+  -- Recursively restore buffers and cursor positions
+  M.apply_layout(layouts[name], name)
+
+  -- Resize
+  vim.cmd(resize_cmds[name])
+end
+
+function M.apply_layout(layout, name)
+  if layout[1] == "leaf" then
+    -- Load buffer for leaf
+    if vim.fn.bufexists(layout[3]) == 1 then
+      vim.cmd(string.format("b %d", layout[3]))
+      -- Restore cursor position
+      vim.api.nvim_win_set_cursor(vim.fn.win_getid(), layout[4])
+    end
+  else
+    -- Split cols or rows, split n-1 times
+    local split_method = layout[1] == "col" and "rightbelow split" or "rightbelow vsplit"
+    local wins = { vim.fn.win_getid() }
+    for i = 2, #layout[2] do
+      vim.cmd(split_method)
+      table.insert(wins, vim.fn.win_getid())
+    end
+
+    -- Recursive into child windows
+    for index, win_id in ipairs(wins) do
+      vim.fn.win_gotoid(win_id)
+      M.apply_layout(layout[2][index], name)
+    end
+  end
+end
+
+return M

lua/lsp.lua

@@ -1,135 +1,126 @@
-require('mason').setup({
+-- attach using autocommand and setup keybindings
-  ui = {
+vim.api.nvim_create_autocmd('LspAttach', {
-    icons = {
+  group = vim.api.nvim_create_augroup('sl.lsp', {}),
-      package_installed = "✓",
+  callback = function(args)
-      package_pending = "➜",
+    -- See `:help vim.lsp.*` for documentation on any of the below functions
-      package_uninstalled = "✗"
+    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("n", '<space>F', ":silent !dx fmt --file %<cr>", { desc = "DX format rsx! regions", unpack(bufopts) })
+    vim.keymap.set("v", "<space>f", LSPRangeFormatFunction, { desc = "LSP Format region" })
 
-require('mason-lspconfig').setup({
+    -- 2024-09-09 - some ccflow commands for diagnostics, symbols and code actions
-  -- A list of servers to automatically install if they're not already installed
+    local fzf = require('fzf-lua')
-  ensure_installed = {
+    vim.keymap.set('n', '<space>d', fzf.diagnostics_document, { desc = "Document diagnostics" })
-    'pylsp',
+    vim.keymap.set('n', '<space>D', fzf.diagnostics_workspace, { desc = "Workspace diagnostics" })
-    'lua_ls',
+    vim.keymap.set('n', '<space>e', function()
-    -- 'rust_analyzer', -- handled by rust mrcjkb/rustaceanvim
+      local new_config = not vim.diagnostic.config().virtual_lines
-    'yamlls',
+      vim.diagnostic.config({ virtual_lines = new_config })
-    'ts_ls',
+    end, { desc = "Virtual line diagnostics" })
-    'gopls',
+    vim.keymap.set('n', '<space>E', vim.diagnostic.open_float, { desc = "Popup diagnostics" })
-    'pylsp',
+    vim.keymap.set('n', '<space>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
-    'clangd',
+    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>=l', ":NeogitLogCurrent<CR>", { desc = "Neogit: log for this file" })
+    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('v', '<space>=s', function() gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') }) end,
+      { desc = "Git stage hunk" })
 
--- Use an on_attach function to only map the following keys
+    -- vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
--- after the language server attaches to the current buffer
+    vim.keymap.set('n', '<C-,>', fzf.lsp_references, { desc = "Find References" })
-local on_attach = function(client, bufnr)
+    vim.keymap.set('n', '<C-.>', fzf.lsp_definitions, { desc = "Find References" })
-  -- 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) })
-
-  -- 2024-09-09 - some ccflow commands
-  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>s', fzf.lsp_document_symbols, { desc = "Doc symbols" })
-  vim.keymap.set('n', '<space>c', fzf.lsp_code_actions, { desc = "Code Actions" })
-
-  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
--- How to use setup({}): https://github.com/neovim/nvim-lspconfig/wiki/Understanding-setup-%7B%7D
---     - the settings table is sent to the LSP
---     - on_attach: a lua callback function to run after LSP attaches to a given buffer
-local lspconfig = require('lspconfig')
-
--- from :h mason-lspconfig-automatic-server-setup
-require('mason-lspconfig').setup_handlers({
-  -- The first entry (without a key) will be the default handler
-  -- 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
-      local mason_registry = require('mason-registry')
-      local vue_language_server_path = mason_registry.get_package('vue-language-server'):get_install_path() ..
-          '/node_modules/@vue/language-server'
-
-      lspconfig[server_name].setup {
-        on_attach = on_attach,
-        init_options = {
-          plugins = {
-            {
-              name = '@vue/typescript-plugin',
-              location = vue_language_server_path,
-              languages = { 'vue' },
-            },
-          },
-        },
-        filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
-      }
-    else
-      lspconfig[server_name].setup {
-        on_attach = on_attach
-      }
-    end
   end
 })
 
+-- lsp format selected range
+function LSPRangeFormatFunction()
+  vim.lsp.buf.format({
+    async = true,
+    range = {
+      ["start"] = vim.api.nvim_buf_get_mark(0, "<"),
+      ["end"] = vim.api.nvim_buf_get_mark(0, ">"),
+    }
+  })
+end
 
--- use on_attach to get lsp related shortcuts
+
-vim.g.rustaceanvim = {
+-- VUE and Typescript as of vue-language-server 3.0.x
-  -- LSP configuration
+-- taken from:
-  server = {
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md#vtsls
-    on_attach = on_attach
+local vue_language_server_path = '/home/saschal/.config/yarn/global/node_modules'
-  }
+local vue_plugin = {
+  name = '@vue/typescript-plugin',
+  location = vue_language_server_path,
+  languages = { 'vue' },
+  configNamespace = 'typescript',
 }
+local vtsls_config = {
+  settings = {
+    vtsls = {
+      tsserver = {
+        globalPlugins = {
+          vue_plugin,
+        },
+      },
+    },
+  },
+  filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
+}
+vim.lsp.config('vtsls', vtsls_config)
+
+-- enable this list of lsps
+local enable_this_lsp = {
+  'vue_ls',
+  'vtsls',
+  'gopls',
+  'bashls',
+  'html',
+  'lua_ls',
+  'jsonls', -- arch extra: vscode-json-languageserver 
+  'kotlin_lsp',  -- arch aur: kotlin-lsp-bin
+  'lemminx', -- arch aur: lemminx
+  'clangd',
+}
+
+for l in pairs(enable_this_lsp) do
+  vim.lsp.enable(enable_this_lsp[l])
+end
+
+
+-- add autoformat to Dioxus projects
+vim.api.nvim_create_autocmd("BufWritePost", {
+  pattern = "*.rs",
+  callback = function()
+    local cwd = vim.lsp.buf.list_workspace_folders()
+    if not (cwd == nil) then
+      if vim.fn.filereadable(cwd[1] .. "/Dioxus.toml") == 1 then
+        local command = "dx fmt --file %"
+        vim.cmd("silent ! " .. command)
+        -- vim.notify(command)
+      end
+    end
+  end,
+})

lua/options.lua

@@ -20,11 +20,14 @@ vim.opt.expandtab = true -- tabs are spaces, mainly because of python and becaus
 vim.opt.number = true          -- show absolute number
 vim.opt.relativenumber = false -- add numbers to each line on the left side
 vim.opt.cursorline = true      -- highlight cursor line underneath the cursor horizontally
+vim.opt.guicursor = "" ..      -- cursor highlight group needs to be Cursor to have lunaperche have a proper light cursor
+    "n-v-c-sm:block-Cursor,i-ci-ve:ver25-Cursor,r-cr-o:hor20,t:block-blinkon500-blinkoff500-Cursor"
 vim.opt.splitbelow = true      -- open new vertical split bottom
 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

@@ -14,19 +14,104 @@ vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
   -- Auto-completion engine
   {
-    "hrsh7th/nvim-cmp",
+    'saghen/blink.cmp',
-    dependencies = {
+    -- optional: provides snippets for the snippet source
-      "hrsh7th/cmp-nvim-lsp",     -- lsp auto-completion
+    dependencies = { 'rafamadriz/friendly-snippets',
-      "hrsh7th/cmp-buffer",       -- buffer auto-completion
+      {
-      "hrsh7th/cmp-path",         -- path auto-completion
+        "L3MON4D3/LuaSnip",
-      "hrsh7th/cmp-cmdline",      -- cmdline auto-completion
+        version = "v2.*"
-      "saadparwaiz1/cmp_luasnip", -- luasnip auto-completion
+      }
     },
-    config = function()
+
-      require("config.nvim-cmp")
+    -- use a release tag to download pre-built binaries
-    end,
+    version = '1.*',
+    -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
+    -- build = 'cargo build --release',
+    -- If you use nix, you can build from source using latest nightly rust with:
+    -- build = 'nix run .#build-plugin',
+
+    ---@module 'blink.cmp'
+    ---@type blink.cmp.Config
+    opts = {
+      -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
+      -- 'super-tab' for mappings similar to vscode (tab to accept)
+      -- 'enter' for enter to accept
+      -- 'none' for no mappings
+      --
+      -- All presets have the following mappings:
+      -- C-space: Open menu or open docs if already open
+      -- C-n/C-p or Up/Down: Select next/previous item
+      -- C-e: Hide menu
+      -- C-k: Toggle signature help (if signature.enabled = true)
+      --
+      -- See :h blink-cmp-config-keymap for defining your own keymap
+      keymap = {
+        -- preset = 'enter',
+        preset = 'default',
+        -- ['<Up>'] = { 'select_prev', 'fallback' },
+        -- ['<Down>'] = { 'select_next', 'fallback' },
+        -- ['<S-Tab>'] = { 'select_prev', 'fallback' },
+        -- ['<Tab>'] = { 'select_next', 'fallback' },
+        ['<CR>'] = { 'select_and_accept', 'fallback' },
+        ['<C-space>'] = { 'show_and_insert', 'fallback' },
+        -- ['<C-space>'] = { 'show', 'fallback' },
+        -- ['<C-n>'] = { 'accept', 'fallback' },
+      },
+      signature = { enabled = true },
+
+      appearance = {
+        -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
+        -- Adjusts spacing to ensure icons are aligned
+        nerd_font_variant = 'mono'
+      },
+
+      -- (Default) Only show the documentation popup when manually triggered
+      completion = {
+        documentation = { auto_show = true },
+        menu = {
+          -- show more things in the menu
+          draw = {
+            columns = {
+              { "label",      "label_description", gap = 1 },
+              { "kind_icon",  "kind",              gap = 1 },
+              { "source_name" },
+            },
+          }
+        },
+      },
+
+      -- Default list of enabled providers defined so that you can extend it
+      -- elsewhere in your config, without redefining it, due to `opts_extend`
+      sources = {
+        default = { 'lsp', 'path', 'snippets', 'buffer', 'orgmode' },
+        -- per_filetype = {
+        --   org = { 'orgmode' }
+        -- },
+
+        providers = {
+          orgmode = {
+            name = 'Orgmode',
+            module = 'orgmode.org.autocompletion.blink',
+            fallbacks = { 'lsp', 'path', 'snippets', 'buffer' },
+            -- fallbacks = { 'buffer' },
+          },
+        },
+      },
+
+      snippets = { preset = 'luasnip' },
+
+
+      -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
+      -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
+      -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
+      --
+      -- See the fuzzy documentation for more information
+      fuzzy = { implementation = "prefer_rust_with_warning" }
+    },
+    opts_extend = { "sources.default" }
   },
 
+
   -- Code snippet engine
   {
     "L3MON4D3/LuaSnip",
@@ -40,8 +125,8 @@ require("lazy").setup({
   --
   -- LSP manager and others
   --
-  "williamboman/mason.nvim",
+  -- "williamboman/mason.nvim",
-  "williamboman/mason-lspconfig.nvim",
+  --  "williamboman/mason-lspconfig.nvim",
   "neovim/nvim-lspconfig",
 
   -- Nice plugin to show what LSPs are doing in the background (and others
@@ -63,6 +148,17 @@ require("lazy").setup({
     },
   },
 
+  -- fzf-lua
+  {
+    "ibhagwan/fzf-lua",
+    -- optional for icon support
+    dependencies = { "nvim-tree/nvim-web-devicons" },
+    config = function()
+      require('fzf-lua').register_ui_select()
+    end
+  },
+
+
   -- neogit setup
   {
     "NeogitOrg/neogit",
@@ -74,7 +170,11 @@ require("lazy").setup({
       -- "nvim-telescope/telescope.nvim", -- optional
       "ibhagwan/fzf-lua", -- optional
     },
-    config = true
+    config = function()
+      require('neogit').setup({
+        sort_branches = "refname"
+      })
+    end
   },
 
   -- org-mode
@@ -85,9 +185,40 @@ require("lazy").setup({
     config = function()
       -- Setup orgmode
       require('orgmode').setup({
-        org_agenda_files = '~/orgfiles/**/*',
+        -- cf: https://github.com/nvim-orgmode/orgmode/blob/master/docs/configuration.org#mappings
-        org_default_notes_file = '~/orgfiles/refile.org',
+        mappings = {
+          org = {
+            org_move_subtree_up = { '<Leader>oK', '<C-M-Up>' },
+            org_move_subtree_down = { '<Leader>oJ', '<C-M-Down>' },
+            org_promote_subtree = { '<s', '<C-M-Left>' },
+            org_demote_subtree = { '>s', '<C-M-Right>' },
+          }
+        },
+        -- org_agenda_files = '~/orgfiles/**/*',
+        -- org_default_notes_file = '~/orgfiles/refile.org',
+        org_agenda_files = '~/Documents/Eigene (Briefe etc.)/org/*.org',
+        org_default_notes_file = '~/Documents/Eigene (Briefe etc.)/org/refile.org',
         org_todo_keywords = { 'TODO(t)', 'STARTED(s)', 'PLANNED(p)', '|', 'DONE(d)', 'UNPLANNED(u)' },
+        org_custom_exports = {
+          f = {
+            label = 'Export to HTML format',
+            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', '--toc',
+                '--number-sections', '--output', target }
+              local on_success = function(output)
+                print('Success!')
+                vim.api.nvim_echo({ { table.concat(output, '\n') } }, true, {})
+              end
+              local on_error = function(err)
+                print('Error!')
+                vim.api.nvim_echo({ { table.concat(err, '\n'), 'ErrorMsg' } }, true, {})
+              end
+              return exporter(command, target, on_success, on_error)
+            end
+          }
+        },
       })
 
       -- NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
@@ -99,22 +230,28 @@ require("lazy").setup({
     end,
   },
 
-  -- comfortable table editing, esp. used in orgmode
+  -- org-roam - lets try it out (2025-05-20)
-  { 'dhruvasagar/vim-table-mode' },
-
-  -- fzf-lua
   {
-    "ibhagwan/fzf-lua",
+    "chipsenkbeil/org-roam.nvim",
-    -- optional for icon support
-    dependencies = { "nvim-tree/nvim-web-devicons" },
     config = function()
-      -- calling `setup` is optional for customization
+      require("org-roam").setup({
-      local fzf = require("fzf-lua")
+        directory = "~/Documents/Eigene (Briefe etc.)/org/roam",
-      fzf.setup({ "default-title" })
+        -- optional
-      fzf.register_ui_select()
+        -- org_files = {
+        --   "~/another_org_dir",
+        --   "~/some/folder/*.org",
+        --   "~/a/single/org_file.org",
+        -- }
+        bindings = {
+          prefix = "<LocalLeader>r"
+        }
+      })
     end
   },
 
+  -- comfortable table editing, esp. used in orgmode
+  { 'dhruvasagar/vim-table-mode' },
+
   -- which-key
   {
     "folke/which-key.nvim",
@@ -123,8 +260,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
@@ -135,6 +275,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 = {
       {
@@ -169,89 +326,7 @@ require("lazy").setup({
     'nvim-lualine/lualine.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },
     config = function()
-      -- an alternative might be:
+      require('config.lualine')
-      -- https://github.com/nvim-treesitter/nvim-treesitter-context
-      local function breadcrumb()
-        local result = require 'nvim-treesitter'.statusline(
-          {
-            type_patterns = {
-              "class",
-              "impl",
-              "function",
-              "method",
-              "import",
-              "for",
-              "if",
-              "while",
-              "variable",
-              "comment",
-            },
-            separator = " ▶ "
-          }
-        )
-        if result == "" then
-          result = ' '
-        elseif result == nil then
-          result = ''
-        end
-        return result
-      end
-
-      require("lualine").setup {
-        options = {
-          icons_enabled = false,
-          theme = 'papercolor_light',
-          component_separators = {},
-          section_separators = {},
-          disabled_filetypes = {
-            statusline = {},
-            winbar = {},
-          },
-          ignore_focus = {},
-          always_divide_middle = true,
-          globalstatus = false,
-          refresh = {
-            statusline = 1000,
-            tabline = 1000,
-            winbar = 1000,
-          }
-        },
-        sections = {
-          lualine_a = { { 'filename', path = 1, shorting_target = 50 } },
-          lualine_b = { 'branch', 'diff', 'diagnostics' },
-          lualine_c = {},
-          lualine_x = { 'encoding', 'fileformat', 'filetype' },
-          lualine_y = { 'filesize' },
-          lualine_z = { 'progress', 'location' }
-        },
-        inactive_sections = {
-          lualine_a = { { 'filename', path = 1, shorting_target = 50 } },
-          lualine_b = {},
-          lualine_c = {},
-          -- lualine_x = { 'encoding', 'fileformat', 'filetype' },
-          lualine_x = {},
-          lualine_y = { 'filesize' },
-          lualine_z = { 'location' }
-        },
-        tabline = {},
-        winbar = {
-          lualine_a = {
-            {
-              breadcrumb,
-              color = { bg = '#2a2a2a', fg = '#cfcfcf' },
-            },
-          },
-        },
-        inactive_winbar = {
-          lualine_a = {
-            { breadcrumb,
-              color = { bg = '#101010', fg = '#999999' },
-              draw_empty = true
-            }
-          },
-        },
-        extensions = {}
-      }
     end
 
   },
@@ -265,7 +340,30 @@ require("lazy").setup({
       "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
       "MunifTanjim/nui.nvim",
       -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
-    }
+    },
+    config = function()
+      require("neo-tree").setup({
+        window = {
+          position = "left",
+          mappings = {
+            ["<tab>"] = {
+              "toggle_node",
+              nowait = false, -- disable `nowait` if you have existing combos starting with this char that you want to use
+            },
+          }
+        }
+      })
+    end
+  },
+  {
+    "antosha417/nvim-lsp-file-operations",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-neo-tree/neo-tree.nvim",
+    },
+    config = function()
+      require("lsp-file-operations").setup()
+    end,
   },
 
   -- workspaces, lightweight "projects"
@@ -280,7 +378,7 @@ require("lazy").setup({
         mru_sort = false,
 
         -- option to automatically activate workspace when opening neovim in a workspace directory
-        auto_open = true,
+        auto_open = false,
 
         -- option to automatically activate workspace when changing directory not via this plugin
         auto_dir = true,
@@ -292,22 +390,27 @@ require("lazy").setup({
     end
   },
 
-  -- rpn calculator
+  -- calculate using qalc cli, call :QalcAttach or :Qalc
-  -- also added as source to cmp
   {
-    "PhilRunninger/cmp-rpncalc",
+    "Apeiros-46B/qalc.nvim",
+    config = function()
+      require('qalc').setup({
+        bufname = "Qalculate",
+      })
+    end,
   },
 
+
   -- TODO, WARN, HACK, PERF, NOTE, TEST and others highlighting and searching
-  {
+  -- {
-    "folke/todo-comments.nvim",
+  --   "folke/todo-comments.nvim",
-    dependencies = { "nvim-lua/plenary.nvim" },
+  --   dependencies = { "nvim-lua/plenary.nvim" },
-    opts = {
+  --   opts = {
-      -- your configuration comes here
+  --     -- your configuration comes here
-      -- or leave it empty to use the default settings
+  --     -- or leave it empty to use the default settings
-      -- refer to the configuration section below
+  --     -- refer to the configuration section below
-    }
+  --   }
-  },
+  -- },
 
   -- highlight word under cursor
   {
@@ -319,10 +422,6 @@ require("lazy").setup({
     "itchyny/calendar.vim"
   },
 
-  -- treesitter asciidoc support
-  { "cpkio/nvim-treesitter-asciidoc" },
-
-
   -- Greeter to run on NeoVim startup
   {
     'goolord/alpha-nvim',
@@ -330,112 +429,14 @@ require("lazy").setup({
       'nvim-tree/nvim-web-devicons',
     },
     config = function()
-      local alpha = require 'alpha'
+      require('config.alpha-nvim')
-      local dashboard = require 'alpha.themes.dashboard'
-
-      _Gopts = {
-        position = 'center',
-        hl = 'Type',
-        wrap = 'overflow',
-      }
-
-      -- DASHBOARD HEADER
-
-      local function getGreeting()
-        local tableTime = os.date '*t'
-        local datetime = os.date ' %Y-%m-%d-%A   %H:%M:%S '
-        local hour = tableTime.hour
-        local greetingsTable = {
-          [1] = '  Sleep well',
-          [2] = '  Good morning',
-          [3] = '  Good afternoon',
-          [4] = '  Good evening',
-          [5] = '󰖔  Good night',
-        }
-        local greetingIndex = 0
-        if hour == 23 or hour < 7 then
-          greetingIndex = 1
-        elseif hour < 12 then
-          greetingIndex = 2
-        elseif hour >= 12 and hour < 18 then
-          greetingIndex = 3
-        elseif hour >= 18 and hour < 21 then
-          greetingIndex = 4
-        elseif hour >= 21 then
-          greetingIndex = 5
-        end
-        return datetime .. '  ' .. greetingsTable[greetingIndex]
-      end
-
-      local logo = [[
-
-                                              
-       ████ ██████           █████      ██
-      ███████████             █████ 
-      █████████ ███████████████████ ███   ███████████
-     █████████  ███    █████████████ █████ ██████████████
-    █████████ ██████████ █████████ █████ █████ ████ █████
-  ███████████ ███    ███ █████████ █████ █████ ████ █████
- ██████  █████████████████████ ████ █████ █████ ████ ██████
-
-      ]]
-
-      local greeting = getGreeting()
-      local marginBottom = 0
-
-      -- Split logo into lines
-      local logoWidth = 0
-      for line in logo:gmatch '[^\n]+' do
-        logoWidth = math.max(logoWidth, #line / 2)
-      end
-      logoWidth = 75 -- code above does not work with utf8 strings in lua 5.1
-
-      -- Calculate padding for centering the greeting
-      local greetingWidth = #greeting - 3
-      local padding = math.floor((logoWidth - greetingWidth) / 2)
-
-      -- Generate spaces for padding
-      local paddedGreeting = string.rep(' ', padding) .. greeting
-
-      -- Add margin lines below the padded greeting
-      local margin = string.rep('\n', marginBottom * 5)
-
-      -- Concatenate logo, padded greeting, and margin
-      local adjustedLogo = logo .. '\n' .. paddedGreeting .. margin
-      dashboard.section.header.val = vim.split(adjustedLogo, '\n')
-
-      dashboard.section.buttons.val = {
-        dashboard.button('n', '  New file', ':ene <BAR> startinsert <CR>'),
-        dashboard.button('u', '󱐥  Update plugins', '<cmd>Lazy update<CR>'),
-        dashboard.button('s', '  Settings', '<cmd>WorkspacesOpen config-nvim<CR>'),
-        dashboard.button('w', '  Workspaces', '<cmd>WorkspacesOpen<CR>'),
-        dashboard.button('q', '󰤆  Quit', '<cmd>qa<CR>'),
-      }
-
-      -- dashboard.section.footer.val = greeting
-
-      vim.api.nvim_create_autocmd('User', {
-        pattern = 'LazyVimStarted',
-        desc = 'Add Alpha dashboard footer',
-        once = true,
-        callback = function()
-          local stats = require('lazy').stats()
-          local ms = math.floor(stats.startuptime * 100 + 0.5) / 100
-          dashboard.section.footer.val = { ' ', ' ', ' ', ' Loaded ' .. stats.count .. ' plugins  in ' .. ms .. ' ms ' }
-          dashboard.section.header.opts.hl = 'DashboardFooter'
-          pcall(vim.cmd.AlphaRedraw)
-        end,
-      })
-
-      dashboard.opts.opts.noautocmd = true
-      alpha.setup(dashboard.opts)
     end,
   },
 
   -- improved Rust support
   {
     'mrcjkb/rustaceanvim',
-    version = '^5', -- Recommended
+    version = '^6', -- Recommended
     lazy = false,   -- This plugin is already lazy
   },
 
@@ -447,36 +448,6 @@ require("lazy").setup({
     end,
   },
 
-  -- Live Coding: sonic-pi music programming
-  {
-    'magicmonty/sonicpi.nvim',
-    config = function()
-      require('sonicpi').setup({
-        -- server_dir = '/opt/sonic-pi/app/server',
-        lsp_diagnostics = true,
-        mappings = {
-          { 'n', '<leader>d', ':SonicPiStartDaemon<CR>',                    { desc = 'Sonic Pi: start daemon' } },
-          { 'n', '<leader>s', require('sonicpi.remote').stop,               { desc = 'Sonic Pi: stop' } },
-          { 'i', '<M-s>',     require('sonicpi.remote').stop,               { desc = 'Sonic Pi: stop' } },
-          { 'n', '<leader>r', require('sonicpi.remote').run_current_buffer, { desc = 'Sonic Pi: run' } },
-          { 'i', '<M-r>',     require('sonicpi.remote').run_current_buffer, { desc = 'Sonic Pi: run' } },
-          { 'n', '<leader>R', ':SonicPiSendBuffer<CR>',                     { desc = 'Sonic Pi: send buffer' } },
-          { 'i', '<M-R>',     ':SonicPiSendBuffer<CR>',                     { desc = 'Sonic Pi: send buffer' } },
-          { 'v', '<leader>s', require('sonicpi.remote').stop,               { desc = 'Sonic Pi: stop' } },
-          { 'v', '<leader>v',
-            function()
-              require('sonicpi.remote').run_code(SL_get_visual_selection())
-            end, { desc = 'Sonic Pi: send visual range' } }
-        },
-        single_file = true,
-      })
-    end,
-    dependencies = {
-      'hrsh7th/nvim-cmp',
-      'kyazdani42/nvim-web-devicons'
-    },
-  },
-
   -- easy term on a shortcut
   {
     "akinsho/toggleterm.nvim",
@@ -496,11 +467,42 @@ require("lazy").setup({
     },
   },
 
-  -- Live Coding: tidal cycles support
+
+  -- show indent markers
   {
-    'tidalcycles/vim-tidal',
+    "lukas-reineke/indent-blankline.nvim",
-    config = function()
+    main = "ibl",
-      vim.g.tidal_sc_enable = 1
+    ---@module "ibl"
-    end,
+    ---@type ibl.config
+    opts = {},
   },
+
+
+  -- improved (wrapping!) diagnostics
+  {
+    "rachartier/tiny-inline-diagnostic.nvim",
+    event = "VeryLazy", -- one of LspAttach, VeryLazy
+    priority = 1000,    -- needs to be loaded in first
+    config = function()
+      require('tiny-inline-diagnostic').setup({
+        options = {
+          use_icons_from_diagnostic = true,
+          enable_on_insert = true,
+          show_all_diags_on_cursorline = true,
+        }
+      })
+      vim.diagnostic.config({ virtual_text = false }) -- Only if needed in your configuration, if you already have native LSP diagnostics
+    end
+  },
+
+
+  -- 2025-05-21 not yet clear if this is a good thing or not
+  {
+    'xemptuous/sqlua.nvim',
+    lazy = true,
+    cmd = 'SQLua',
+    config = function() require('sqlua').setup() end
+  },
+
+  -- new plugins BEFORE here
 })

snippets/all.snippets

@@ -1,13 +1,16 @@
 # ccflow local snippets for all modes
 
 snippet todo "Add a TODO marker"
-	// TODO.`strftime("%Y-%m-%d")` 
+	// TODO.`strftime("%Y-%m-%d -")` 
 
 snippet note "Add a NOTE marker"
-	// NOTE.`strftime("%Y-%m-%d")` 
+	// NOTE.`strftime("%Y-%m-%d -")` 
 
 snippet date "Insert current date"
-   		  `strftime("%Y-%m-%d")`
+   		  `strftime("%Y-%m-%d ")`
+
+snippet datetime "Insert current date and time"
+   		  `strftime("%Y-%m-%d %H:%M ")`
 
 snippet lorem "Insert a lorem ipsum paragraph"
 	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

syntax/confile.vim

@@ -0,0 +1,26 @@
+" Vim Syntax file for CON files
+
+syn match SetLength /^\d\{3\}/ nextgroup=SetKeyword,SetKeywordMarked,SetKeywordInfoMarked
+hi SetLength guifg=grey
+
+syn match SetKeyword /\d\{4\}/ contained
+hi SetKeyword guifg=lightgreen
+
+" Visitations marked completely
+syn match SetKeywordMarked /310[123]\|5000/ contained nextgroup=SetKeywordMarkedInfo
+hi SetKeywordMarked gui=inverse guifg=lightgreen
+
+" Treatments only mark treatment info
+syn match SetKeywordInfoMarked /5001/ contained nextgroup=SetKeywordMarkedInfo
+hi SetKeywordInfoMarked guifg=lightgreen
+
+" mark keyword value
+syn match SetKeywordMarkedInfo /..*/ contained
+hi SetKeywordMarkedInfo gui=inverse
+
+" Mark datasets like patient
+syn match SetStart /^0138000/ nextgroup=SetType
+syn match SetType /con0\|con9\|besa\|adt0\|adt9\|010[1-4]\|rvsa/ contained " 0101
+
+hi SetStart guifg=white guibg=green
+hi SetType guifg=white guibg=red