Improved text wrapping gwap -> gwgw

after/ftplugin/org.lua

@@ -11,3 +11,8 @@ vim.keymap.set(
     desc = 'ORG: meta return'
   }
 )
+
+-- Force LF line endings for Org files (fixes capture/refile newline duplication on Windows)
+if vim.fn.has("win32") == 1 or vim.fn.has("win64") == 1 then
+  vim.opt_local.fileformat = "unix"
+end

lua/keybindings.lua

@@ -33,11 +33,16 @@ vim.keymap.set('n', '<leader>C', ":Calendar -view=year -split=vertical -width=27
 vim.keymap.set('n', '<space>o', ":silent !chromium '%'<cr>", { desc = "Open in browser" })
 
 -- org mode mappings
-if vim.loop.os_gethostname() == 'ccflow' then
+-- Open org file folder in neotree
-  -- Open org file folder in neotree
+vim.keymap.set('n', '<leader>of',
-  vim.keymap.set('n', '<leader>of', ':silent :Neotree dir=/home/saschal/Documents/Eigene\\ (Briefe\\ etc.)/org<cr>',
+  function()
-    { desc = "Open org folder" })
+    require('neo-tree.command').execute({
-end
+      dir = sl_opt.org_base_folder,
+      reveal = true,
+      toggle = true
+    })
+  end,
+  { desc = "Open org folder" })
 vim.keymap.set('n', '<leader>a', ':silent Org agenda t<cr>', { desc = "Org Agenda" })
 
 -- toggle colorscheme between dark and light
@@ -122,7 +127,7 @@ vim.keymap.set('v', '<M-Down>', ":m '>+1<cr>gv=gv", { desc = "Move current selec
 -- Shortcuts which are known from Emacs
 --
 ------------------------------------------
-vim.keymap.set('n', '<space>q', "gwap", { desc = "Wrap paragraph" })
+vim.keymap.set('n', '<space>q', "gwgw", { desc = "Wrap textobject" })
 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" })
 

lua/lsp.lua

@@ -99,7 +99,7 @@ if vim.loop.os_gethostname() == 'ccflow' then
     'gopls',
     'bashls',
     'html',
-    'emmylua_ls',
+    'emmylua_ls', -- arch aur: emmylua-ls-bin
     'jsonls',     -- arch extra: vscode-json-languageserver
     'kotlin_lsp', -- arch aur: kotlin-lsp-bin
     'lemminx',    -- arch aur: lemminx

lua/options.lua

@@ -1,30 +1,22 @@
 ---------------------------------------------------
 --
--- Global settings
+-- Global settings - this file is read first
 --
 ---------------------------------------------------
 
--- global
-
-sl_opt = {}
-
-
 -- this is specific for a machine
 if vim.loop.os_gethostname() == 'ccflow' then
-  sl_opt = {
+  _G.ORG_BASE_FOLDER = '~/Documents/Eigene (Briefe etc.)/org'
-    org_agenda_files = '~/Documents/Eigene (Briefe etc.)/org/*.org',
-    org_default_notes_file = '~/Documents/Eigene (Briefe etc.)/org/refile.org',
-    org_archive_location = '~/Documents/Eigene (Briefe etc.)/org/.archive.org',
-    org_roam_folder = '~/Documents/Eigene (Briefe etc.)/org/roam',
-  }
 else
-  sl_opt = {
+  _G.ORG_BASE_FOLDER = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles'
-    org_agenda_files = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/*.org',
-    org_default_notes_file = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/refile.org',
-    org_archive_location = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/archive.org',
-    org_roam_folder = '~/OneDrive - Stadt Rosenheim/Desktop/orgfiles/roam',
-  }
 end
+sl_opt = {
+  org_base_folder = ORG_BASE_FOLDER,
+  org_agenda_files = ORG_BASE_FOLDER .. '/*.org',
+  org_default_notes_file = ORG_BASE_FOLDER .. '/refile.org',
+  org_archive_location = ORG_BASE_FOLDER .. '/archive.org',
+  org_roam_folder = ORG_BASE_FOLDER .. '/roam',
+}
 
 ---------------------------------------------------
 --

lua/plugins.lua

@@ -83,7 +83,7 @@ require("lazy").setup({
       -- 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' },
+        default = { 'lsp', 'path', 'snippets', 'buffer', 'orgmode', 'lazydev' },
         -- per_filetype = {
         --   org = { 'orgmode' }
         -- },
@@ -95,6 +95,13 @@ require("lazy").setup({
             fallbacks = { 'lsp', 'path', 'snippets', 'buffer' },
             -- fallbacks = { 'buffer' },
           },
+
+          lazydev = {
+            name = "LazyDev",
+            module = "lazydev.integrations.blink",
+            -- make lazydev completions top priority (see `:h blink.cmp`)
+            score_offset = 100,
+          },
         },
       },
 
@@ -560,5 +567,19 @@ require("lazy").setup({
     }
   },
 
+  -- improve neovim configuration file editing
+  {
+    "folke/lazydev.nvim",
+    ft = "lua", -- only load on lua files
+    opts = {
+      library = {
+        -- See the configuration section for more details
+        -- Load luvit types when the `vim.uv` word is found
+        { path = "${3rd}/luv/library", words = { "vim%.uv" } },
+      },
+    },
+  },
+
+
   -- new plugins BEFORE here
 })