Moved lengthy setup routines from plugins.lua to config/<pluginname>.lua

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('o', '󱙺  AI Chat', '<cmd>OGPT<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,84 @@
+      -- an alternative might be:
+      -- 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 = { "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' },
+          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 = {}
+      }

lua/config/nvim-cmp.lua

@@ -91,6 +91,5 @@ cmp.setup({
     { name = 'path' },     -- For path completion
     { name = 'orgmode' },  -- for nvim-orgmode
     { name = 'sonicpi' },  -- for sonic-pi integration
-    { name = 'calc' },     -- for calulcator
   })
 })

lua/plugins.lua

@@ -74,7 +74,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,8 +89,16 @@ require("lazy").setup({
     config = function()
       -- Setup orgmode
       require('orgmode').setup({
-        org_agenda_files = '~/orgfiles/**/*',
-        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_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 = {
@@ -119,6 +131,25 @@ require("lazy").setup({
     end,
   },
 
+  -- org-roam - lets try it out (2025-05-20)
+  {
+    "chipsenkbeil/org-roam.nvim",
+    config = function()
+      require("org-roam").setup({
+        directory = "~/Documents/Eigene (Briefe etc.)/org/roam",
+        -- optional
+        -- 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' },
 
@@ -209,90 +240,7 @@ require("lazy").setup({
     'nvim-lualine/lualine.nvim',
     dependencies = { 'nvim-tree/nvim-web-devicons' },
     config = function()
-      -- an alternative might be:
-      -- 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 = { "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' },
-          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 = {}
-      }
+      require('config.lualine')
     end
 
   },
@@ -356,11 +304,6 @@ require("lazy").setup({
     end
   },
 
-  -- calulcation in cmp
-  {
-    "hrsh7th/cmp-calc",
-  },
-
   -- calculate using qalc cli, call :QalcAttach or :Qalc
   {
     "Apeiros-46B/qalc.nvim",
@@ -405,115 +348,7 @@ require("lazy").setup({
       'nvim-tree/nvim-web-devicons',
     },
     config = function()
-      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('o', '󱙺  AI Chat', '<cmd>OGPT<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)
+      require('config.alpha-nvim')
     end,
   },
 

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.