From 16ccb1d10792448ae4f4142e08ee435328e07d91 Mon Sep 17 00:00:00 2001
From: Oscar Wallberg <oscar.wallberg@outlook.com>
Date: Wed, 16 Apr 2025 23:16:58 +0200
Subject: [PATCH] fix: namespace all local packages and modules

---
 init.lua                                      | 10 +++----
 lua/{ => ow}/bootstrap.lua                    |  2 +-
 lua/{ => ow}/core/autocommands.lua            |  0
 lua/{ => ow}/core/globals.lua                 |  0
 lua/{ => ow}/core/mappings.lua                |  0
 lua/{ => ow}/core/options.lua                 |  0
 lua/{ => ow}/lsp.lua                          | 27 ++++++++++++-------
 lua/{ => ow}/lsp/config/bashls.lua            |  2 +-
 lua/{ => ow}/lsp/config/clangd.lua            |  0
 lua/{ => ow}/lsp/config/cmake.lua             |  0
 lua/{ => ow}/lsp/config/gopls.lua             |  2 +-
 lua/{ => ow}/lsp/config/groovyls.lua          |  0
 lua/{ => ow}/lsp/config/hls.lua               |  0
 lua/{ => ow}/lsp/config/intelephense.lua      |  2 +-
 .../lsp/config/jedi_language_server.lua       |  2 +-
 lua/{ => ow}/lsp/config/lemminx.lua           |  2 --
 lua/{ => ow}/lsp/config/lua_ls.lua            |  2 +-
 lua/{ => ow}/lsp/config/mesonlsp.lua          |  0
 lua/{ => ow}/lsp/config/pyright.lua           |  0
 lua/{ => ow}/lsp/config/rust_analyzer.lua     |  0
 lua/{ => ow}/lsp/config/zls.lua               |  0
 lua/{ => ow}/lsp/keymap.lua                   |  2 +-
 lua/{ => ow}/lsp/linter.lua                   |  2 +-
 lua/{ => ow}/lsp/package.lua                  |  2 +-
 lua/{ => ow}/lsp/server.lua                   |  8 +++---
 lua/{ => ow}/meta/uv.lua                      |  0
 lua/{ => ow}/plugins/cmp.lua                  | 10 ++++---
 lua/{ => ow}/plugins/comment.lua              |  0
 lua/{ => ow}/plugins/dap.lua                  |  0
 lua/{ => ow}/plugins/fidget.lua               |  0
 lua/{ => ow}/plugins/flog.lua                 |  0
 lua/{ => ow}/plugins/fugitive.lua             |  0
 lua/{ => ow}/plugins/gitsigns.lua             |  0
 lua/{ => ow}/plugins/lspkind.lua              |  0
 lua/{ => ow}/plugins/mason.lua                |  0
 lua/{ => ow}/plugins/moonfly.lua              |  0
 lua/{ => ow}/plugins/neo-tree.lua             |  0
 lua/{ => ow}/plugins/notify.lua               |  0
 lua/{ => ow}/plugins/nvim-colorizer.lua       |  0
 .../plugins/nvim-treesitter-context.lua       |  0
 lua/{ => ow}/plugins/oil.lua                  |  0
 lua/{ => ow}/plugins/orgmode.lua              |  0
 lua/{ => ow}/plugins/telescope.lua            |  0
 lua/{ => ow}/plugins/treesitter.lua           |  0
 lua/{ => ow}/utils.lua                        |  0
 45 files changed, 43 insertions(+), 32 deletions(-)
 rename lua/{ => ow}/bootstrap.lua (96%)
 rename lua/{ => ow}/core/autocommands.lua (100%)
 rename lua/{ => ow}/core/globals.lua (100%)
 rename lua/{ => ow}/core/mappings.lua (100%)
 rename lua/{ => ow}/core/options.lua (100%)
 rename lua/{ => ow}/lsp.lua (81%)
 rename lua/{ => ow}/lsp/config/bashls.lua (95%)
 rename lua/{ => ow}/lsp/config/clangd.lua (100%)
 rename lua/{ => ow}/lsp/config/cmake.lua (100%)
 rename lua/{ => ow}/lsp/config/gopls.lua (96%)
 rename lua/{ => ow}/lsp/config/groovyls.lua (100%)
 rename lua/{ => ow}/lsp/config/hls.lua (100%)
 rename lua/{ => ow}/lsp/config/intelephense.lua (98%)
 rename lua/{ => ow}/lsp/config/jedi_language_server.lua (99%)
 rename lua/{ => ow}/lsp/config/lemminx.lua (97%)
 rename lua/{ => ow}/lsp/config/lua_ls.lua (98%)
 rename lua/{ => ow}/lsp/config/mesonlsp.lua (100%)
 rename lua/{ => ow}/lsp/config/pyright.lua (100%)
 rename lua/{ => ow}/lsp/config/rust_analyzer.lua (100%)
 rename lua/{ => ow}/lsp/config/zls.lua (100%)
 rename lua/{ => ow}/lsp/keymap.lua (99%)
 rename lua/{ => ow}/lsp/linter.lua (99%)
 rename lua/{ => ow}/lsp/package.lua (99%)
 rename lua/{ => ow}/lsp/server.lua (98%)
 rename lua/{ => ow}/meta/uv.lua (100%)
 rename lua/{ => ow}/plugins/cmp.lua (95%)
 rename lua/{ => ow}/plugins/comment.lua (100%)
 rename lua/{ => ow}/plugins/dap.lua (100%)
 rename lua/{ => ow}/plugins/fidget.lua (100%)
 rename lua/{ => ow}/plugins/flog.lua (100%)
 rename lua/{ => ow}/plugins/fugitive.lua (100%)
 rename lua/{ => ow}/plugins/gitsigns.lua (100%)
 rename lua/{ => ow}/plugins/lspkind.lua (100%)
 rename lua/{ => ow}/plugins/mason.lua (100%)
 rename lua/{ => ow}/plugins/moonfly.lua (100%)
 rename lua/{ => ow}/plugins/neo-tree.lua (100%)
 rename lua/{ => ow}/plugins/notify.lua (100%)
 rename lua/{ => ow}/plugins/nvim-colorizer.lua (100%)
 rename lua/{ => ow}/plugins/nvim-treesitter-context.lua (100%)
 rename lua/{ => ow}/plugins/oil.lua (100%)
 rename lua/{ => ow}/plugins/orgmode.lua (100%)
 rename lua/{ => ow}/plugins/telescope.lua (100%)
 rename lua/{ => ow}/plugins/treesitter.lua (100%)
 rename lua/{ => ow}/utils.lua (100%)

diff --git a/init.lua b/init.lua
index 2ab6f92..84f880a 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 vim.loader.enable()
 
-local utils = require("utils")
+local utils = require("ow.utils")
 
 local files = {
     "globals",
@@ -10,7 +10,7 @@ local files = {
 }
 
 for _, file in ipairs(files) do
-    local pkg = "core." .. file
+    local pkg = "ow.core." .. file
     local ok, err = pcall(require, pkg)
     if not ok then
         utils.err("Error while loading package " .. pkg)
@@ -19,7 +19,7 @@ for _, file in ipairs(files) do
     end
 end
 
-local ok, err = pcall(require, "bootstrap")
+local ok, err = pcall(require, "ow.bootstrap")
 if not ok then
     utils.err("Error during bootstrap")
     utils.err(err:gsub("\t", "  "))
@@ -30,9 +30,9 @@ end
 local plugins = {
     {
         "neovim/nvim-lspconfig",
-        config = require("lsp").setup,
+        config = require("ow.lsp").setup,
     },
-    { import = "plugins" },
+    { import = "ow.plugins" },
 }
 
 ---@type LazyConfig
diff --git a/lua/bootstrap.lua b/lua/ow/bootstrap.lua
similarity index 96%
rename from lua/bootstrap.lua
rename to lua/ow/bootstrap.lua
index c2ceb51..9822f84 100644
--- a/lua/bootstrap.lua
+++ b/lua/ow/bootstrap.lua
@@ -6,7 +6,7 @@ if version.major == 0 then
     end
 end
 
-local utils = require("utils")
+local utils = require("ow.utils")
 
 -- Install lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
diff --git a/lua/core/autocommands.lua b/lua/ow/core/autocommands.lua
similarity index 100%
rename from lua/core/autocommands.lua
rename to lua/ow/core/autocommands.lua
diff --git a/lua/core/globals.lua b/lua/ow/core/globals.lua
similarity index 100%
rename from lua/core/globals.lua
rename to lua/ow/core/globals.lua
diff --git a/lua/core/mappings.lua b/lua/ow/core/mappings.lua
similarity index 100%
rename from lua/core/mappings.lua
rename to lua/ow/core/mappings.lua
diff --git a/lua/core/options.lua b/lua/ow/core/options.lua
similarity index 100%
rename from lua/core/options.lua
rename to lua/ow/core/options.lua
diff --git a/lua/lsp.lua b/lua/ow/lsp.lua
similarity index 81%
rename from lua/lsp.lua
rename to lua/ow/lsp.lua
index ffeb321..905e43a 100644
--- a/lua/lsp.lua
+++ b/lua/ow/lsp.lua
@@ -1,9 +1,9 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
-local CONFIG_DIR = vim.fn.stdpath("config") .. "/lua/lsp/config"
+local CONFIG_DIR = vim.fn.stdpath("config") .. "/lua/ow/lsp/config"
 
 ---@class Server
-local Server = require("lsp.server")
+local Server = require("ow.lsp.server")
 
 local M = {}
 
@@ -19,9 +19,9 @@ local function get_module_name(filepath)
 end
 
 local function get_server_config(name)
-    local module = "lsp.config." .. name
+    local module = "ow.lsp.config." .. name
     package.loaded[module] = nil
-    return utils.try_require("lsp.config." .. name)
+    return utils.try_require("ow.lsp.config." .. name)
 end
 
 local reload_server_config = utils.debounce_with_id(function(name, events)
@@ -35,7 +35,8 @@ local reload_server_config = utils.debounce_with_id(function(name, events)
     end
 
     if events.rename then
-        local _, _, err_name = vim.uv.fs_stat(("%s/%s.lua"):format(CONFIG_DIR, name))
+        local _, _, err_name =
+            vim.uv.fs_stat(("%s/%s.lua"):format(CONFIG_DIR, name))
         if err_name == "ENOENT" then
             return
         end
@@ -51,7 +52,7 @@ local reload_server_config = utils.debounce_with_id(function(name, events)
         return
     end
 
-    local on_done = function (success)
+    local on_done = function(success)
         if success then
             utils.info(("%s reloaded"):format(name))
         end
@@ -68,7 +69,10 @@ end, 1000)
 
 local function process_change(error, filename, events)
     if error then
-        utils.err(("Error on change for %s:\n%s"):format(filename, error), "lsp.on_config_change")
+        utils.err(
+            ("Error on change for %s:\n%s"):format(filename, error),
+            "ow.lsp.on_config_change"
+        )
         return
     end
 
@@ -109,7 +113,12 @@ local function load_configs()
         ::continue::
     end
 
-    vim.uv.fs_event_start(vim.uv.new_fs_event(), CONFIG_DIR, {}, vim.schedule_wrap(process_change))
+    vim.uv.fs_event_start(
+        vim.uv.new_fs_event(),
+        CONFIG_DIR,
+        {},
+        vim.schedule_wrap(process_change)
+    )
 end
 
 --- Setup diagnostics UI
diff --git a/lua/lsp/config/bashls.lua b/lua/ow/lsp/config/bashls.lua
similarity index 95%
rename from lua/lsp/config/bashls.lua
rename to lua/ow/lsp/config/bashls.lua
index fa2ded3..b79c848 100644
--- a/lua/lsp/config/bashls.lua
+++ b/lua/ow/lsp/config/bashls.lua
@@ -1,4 +1,4 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
 return {
     enable = true,
diff --git a/lua/lsp/config/clangd.lua b/lua/ow/lsp/config/clangd.lua
similarity index 100%
rename from lua/lsp/config/clangd.lua
rename to lua/ow/lsp/config/clangd.lua
diff --git a/lua/lsp/config/cmake.lua b/lua/ow/lsp/config/cmake.lua
similarity index 100%
rename from lua/lsp/config/cmake.lua
rename to lua/ow/lsp/config/cmake.lua
diff --git a/lua/lsp/config/gopls.lua b/lua/ow/lsp/config/gopls.lua
similarity index 96%
rename from lua/lsp/config/gopls.lua
rename to lua/ow/lsp/config/gopls.lua
index 06efc9b..dda75b5 100644
--- a/lua/lsp/config/gopls.lua
+++ b/lua/ow/lsp/config/gopls.lua
@@ -1,4 +1,4 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
 ---@type ServerConfig
 return {
diff --git a/lua/lsp/config/groovyls.lua b/lua/ow/lsp/config/groovyls.lua
similarity index 100%
rename from lua/lsp/config/groovyls.lua
rename to lua/ow/lsp/config/groovyls.lua
diff --git a/lua/lsp/config/hls.lua b/lua/ow/lsp/config/hls.lua
similarity index 100%
rename from lua/lsp/config/hls.lua
rename to lua/ow/lsp/config/hls.lua
diff --git a/lua/lsp/config/intelephense.lua b/lua/ow/lsp/config/intelephense.lua
similarity index 98%
rename from lua/lsp/config/intelephense.lua
rename to lua/ow/lsp/config/intelephense.lua
index 52ffced..2de6874 100644
--- a/lua/lsp/config/intelephense.lua
+++ b/lua/ow/lsp/config/intelephense.lua
@@ -2,7 +2,7 @@
 -- https://github.com/bmewburn/intelephense-docs/blob/master/installation.md
 -- https://github.com/bmewburn/vscode-intelephense/blob/master/package.json
 
-local utils = require("utils")
+local utils = require("ow.utils")
 
 return {
     enable = true,
diff --git a/lua/lsp/config/jedi_language_server.lua b/lua/ow/lsp/config/jedi_language_server.lua
similarity index 99%
rename from lua/lsp/config/jedi_language_server.lua
rename to lua/ow/lsp/config/jedi_language_server.lua
index 6422f8f..1252e6b 100644
--- a/lua/lsp/config/jedi_language_server.lua
+++ b/lua/ow/lsp/config/jedi_language_server.lua
@@ -1,4 +1,4 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
 local ERROR = vim.diagnostic.severity.ERROR
 local WARN = vim.diagnostic.severity.WARN
diff --git a/lua/lsp/config/lemminx.lua b/lua/ow/lsp/config/lemminx.lua
similarity index 97%
rename from lua/lsp/config/lemminx.lua
rename to lua/ow/lsp/config/lemminx.lua
index 4fc95b5..444d2d6 100644
--- a/lua/lsp/config/lemminx.lua
+++ b/lua/ow/lsp/config/lemminx.lua
@@ -1,7 +1,5 @@
 -- spec: https://github.com/eclipse/lemminx/blob/main/docs/Configuration.md
 
-local utils = require("utils")
-
 return {
     enable = true,
     mason = {
diff --git a/lua/lsp/config/lua_ls.lua b/lua/ow/lsp/config/lua_ls.lua
similarity index 98%
rename from lua/lsp/config/lua_ls.lua
rename to lua/ow/lsp/config/lua_ls.lua
index 67e80d9..94415a4 100644
--- a/lua/lsp/config/lua_ls.lua
+++ b/lua/ow/lsp/config/lua_ls.lua
@@ -1,5 +1,5 @@
 -- spec: https://luals.github.io/wiki/settings/
-local utils = require("utils")
+local utils = require("ow.utils")
 
 ---@type ServerConfig
 return {
diff --git a/lua/lsp/config/mesonlsp.lua b/lua/ow/lsp/config/mesonlsp.lua
similarity index 100%
rename from lua/lsp/config/mesonlsp.lua
rename to lua/ow/lsp/config/mesonlsp.lua
diff --git a/lua/lsp/config/pyright.lua b/lua/ow/lsp/config/pyright.lua
similarity index 100%
rename from lua/lsp/config/pyright.lua
rename to lua/ow/lsp/config/pyright.lua
diff --git a/lua/lsp/config/rust_analyzer.lua b/lua/ow/lsp/config/rust_analyzer.lua
similarity index 100%
rename from lua/lsp/config/rust_analyzer.lua
rename to lua/ow/lsp/config/rust_analyzer.lua
diff --git a/lua/lsp/config/zls.lua b/lua/ow/lsp/config/zls.lua
similarity index 100%
rename from lua/lsp/config/zls.lua
rename to lua/ow/lsp/config/zls.lua
diff --git a/lua/lsp/keymap.lua b/lua/ow/lsp/keymap.lua
similarity index 99%
rename from lua/lsp/keymap.lua
rename to lua/ow/lsp/keymap.lua
index 449fd90..72e5d66 100644
--- a/lua/lsp/keymap.lua
+++ b/lua/ow/lsp/keymap.lua
@@ -1,7 +1,7 @@
 -- Mappings.
 -- See `:help vim.lsp.*` for documentation on any of the below functions
 
-local utils = require("utils")
+local utils = require("ow.utils")
 
 ---@class Keymap
 ---@field mode string|string[]
diff --git a/lua/lsp/linter.lua b/lua/ow/lsp/linter.lua
similarity index 99%
rename from lua/lsp/linter.lua
rename to lua/ow/lsp/linter.lua
index 7c92d0e..455a90e 100644
--- a/lua/lsp/linter.lua
+++ b/lua/ow/lsp/linter.lua
@@ -1,4 +1,4 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
 ---@class Linter
 ---@field name string
diff --git a/lua/lsp/package.lua b/lua/ow/lsp/package.lua
similarity index 99%
rename from lua/lsp/package.lua
rename to lua/ow/lsp/package.lua
index bde33e3..1cbd008 100644
--- a/lua/lsp/package.lua
+++ b/lua/ow/lsp/package.lua
@@ -1,4 +1,4 @@
-local utils = require("utils")
+local utils = require("ow.utils")
 
 ---@class PostInstallStep
 ---@field cmd string[]
diff --git a/lua/lsp/server.lua b/lua/ow/lsp/server.lua
similarity index 98%
rename from lua/lsp/server.lua
rename to lua/ow/lsp/server.lua
index 9aaba26..585aa9b 100644
--- a/lua/lsp/server.lua
+++ b/lua/ow/lsp/server.lua
@@ -1,11 +1,11 @@
-local keymap = require("lsp.keymap")
-local utils = require("utils")
+local keymap = require("ow.lsp.keymap")
+local utils = require("ow.utils")
 
 ---@class Linter
-local Linter = require("lsp.linter")
+local Linter = require("ow.lsp.linter")
 
 ---@class MasonPackage
-local MasonPackage = require("lsp.package")
+local MasonPackage = require("ow.lsp.package")
 
 ---@class Server
 ---@field name? string
diff --git a/lua/meta/uv.lua b/lua/ow/meta/uv.lua
similarity index 100%
rename from lua/meta/uv.lua
rename to lua/ow/meta/uv.lua
diff --git a/lua/plugins/cmp.lua b/lua/ow/plugins/cmp.lua
similarity index 95%
rename from lua/plugins/cmp.lua
rename to lua/ow/plugins/cmp.lua
index 7581d46..e7ff359 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/ow/plugins/cmp.lua
@@ -37,7 +37,11 @@ return {
             config = function()
                 require("luasnip.loaders.from_vscode").lazy_load()
             end,
-            build = (require("utils").os_name ~= "Windows_NT" and "make install_jsregexp" or nil),
+            build = (
+                require("ow.utils").os_name ~= "Windows_NT"
+                    and "make install_jsregexp"
+                or nil
+            ),
             version = "2.*",
             dependencies = { "rafamadriz/friendly-snippets" },
         },
@@ -45,7 +49,7 @@ return {
     config = function()
         local cmp = require("cmp")
         local luasnip = require("luasnip")
-        local utils = require("utils")
+        local utils = require("ow.utils")
         local lspkind = utils.try_require("lspkind")
 
         ---@type cmp.ConfigSchema
@@ -53,7 +57,7 @@ return {
             -- enabled = function()
             --     return has_words_before()
             -- end,
-            preselect = 'None',
+            preselect = "None",
             completion = {
                 autocomplete = { "InsertEnter", "TextChanged" },
                 keyword_length = 1,
diff --git a/lua/plugins/comment.lua b/lua/ow/plugins/comment.lua
similarity index 100%
rename from lua/plugins/comment.lua
rename to lua/ow/plugins/comment.lua
diff --git a/lua/plugins/dap.lua b/lua/ow/plugins/dap.lua
similarity index 100%
rename from lua/plugins/dap.lua
rename to lua/ow/plugins/dap.lua
diff --git a/lua/plugins/fidget.lua b/lua/ow/plugins/fidget.lua
similarity index 100%
rename from lua/plugins/fidget.lua
rename to lua/ow/plugins/fidget.lua
diff --git a/lua/plugins/flog.lua b/lua/ow/plugins/flog.lua
similarity index 100%
rename from lua/plugins/flog.lua
rename to lua/ow/plugins/flog.lua
diff --git a/lua/plugins/fugitive.lua b/lua/ow/plugins/fugitive.lua
similarity index 100%
rename from lua/plugins/fugitive.lua
rename to lua/ow/plugins/fugitive.lua
diff --git a/lua/plugins/gitsigns.lua b/lua/ow/plugins/gitsigns.lua
similarity index 100%
rename from lua/plugins/gitsigns.lua
rename to lua/ow/plugins/gitsigns.lua
diff --git a/lua/plugins/lspkind.lua b/lua/ow/plugins/lspkind.lua
similarity index 100%
rename from lua/plugins/lspkind.lua
rename to lua/ow/plugins/lspkind.lua
diff --git a/lua/plugins/mason.lua b/lua/ow/plugins/mason.lua
similarity index 100%
rename from lua/plugins/mason.lua
rename to lua/ow/plugins/mason.lua
diff --git a/lua/plugins/moonfly.lua b/lua/ow/plugins/moonfly.lua
similarity index 100%
rename from lua/plugins/moonfly.lua
rename to lua/ow/plugins/moonfly.lua
diff --git a/lua/plugins/neo-tree.lua b/lua/ow/plugins/neo-tree.lua
similarity index 100%
rename from lua/plugins/neo-tree.lua
rename to lua/ow/plugins/neo-tree.lua
diff --git a/lua/plugins/notify.lua b/lua/ow/plugins/notify.lua
similarity index 100%
rename from lua/plugins/notify.lua
rename to lua/ow/plugins/notify.lua
diff --git a/lua/plugins/nvim-colorizer.lua b/lua/ow/plugins/nvim-colorizer.lua
similarity index 100%
rename from lua/plugins/nvim-colorizer.lua
rename to lua/ow/plugins/nvim-colorizer.lua
diff --git a/lua/plugins/nvim-treesitter-context.lua b/lua/ow/plugins/nvim-treesitter-context.lua
similarity index 100%
rename from lua/plugins/nvim-treesitter-context.lua
rename to lua/ow/plugins/nvim-treesitter-context.lua
diff --git a/lua/plugins/oil.lua b/lua/ow/plugins/oil.lua
similarity index 100%
rename from lua/plugins/oil.lua
rename to lua/ow/plugins/oil.lua
diff --git a/lua/plugins/orgmode.lua b/lua/ow/plugins/orgmode.lua
similarity index 100%
rename from lua/plugins/orgmode.lua
rename to lua/ow/plugins/orgmode.lua
diff --git a/lua/plugins/telescope.lua b/lua/ow/plugins/telescope.lua
similarity index 100%
rename from lua/plugins/telescope.lua
rename to lua/ow/plugins/telescope.lua
diff --git a/lua/plugins/treesitter.lua b/lua/ow/plugins/treesitter.lua
similarity index 100%
rename from lua/plugins/treesitter.lua
rename to lua/ow/plugins/treesitter.lua
diff --git a/lua/utils.lua b/lua/ow/utils.lua
similarity index 100%
rename from lua/utils.lua
rename to lua/ow/utils.lua