From 3146a8d59b0b5f7b69817324159b5bf26826d281 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Tue, 1 Jul 2025 18:00:35 +0200
Subject: [PATCH] nvim: remove `fschauen` namespace

---
 config/nvim/after/ftplugin/NeogitCommitMessage.lua   |  2 +-
 config/nvim/after/ftplugin/gitcommit.lua             |  2 +-
 config/nvim/after/ftplugin/lua.lua                   |  2 +-
 config/nvim/init.lua                                 |  2 +-
 config/nvim/lua/{fschauen => config}/autocmd.lua     |  0
 config/nvim/lua/{fschauen => config}/diagnostic.lua  |  2 +-
 config/nvim/lua/{fschauen => config}/filetype.lua    |  0
 config/nvim/lua/{fschauen => config}/init.lua        | 12 ++++++------
 config/nvim/lua/{fschauen => config}/keymap.lua      |  8 ++++----
 config/nvim/lua/{fschauen => config}/lazy.lua        |  2 +-
 config/nvim/lua/{fschauen => config}/options.lua     |  0
 .../lua/lualine/components/fschauen/filename.lua     |  2 +-
 config/nvim/lua/{fschauen => }/plugins/blame.lua     |  2 +-
 config/nvim/lua/{fschauen => }/plugins/colorizer.lua |  0
 .../nvim/lua/{fschauen => }/plugins/colorscheme.lua  |  0
 config/nvim/lua/{fschauen => }/plugins/comment.lua   |  2 +-
 .../nvim/lua/{fschauen => }/plugins/completion.lua   |  2 +-
 config/nvim/lua/{fschauen => }/plugins/dial.lua      |  2 +-
 config/nvim/lua/{fschauen => }/plugins/dressing.lua  |  0
 config/nvim/lua/{fschauen => }/plugins/fidget.lua    |  4 +---
 config/nvim/lua/{fschauen => }/plugins/formatter.lua |  4 ++--
 config/nvim/lua/{fschauen => }/plugins/fugitive.lua  |  2 +-
 .../lua/{fschauen => }/plugins/git-messenger.lua     |  2 +-
 config/nvim/lua/{fschauen => }/plugins/gitlinker.lua |  2 +-
 config/nvim/lua/{fschauen => }/plugins/headlines.lua |  0
 .../lua/{fschauen => }/plugins/indent-blankline.lua  |  2 +-
 config/nvim/lua/{fschauen => }/plugins/lspconfig.lua |  0
 config/nvim/lua/{fschauen => }/plugins/lualine.lua   | 10 +++++-----
 config/nvim/lua/{fschauen => }/plugins/luaref.lua    |  0
 .../lua/{fschauen => }/plugins/markdown-preview.lua  |  2 +-
 config/nvim/lua/{fschauen => }/plugins/mason.lua     |  2 +-
 config/nvim/lua/{fschauen => }/plugins/neogen.lua    |  2 +-
 config/nvim/lua/{fschauen => }/plugins/neogit.lua    |  2 +-
 config/nvim/lua/{fschauen => }/plugins/nerdy.lua     |  2 +-
 config/nvim/lua/{fschauen => }/plugins/nvim-lint.lua |  2 +-
 .../nvim/lua/{fschauen => }/plugins/nvim-notify.lua  |  4 ++--
 config/nvim/lua/{fschauen => }/plugins/nvim-tree.lua |  2 +-
 config/nvim/lua/{fschauen => }/plugins/oil.lua       |  0
 .../nvim/lua/{fschauen => }/plugins/openbrowser.lua  |  2 +-
 .../{fschauen => }/plugins/plantuml-previewer.lua    |  2 +-
 config/nvim/lua/{fschauen => }/plugins/syntax.lua    |  0
 config/nvim/lua/{fschauen => }/plugins/tabular.lua   |  0
 .../plugins/telescope-file-browser.lua               |  4 ++--
 config/nvim/lua/{fschauen => }/plugins/telescope.lua |  4 ++--
 config/nvim/lua/{fschauen => }/plugins/text-case.lua |  6 +++---
 .../lua/{fschauen => }/plugins/todo-comments.lua     |  4 ++--
 .../nvim/lua/{fschauen => }/plugins/treesitter.lua   |  2 +-
 config/nvim/lua/{fschauen => }/plugins/trouble.lua   |  2 +-
 config/nvim/lua/{fschauen => }/plugins/undotree.lua  |  2 +-
 .../nvim/lua/{fschauen => }/plugins/virt-column.lua  |  2 +-
 .../nvim/lua/{fschauen => }/plugins/whitespace.lua   |  2 +-
 config/nvim/lua/{fschauen => }/util/autoformat.lua   |  0
 config/nvim/lua/{fschauen => }/util/icons.lua        |  0
 config/nvim/lua/{fschauen => }/util/init.lua         |  0
 config/nvim/lua/{fschauen => }/util/lua.lua          |  5 ++---
 config/nvim/lua/{fschauen => }/util/lualine.lua      |  0
 config/nvim/lua/{fschauen => }/util/options.lua      |  0
 config/nvim/lua/{fschauen => }/util/window.lua       |  0
 58 files changed, 60 insertions(+), 63 deletions(-)
 rename config/nvim/lua/{fschauen => config}/autocmd.lua (100%)
 rename config/nvim/lua/{fschauen => config}/diagnostic.lua (98%)
 rename config/nvim/lua/{fschauen => config}/filetype.lua (100%)
 rename config/nvim/lua/{fschauen => config}/init.lua (54%)
 rename config/nvim/lua/{fschauen => config}/keymap.lua (95%)
 rename config/nvim/lua/{fschauen => config}/lazy.lua (97%)
 rename config/nvim/lua/{fschauen => config}/options.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/blame.lua (95%)
 rename config/nvim/lua/{fschauen => }/plugins/colorizer.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/colorscheme.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/comment.lua (88%)
 rename config/nvim/lua/{fschauen => }/plugins/completion.lua (98%)
 rename config/nvim/lua/{fschauen => }/plugins/dial.lua (97%)
 rename config/nvim/lua/{fschauen => }/plugins/dressing.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/fidget.lua (89%)
 rename config/nvim/lua/{fschauen => }/plugins/formatter.lua (93%)
 rename config/nvim/lua/{fschauen => }/plugins/fugitive.lua (86%)
 rename config/nvim/lua/{fschauen => }/plugins/git-messenger.lua (94%)
 rename config/nvim/lua/{fschauen => }/plugins/gitlinker.lua (96%)
 rename config/nvim/lua/{fschauen => }/plugins/headlines.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/indent-blankline.lua (93%)
 rename config/nvim/lua/{fschauen => }/plugins/lspconfig.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/lualine.lua (87%)
 rename config/nvim/lua/{fschauen => }/plugins/luaref.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/markdown-preview.lua (94%)
 rename config/nvim/lua/{fschauen => }/plugins/mason.lua (89%)
 rename config/nvim/lua/{fschauen => }/plugins/neogen.lua (93%)
 rename config/nvim/lua/{fschauen => }/plugins/neogit.lua (93%)
 rename config/nvim/lua/{fschauen => }/plugins/nerdy.lua (79%)
 rename config/nvim/lua/{fschauen => }/plugins/nvim-lint.lua (81%)
 rename config/nvim/lua/{fschauen => }/plugins/nvim-notify.lua (92%)
 rename config/nvim/lua/{fschauen => }/plugins/nvim-tree.lua (98%)
 rename config/nvim/lua/{fschauen => }/plugins/oil.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/openbrowser.lua (88%)
 rename config/nvim/lua/{fschauen => }/plugins/plantuml-previewer.lua (95%)
 rename config/nvim/lua/{fschauen => }/plugins/syntax.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/tabular.lua (100%)
 rename config/nvim/lua/{fschauen => }/plugins/telescope-file-browser.lua (63%)
 rename config/nvim/lua/{fschauen => }/plugins/telescope.lua (98%)
 rename config/nvim/lua/{fschauen => }/plugins/text-case.lua (85%)
 rename config/nvim/lua/{fschauen => }/plugins/todo-comments.lua (86%)
 rename config/nvim/lua/{fschauen => }/plugins/treesitter.lua (98%)
 rename config/nvim/lua/{fschauen => }/plugins/trouble.lua (95%)
 rename config/nvim/lua/{fschauen => }/plugins/undotree.lua (90%)
 rename config/nvim/lua/{fschauen => }/plugins/virt-column.lua (93%)
 rename config/nvim/lua/{fschauen => }/plugins/whitespace.lua (92%)
 rename config/nvim/lua/{fschauen => }/util/autoformat.lua (100%)
 rename config/nvim/lua/{fschauen => }/util/icons.lua (100%)
 rename config/nvim/lua/{fschauen => }/util/init.lua (100%)
 rename config/nvim/lua/{fschauen => }/util/lua.lua (97%)
 rename config/nvim/lua/{fschauen => }/util/lualine.lua (100%)
 rename config/nvim/lua/{fschauen => }/util/options.lua (100%)
 rename config/nvim/lua/{fschauen => }/util/window.lua (100%)

diff --git a/config/nvim/after/ftplugin/NeogitCommitMessage.lua b/config/nvim/after/ftplugin/NeogitCommitMessage.lua
index 8548080..691d7e8 100644
--- a/config/nvim/after/ftplugin/NeogitCommitMessage.lua
+++ b/config/nvim/after/ftplugin/NeogitCommitMessage.lua
@@ -1 +1 @@
-require("fschauen.util.options").set_gitcommit_buffer_options()
+require("util.options").set_gitcommit_buffer_options()
diff --git a/config/nvim/after/ftplugin/gitcommit.lua b/config/nvim/after/ftplugin/gitcommit.lua
index 8548080..691d7e8 100644
--- a/config/nvim/after/ftplugin/gitcommit.lua
+++ b/config/nvim/after/ftplugin/gitcommit.lua
@@ -1 +1 @@
-require("fschauen.util.options").set_gitcommit_buffer_options()
+require("util.options").set_gitcommit_buffer_options()
diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index 578d130..01e130d 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -1,6 +1,6 @@
 vim.bo.tabstop = 2
 
-local lua = require("fschauen.util.lua")
+local lua = require("util.lua")
 local map = vim.keymap.set
 local opts = function(desc) return { desc = desc, buffer = true, silent = true } end
 
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 1073eda..5094389 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,3 +1,3 @@
 if vim.loader then vim.loader.enable() end
 
-require("fschauen")
+require("config")
diff --git a/config/nvim/lua/fschauen/autocmd.lua b/config/nvim/lua/config/autocmd.lua
similarity index 100%
rename from config/nvim/lua/fschauen/autocmd.lua
rename to config/nvim/lua/config/autocmd.lua
diff --git a/config/nvim/lua/fschauen/diagnostic.lua b/config/nvim/lua/config/diagnostic.lua
similarity index 98%
rename from config/nvim/lua/fschauen/diagnostic.lua
rename to config/nvim/lua/config/diagnostic.lua
index be587f5..47a1be3 100644
--- a/config/nvim/lua/fschauen/diagnostic.lua
+++ b/config/nvim/lua/config/diagnostic.lua
@@ -19,7 +19,7 @@ end
 ---@param bufnr integer|nil: Buffer number (0 for current buffer, nil for all buffers.
 M.hide = function(bufnr) vim.diagnostic.hide(nil, bufnr or 0) end
 
-local icons = require("fschauen.util.icons")
+local icons = require("util.icons")
 
 ---Use `Telescope` to set a new diagnostic severity.
 M.set_severity = function()
diff --git a/config/nvim/lua/fschauen/filetype.lua b/config/nvim/lua/config/filetype.lua
similarity index 100%
rename from config/nvim/lua/fschauen/filetype.lua
rename to config/nvim/lua/config/filetype.lua
diff --git a/config/nvim/lua/fschauen/init.lua b/config/nvim/lua/config/init.lua
similarity index 54%
rename from config/nvim/lua/fschauen/init.lua
rename to config/nvim/lua/config/init.lua
index a0b543d..0572d7e 100644
--- a/config/nvim/lua/fschauen/init.lua
+++ b/config/nvim/lua/config/init.lua
@@ -8,12 +8,12 @@ R = function(module)
   return require(module)
 end
 
-require("fschauen.options").setup()
-require("fschauen.keymap").setup()
-require("fschauen.diagnostic").setup()
-require("fschauen.autocmd").setup()
-require("fschauen.filetype").setup()
-require("fschauen.lazy").setup()
+require("config.options").setup()
+require("config.keymap").setup()
+require("config.diagnostic").setup()
+require("config.autocmd").setup()
+require("config.filetype").setup()
+require("config.lazy").setup()
 
 local colorscheme = vim.env.NVIM_COLORSCHEME or "gruvbox"
 vim.cmd("silent! colorscheme " .. colorscheme)
diff --git a/config/nvim/lua/fschauen/keymap.lua b/config/nvim/lua/config/keymap.lua
similarity index 95%
rename from config/nvim/lua/fschauen/keymap.lua
rename to config/nvim/lua/config/keymap.lua
index 38dc640..89985e5 100644
--- a/config/nvim/lua/fschauen/keymap.lua
+++ b/config/nvim/lua/config/keymap.lua
@@ -36,7 +36,7 @@ M.setup = function()
   -- disable highlight until next search
   vim.keymap.set("n", "<leader>h", "<cmd>nohlsearch<cr>")
 
-  local window = require("fschauen.util.window")
+  local window = require("util.window")
 
   -- window resizing
   vim.keymap.set("n",    "<s-Up>",    window.resize_up(2), { desc = "Resize window upward"    })
@@ -79,8 +79,8 @@ M.setup = function()
   -- don't loose the original yanked contents when pasting in visual mode
   vim.keymap.set("x", "<leader>p", [["_dP]])
 
-  local diagnostic = require("fschauen.diagnostic")
-  local ui = require("fschauen.util.icons").ui
+  local diagnostic = require("config.diagnostic")
+  local ui = require("util.icons").ui
 
   -- navigate diagnostics
   vim.keymap.set("n", "<leader>dd", diagnostic.toggle,       { desc = ui.Diagnostic.." [d]iagnostic enable/[d]isable" })
@@ -92,7 +92,7 @@ M.setup = function()
   vim.keymap.set("n",      "<leader>q", window.toggle_quickfix, { desc = ui.Toggle.." toggle quickfix" })
   vim.keymap.set("n", "<localleader>q", window.toggle_loclist,  { desc = ui.Toggle.." toggle loclist"  })
 
-  local options = require("fschauen.util.options")
+  local options = require("util.options")
 
   -- toggle options
   vim.keymap.set("n", "<leader>sn", options.toggle_number,         { desc = ui.Toggle.." toggle 'number'" })
diff --git a/config/nvim/lua/fschauen/lazy.lua b/config/nvim/lua/config/lazy.lua
similarity index 97%
rename from config/nvim/lua/fschauen/lazy.lua
rename to config/nvim/lua/config/lazy.lua
index 7e30f51..3284471 100644
--- a/config/nvim/lua/fschauen/lazy.lua
+++ b/config/nvim/lua/config/lazy.lua
@@ -33,7 +33,7 @@ M.setup = function()
   end
 
   lazy.setup {
-    spec = "fschauen.plugins",
+    spec = "plugins",
     dev = {
       path = dev_path(),
       fallback = true,
diff --git a/config/nvim/lua/fschauen/options.lua b/config/nvim/lua/config/options.lua
similarity index 100%
rename from config/nvim/lua/fschauen/options.lua
rename to config/nvim/lua/config/options.lua
diff --git a/config/nvim/lua/lualine/components/fschauen/filename.lua b/config/nvim/lua/lualine/components/fschauen/filename.lua
index b3f1787..55dc881 100644
--- a/config/nvim/lua/lualine/components/fschauen/filename.lua
+++ b/config/nvim/lua/lualine/components/fschauen/filename.lua
@@ -23,7 +23,7 @@ function M:update_status(is_focused)
 
   local path = vim.fn.expand("%:~:.")
 
-  local window = require("fschauen.util.window")
+  local window = require("util.window")
   if window.is_wide() then
     return path
   elseif window.is_medium() then
diff --git a/config/nvim/lua/fschauen/plugins/blame.lua b/config/nvim/lua/plugins/blame.lua
similarity index 95%
rename from config/nvim/lua/fschauen/plugins/blame.lua
rename to config/nvim/lua/plugins/blame.lua
index c5b29f4..1442178 100644
--- a/config/nvim/lua/fschauen/plugins/blame.lua
+++ b/config/nvim/lua/plugins/blame.lua
@@ -7,7 +7,7 @@ return {
     {
       "<leader>gb",
       "<cmd>BlameToggle<cr>",
-      desc = require("fschauen.util.icons").ui.Git .. " [g]it [b]lame (blame.nvim)",
+      desc = require("util.icons").ui.Git .. " [g]it [b]lame (blame.nvim)",
     },
   },
 
diff --git a/config/nvim/lua/fschauen/plugins/colorizer.lua b/config/nvim/lua/plugins/colorizer.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/colorizer.lua
rename to config/nvim/lua/plugins/colorizer.lua
diff --git a/config/nvim/lua/fschauen/plugins/colorscheme.lua b/config/nvim/lua/plugins/colorscheme.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/colorscheme.lua
rename to config/nvim/lua/plugins/colorscheme.lua
diff --git a/config/nvim/lua/fschauen/plugins/comment.lua b/config/nvim/lua/plugins/comment.lua
similarity index 88%
rename from config/nvim/lua/fschauen/plugins/comment.lua
rename to config/nvim/lua/plugins/comment.lua
index b394aad..09855fb 100644
--- a/config/nvim/lua/fschauen/plugins/comment.lua
+++ b/config/nvim/lua/plugins/comment.lua
@@ -4,7 +4,7 @@ return {
   cmd = "Commentary",
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Comment
+    local icon = require("util.icons").ui.Comment
     return {
       -- stylua: ignore start
       { "gc",  "<Plug>Commentary", mode = {"n", "x", "o"}, desc = icon.." Comment in/out" },
diff --git a/config/nvim/lua/fschauen/plugins/completion.lua b/config/nvim/lua/plugins/completion.lua
similarity index 98%
rename from config/nvim/lua/fschauen/plugins/completion.lua
rename to config/nvim/lua/plugins/completion.lua
index 845320e..4be9d59 100644
--- a/config/nvim/lua/fschauen/plugins/completion.lua
+++ b/config/nvim/lua/plugins/completion.lua
@@ -85,7 +85,7 @@ return {
       formatting = {
         format = require("lspkind").cmp_format {
           mode = "symbol_text",
-          symbol_map = require("fschauen.util.icons").kind,
+          symbol_map = require("util.icons").kind,
           menu = {
             buffer = "buf",
             nvim_lsp = "LSP",
diff --git a/config/nvim/lua/fschauen/plugins/dial.lua b/config/nvim/lua/plugins/dial.lua
similarity index 97%
rename from config/nvim/lua/fschauen/plugins/dial.lua
rename to config/nvim/lua/plugins/dial.lua
index 293f7d7..926a761 100644
--- a/config/nvim/lua/fschauen/plugins/dial.lua
+++ b/config/nvim/lua/plugins/dial.lua
@@ -11,7 +11,7 @@ return {
       return function() return require("dial.map")[cmd]() .. suffix end
     end
 
-    local icons = require("fschauen.util.icons")
+    local icons = require("util.icons")
     local inc, dec = icons.ui.Increment, icons.ui.Decrement
 
     return {
diff --git a/config/nvim/lua/fschauen/plugins/dressing.lua b/config/nvim/lua/plugins/dressing.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/dressing.lua
rename to config/nvim/lua/plugins/dressing.lua
diff --git a/config/nvim/lua/fschauen/plugins/fidget.lua b/config/nvim/lua/plugins/fidget.lua
similarity index 89%
rename from config/nvim/lua/fschauen/plugins/fidget.lua
rename to config/nvim/lua/plugins/fidget.lua
index ee9a2d3..d12d969 100644
--- a/config/nvim/lua/fschauen/plugins/fidget.lua
+++ b/config/nvim/lua/plugins/fidget.lua
@@ -1,5 +1,3 @@
-local icons = require("fschauen.util.icons")
-
 return {
   "j-hui/fidget.nvim",
 
@@ -9,7 +7,7 @@ return {
 
   opts = {
     text = {
-      done = icons.ui.Checkmark,
+      done = require("util.icons").ui.Checkmark,
       spinner = {
         "▱▱▱▱▱▱▱",
         "▰▱▱▱▱▱▱",
diff --git a/config/nvim/lua/fschauen/plugins/formatter.lua b/config/nvim/lua/plugins/formatter.lua
similarity index 93%
rename from config/nvim/lua/fschauen/plugins/formatter.lua
rename to config/nvim/lua/plugins/formatter.lua
index 9d01470..acee8e7 100644
--- a/config/nvim/lua/fschauen/plugins/formatter.lua
+++ b/config/nvim/lua/plugins/formatter.lua
@@ -32,11 +32,11 @@ return {
   },
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Format
+    local icon = require("util.icons").ui.Format
     return {
       {
         "<leader>F",
-        require("fschauen.util.autoformat").toggle,
+        require("util.autoformat").toggle,
         desc = icon .. " Toggle auto [F]ormat on write",
       },
       {
diff --git a/config/nvim/lua/fschauen/plugins/fugitive.lua b/config/nvim/lua/plugins/fugitive.lua
similarity index 86%
rename from config/nvim/lua/fschauen/plugins/fugitive.lua
rename to config/nvim/lua/plugins/fugitive.lua
index ed3e6fb..ade5740 100644
--- a/config/nvim/lua/fschauen/plugins/fugitive.lua
+++ b/config/nvim/lua/plugins/fugitive.lua
@@ -4,7 +4,7 @@ return {
   cmd = { "G", "Git" },
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Git
+    local icon = require("util.icons").ui.Git
     return {
       -- stylua: ignore start
       { "<leader>gS", "<cmd>tab Git<cr>",   desc = icon.." [g]it [S]status (fugitive)" },
diff --git a/config/nvim/lua/fschauen/plugins/git-messenger.lua b/config/nvim/lua/plugins/git-messenger.lua
similarity index 94%
rename from config/nvim/lua/fschauen/plugins/git-messenger.lua
rename to config/nvim/lua/plugins/git-messenger.lua
index 7e8fa62..6e557e0 100644
--- a/config/nvim/lua/fschauen/plugins/git-messenger.lua
+++ b/config/nvim/lua/plugins/git-messenger.lua
@@ -4,7 +4,7 @@ return {
   cmd = "GitMessenger",
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Git
+    local icon = require("util.icons").ui.Git
     return {
       -- stylua: ignore start
       { "<leader>gm", "<cmd>GitMessenger<cr>", desc = icon.." [g]it [m]essenger" },
diff --git a/config/nvim/lua/fschauen/plugins/gitlinker.lua b/config/nvim/lua/plugins/gitlinker.lua
similarity index 96%
rename from config/nvim/lua/fschauen/plugins/gitlinker.lua
rename to config/nvim/lua/plugins/gitlinker.lua
index e993fbf..f3c0a5f 100644
--- a/config/nvim/lua/fschauen/plugins/gitlinker.lua
+++ b/config/nvim/lua/plugins/gitlinker.lua
@@ -26,7 +26,7 @@ return {
       end
     end
 
-    local icon = require("fschauen.util.icons").ui.Git
+    local icon = require("util.icons").ui.Git
     return {
       -- stylua: ignore start
       { "<leader>gr", open_repo,      desc = icon.." open [r]epository in browser" },
diff --git a/config/nvim/lua/fschauen/plugins/headlines.lua b/config/nvim/lua/plugins/headlines.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/headlines.lua
rename to config/nvim/lua/plugins/headlines.lua
diff --git a/config/nvim/lua/fschauen/plugins/indent-blankline.lua b/config/nvim/lua/plugins/indent-blankline.lua
similarity index 93%
rename from config/nvim/lua/fschauen/plugins/indent-blankline.lua
rename to config/nvim/lua/plugins/indent-blankline.lua
index 44de5e0..a4ea988 100644
--- a/config/nvim/lua/fschauen/plugins/indent-blankline.lua
+++ b/config/nvim/lua/plugins/indent-blankline.lua
@@ -1,4 +1,4 @@
-local ui = require("fschauen.util.icons").ui
+local ui = require("util.icons").ui
 
 return {
   "lukas-reineke/indent-blankline.nvim",
diff --git a/config/nvim/lua/fschauen/plugins/lspconfig.lua b/config/nvim/lua/plugins/lspconfig.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/lspconfig.lua
rename to config/nvim/lua/plugins/lspconfig.lua
diff --git a/config/nvim/lua/fschauen/plugins/lualine.lua b/config/nvim/lua/plugins/lualine.lua
similarity index 87%
rename from config/nvim/lua/fschauen/plugins/lualine.lua
rename to config/nvim/lua/plugins/lualine.lua
index 7f152c1..bfb9e1d 100644
--- a/config/nvim/lua/fschauen/plugins/lualine.lua
+++ b/config/nvim/lua/plugins/lualine.lua
@@ -4,10 +4,10 @@ return {
   dependencies = "nvim-tree/nvim-web-devicons",
 
   opts = function()
-    local icons = require("fschauen.util.icons")
-    local dynamic_color = require("fschauen.util.lualine").dynamic_color
-    local indicator = require("fschauen.util.lualine").indicator
-    local window = require("fschauen.util.window")
+    local icons = require("util.icons")
+    local dynamic_color = require("util.lualine").dynamic_color
+    local indicator = require("util.lualine").indicator
+    local window = require("util.window")
     local orange = "#d65d0e"
 
     local is_diagnostics_enabled = function(bufnr)
@@ -20,7 +20,7 @@ return {
 
     local autoformat = indicator {
       icon = icons.ui.Format,
-      cond = require("fschauen.util.autoformat").is_enabled,
+      cond = require("util.autoformat").is_enabled,
     }
     local branch = {
       "branch",
diff --git a/config/nvim/lua/fschauen/plugins/luaref.lua b/config/nvim/lua/plugins/luaref.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/luaref.lua
rename to config/nvim/lua/plugins/luaref.lua
diff --git a/config/nvim/lua/fschauen/plugins/markdown-preview.lua b/config/nvim/lua/plugins/markdown-preview.lua
similarity index 94%
rename from config/nvim/lua/fschauen/plugins/markdown-preview.lua
rename to config/nvim/lua/plugins/markdown-preview.lua
index 1b043f7..f34a8f4 100644
--- a/config/nvim/lua/fschauen/plugins/markdown-preview.lua
+++ b/config/nvim/lua/plugins/markdown-preview.lua
@@ -22,7 +22,7 @@ return {
   end,
 
   config = function()
-    local icon = require("fschauen.util.icons").ui.Markdown
+    local icon = require("util.icons").ui.Markdown
     vim.api.nvim_create_autocmd("FileType", {
       desc = "Create key map to toggle markdown preview.",
       group = vim.api.nvim_create_augroup("fschauen.markdown", { clear = true }),
diff --git a/config/nvim/lua/fschauen/plugins/mason.lua b/config/nvim/lua/plugins/mason.lua
similarity index 89%
rename from config/nvim/lua/fschauen/plugins/mason.lua
rename to config/nvim/lua/plugins/mason.lua
index 8c16487..9ef4ed7 100644
--- a/config/nvim/lua/fschauen/plugins/mason.lua
+++ b/config/nvim/lua/plugins/mason.lua
@@ -6,7 +6,7 @@ return {
   event = { "BufReadPre", "BufNewFile" },
 
   config = function()
-    local icons = require("fschauen.util.icons")
+    local icons = require("util.icons")
 
     require("mason").setup {
       ui = {
diff --git a/config/nvim/lua/fschauen/plugins/neogen.lua b/config/nvim/lua/plugins/neogen.lua
similarity index 93%
rename from config/nvim/lua/fschauen/plugins/neogen.lua
rename to config/nvim/lua/plugins/neogen.lua
index d675965..160c36e 100644
--- a/config/nvim/lua/fschauen/plugins/neogen.lua
+++ b/config/nvim/lua/plugins/neogen.lua
@@ -2,7 +2,7 @@ return {
   "danymat/neogen",
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Annotation
+    local icon = require("util.icons").ui.Annotation
     return {
       {
         "<leader>aa",
diff --git a/config/nvim/lua/fschauen/plugins/neogit.lua b/config/nvim/lua/plugins/neogit.lua
similarity index 93%
rename from config/nvim/lua/fschauen/plugins/neogit.lua
rename to config/nvim/lua/plugins/neogit.lua
index aee076f..3d1aee8 100644
--- a/config/nvim/lua/fschauen/plugins/neogit.lua
+++ b/config/nvim/lua/plugins/neogit.lua
@@ -1,4 +1,4 @@
-local ui = require("fschauen.util.icons").ui
+local ui = require("util.icons").ui
 
 return {
   "NeogitOrg/neogit",
diff --git a/config/nvim/lua/fschauen/plugins/nerdy.lua b/config/nvim/lua/plugins/nerdy.lua
similarity index 79%
rename from config/nvim/lua/fschauen/plugins/nerdy.lua
rename to config/nvim/lua/plugins/nerdy.lua
index c3f884d..4191437 100644
--- a/config/nvim/lua/fschauen/plugins/nerdy.lua
+++ b/config/nvim/lua/plugins/nerdy.lua
@@ -1,4 +1,4 @@
-local keymap = require("fschauen.plugins.telescope").keymap
+local keymap = require("plugins.telescope").keymap
 
 return {
   "2kabhishek/nerdy.nvim",
diff --git a/config/nvim/lua/fschauen/plugins/nvim-lint.lua b/config/nvim/lua/plugins/nvim-lint.lua
similarity index 81%
rename from config/nvim/lua/fschauen/plugins/nvim-lint.lua
rename to config/nvim/lua/plugins/nvim-lint.lua
index 8970167..d0d898f 100644
--- a/config/nvim/lua/fschauen/plugins/nvim-lint.lua
+++ b/config/nvim/lua/plugins/nvim-lint.lua
@@ -6,7 +6,7 @@ return {
       {
         "<leader>L",
         function() require("lint").try_lint() end,
-        desc = require("fschauen.util.icons").ui.Lint .. " [L]int file",
+        desc = require("util.icons").ui.Lint .. " [L]int file",
       },
     }
   end,
diff --git a/config/nvim/lua/fschauen/plugins/nvim-notify.lua b/config/nvim/lua/plugins/nvim-notify.lua
similarity index 92%
rename from config/nvim/lua/fschauen/plugins/nvim-notify.lua
rename to config/nvim/lua/plugins/nvim-notify.lua
index 10ce3a1..b1ab29d 100644
--- a/config/nvim/lua/fschauen/plugins/nvim-notify.lua
+++ b/config/nvim/lua/plugins/nvim-notify.lua
@@ -18,7 +18,7 @@ return {
 
     local dismiss_notifications = function() require("notify").dismiss() end
 
-    local keymap = require("fschauen.plugins.telescope").keymap
+    local keymap = require("plugins.telescope").keymap
 
     return {
       -- stylua: ignore start
@@ -33,7 +33,7 @@ return {
 
   config = function()
     local notify = require("notify")
-    local icons = require("fschauen.util.icons")
+    local icons = require("util.icons")
 
     notify.setup {
       icons = {
diff --git a/config/nvim/lua/fschauen/plugins/nvim-tree.lua b/config/nvim/lua/plugins/nvim-tree.lua
similarity index 98%
rename from config/nvim/lua/fschauen/plugins/nvim-tree.lua
rename to config/nvim/lua/plugins/nvim-tree.lua
index a56a91c..7ab8c95 100644
--- a/config/nvim/lua/fschauen/plugins/nvim-tree.lua
+++ b/config/nvim/lua/plugins/nvim-tree.lua
@@ -22,7 +22,7 @@ local on_attach = function(buffer)
   -- stylua: ignore end
 end
 
-local icons = require("fschauen.util.icons")
+local icons = require("util.icons")
 
 return {
   "nvim-tree/nvim-tree.lua",
diff --git a/config/nvim/lua/fschauen/plugins/oil.lua b/config/nvim/lua/plugins/oil.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/oil.lua
rename to config/nvim/lua/plugins/oil.lua
diff --git a/config/nvim/lua/fschauen/plugins/openbrowser.lua b/config/nvim/lua/plugins/openbrowser.lua
similarity index 88%
rename from config/nvim/lua/fschauen/plugins/openbrowser.lua
rename to config/nvim/lua/plugins/openbrowser.lua
index a2c2c3d..55262e6 100644
--- a/config/nvim/lua/fschauen/plugins/openbrowser.lua
+++ b/config/nvim/lua/plugins/openbrowser.lua
@@ -8,7 +8,7 @@ return {
   },
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Web
+    local icon = require("util.icons").ui.Web
     return {
       {
         "<leader>o",
diff --git a/config/nvim/lua/fschauen/plugins/plantuml-previewer.lua b/config/nvim/lua/plugins/plantuml-previewer.lua
similarity index 95%
rename from config/nvim/lua/fschauen/plugins/plantuml-previewer.lua
rename to config/nvim/lua/plugins/plantuml-previewer.lua
index a8c361e..f0e551e 100644
--- a/config/nvim/lua/fschauen/plugins/plantuml-previewer.lua
+++ b/config/nvim/lua/plugins/plantuml-previewer.lua
@@ -23,7 +23,7 @@ return {
   end,
 
   config = function()
-    local icon = require("fschauen.util.icons").ui.Graph
+    local icon = require("util.icons").ui.Graph
     local group = vim.api.nvim_create_augroup("fschauen.plantuml", { clear = true })
     vim.api.nvim_create_autocmd("FileType", {
       desc = "Create key map to toggle plantuml preview.",
diff --git a/config/nvim/lua/fschauen/plugins/syntax.lua b/config/nvim/lua/plugins/syntax.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/syntax.lua
rename to config/nvim/lua/plugins/syntax.lua
diff --git a/config/nvim/lua/fschauen/plugins/tabular.lua b/config/nvim/lua/plugins/tabular.lua
similarity index 100%
rename from config/nvim/lua/fschauen/plugins/tabular.lua
rename to config/nvim/lua/plugins/tabular.lua
diff --git a/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua b/config/nvim/lua/plugins/telescope-file-browser.lua
similarity index 63%
rename from config/nvim/lua/fschauen/plugins/telescope-file-browser.lua
rename to config/nvim/lua/plugins/telescope-file-browser.lua
index 7ce8865..a8a9a6a 100644
--- a/config/nvim/lua/fschauen/plugins/telescope-file-browser.lua
+++ b/config/nvim/lua/plugins/telescope-file-browser.lua
@@ -1,4 +1,4 @@
-local keymap = require("fschauen.plugins.telescope").keymap
+local keymap = require("plugins.telescope").keymap
 return {
   "nvim-telescope/telescope-file-browser.nvim",
 
@@ -12,5 +12,5 @@ return {
     },
   },
 
-  config = function() require("telescope").load_extension("file_browser") end,
+  config = function() require("plugins.telescope").load_extension("file_browser") end,
 }
diff --git a/config/nvim/lua/fschauen/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
similarity index 98%
rename from config/nvim/lua/fschauen/plugins/telescope.lua
rename to config/nvim/lua/plugins/telescope.lua
index 26dbc71..0f862b9 100644
--- a/config/nvim/lua/fschauen/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -1,4 +1,4 @@
-local ui = require("fschauen.util.icons").ui
+local ui = require("util.icons").ui
 
 local builtin = function(name, opts)
   return function(title)
@@ -28,7 +28,7 @@ local pickers = setmetatable({
   }),
   selection = function(title)
     return function()
-      local text = require("fschauen.util").get_selected_text()
+      local text = require("util").get_selected_text()
       return require("telescope.builtin").grep_string {
         prompt_title = string.format(title .. ": %s  ", text),
         search = text,
diff --git a/config/nvim/lua/fschauen/plugins/text-case.lua b/config/nvim/lua/plugins/text-case.lua
similarity index 85%
rename from config/nvim/lua/fschauen/plugins/text-case.lua
rename to config/nvim/lua/plugins/text-case.lua
index a0f6f3c..ebebb26 100644
--- a/config/nvim/lua/fschauen/plugins/text-case.lua
+++ b/config/nvim/lua/plugins/text-case.lua
@@ -13,14 +13,14 @@ return {
   dev = true,
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Text
+    local icon = require("util.icons").ui.Text
     local description = icon .. " [c]hange text [c]ase"
     local theme = function() return require("telescope.themes").get_cursor() end
 
     return {
       {
         "<leader>cc",
-        function() require("telescope").extensions.textcase.normal_mode(theme()) end,
+        function() require("plugins.telescope").extensions.textcase.normal_mode(theme()) end,
         mode = "n",
         desc = description,
       },
@@ -55,6 +55,6 @@ return {
     require("textcase").setup {
       default_keymappings_enabled = false,
     }
-    require("telescope").load_extension("textcase")
+    require("plugins.telescope").load_extension("textcase")
   end,
 }
diff --git a/config/nvim/lua/fschauen/plugins/todo-comments.lua b/config/nvim/lua/plugins/todo-comments.lua
similarity index 86%
rename from config/nvim/lua/fschauen/plugins/todo-comments.lua
rename to config/nvim/lua/plugins/todo-comments.lua
index 0bb8c2b..e18d42a 100644
--- a/config/nvim/lua/fschauen/plugins/todo-comments.lua
+++ b/config/nvim/lua/plugins/todo-comments.lua
@@ -1,4 +1,4 @@
-local keymap = require("fschauen.plugins.telescope").keymap
+local keymap = require("plugins.telescope").keymap
 
 return {
   "folke/todo-comments.nvim",
@@ -15,7 +15,7 @@ return {
   },
 
   opts = function()
-    local ui = require("fschauen.util.icons").ui
+    local ui = require("util.icons").ui
     return {
       keywords = {
         TODO = { icon = ui.Checkbox },
diff --git a/config/nvim/lua/fschauen/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua
similarity index 98%
rename from config/nvim/lua/fschauen/plugins/treesitter.lua
rename to config/nvim/lua/plugins/treesitter.lua
index d41a3eb..5a52322 100644
--- a/config/nvim/lua/fschauen/plugins/treesitter.lua
+++ b/config/nvim/lua/plugins/treesitter.lua
@@ -14,7 +14,7 @@ return {
   event = "VeryLazy",
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Tree
+    local icon = require("util.icons").ui.Tree
 
     return {
       -- stylua: ignore start
diff --git a/config/nvim/lua/fschauen/plugins/trouble.lua b/config/nvim/lua/plugins/trouble.lua
similarity index 95%
rename from config/nvim/lua/fschauen/plugins/trouble.lua
rename to config/nvim/lua/plugins/trouble.lua
index 77f4ab5..afc6861 100644
--- a/config/nvim/lua/fschauen/plugins/trouble.lua
+++ b/config/nvim/lua/plugins/trouble.lua
@@ -6,7 +6,7 @@ return {
   cmd = "Trouble",
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.TrafficLight
+    local icon = require("util.icons").ui.TrafficLight
     local key = function(lhs, rhs, desc) return { lhs, rhs, desc = icon .. " " .. desc } end
     return {
       -- stylua: ignore start
diff --git a/config/nvim/lua/fschauen/plugins/undotree.lua b/config/nvim/lua/plugins/undotree.lua
similarity index 90%
rename from config/nvim/lua/fschauen/plugins/undotree.lua
rename to config/nvim/lua/plugins/undotree.lua
index 06bb036..201ae04 100644
--- a/config/nvim/lua/fschauen/plugins/undotree.lua
+++ b/config/nvim/lua/plugins/undotree.lua
@@ -12,7 +12,7 @@ return {
   end,
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Undo
+    local icon = require("util.icons").ui.Undo
     return {
       { "<leader>u", "<cmd>UndotreeToggle<cr>", desc = icon .. " toggle [u]ndo tree" },
     }
diff --git a/config/nvim/lua/fschauen/plugins/virt-column.lua b/config/nvim/lua/plugins/virt-column.lua
similarity index 93%
rename from config/nvim/lua/fschauen/plugins/virt-column.lua
rename to config/nvim/lua/plugins/virt-column.lua
index d419c9e..edad089 100644
--- a/config/nvim/lua/fschauen/plugins/virt-column.lua
+++ b/config/nvim/lua/plugins/virt-column.lua
@@ -1,4 +1,4 @@
-local ui = require("fschauen.util.icons").ui
+local ui = require("util.icons").ui
 
 return {
   "lukas-reineke/virt-column.nvim",
diff --git a/config/nvim/lua/fschauen/plugins/whitespace.lua b/config/nvim/lua/plugins/whitespace.lua
similarity index 92%
rename from config/nvim/lua/fschauen/plugins/whitespace.lua
rename to config/nvim/lua/plugins/whitespace.lua
index 9d87dad..2af4b44 100644
--- a/config/nvim/lua/fschauen/plugins/whitespace.lua
+++ b/config/nvim/lua/plugins/whitespace.lua
@@ -14,7 +14,7 @@ return {
   end,
 
   keys = function()
-    local icon = require("fschauen.util.icons").ui.Whitespace
+    local icon = require("util.icons").ui.Whitespace
     return {
       -- stylua: ignore start
       { "<leader>ww", "<cmd>ToggleWhitespace<cr>",        desc = icon.." toggle whitespace"   },
diff --git a/config/nvim/lua/fschauen/util/autoformat.lua b/config/nvim/lua/util/autoformat.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/autoformat.lua
rename to config/nvim/lua/util/autoformat.lua
diff --git a/config/nvim/lua/fschauen/util/icons.lua b/config/nvim/lua/util/icons.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/icons.lua
rename to config/nvim/lua/util/icons.lua
diff --git a/config/nvim/lua/fschauen/util/init.lua b/config/nvim/lua/util/init.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/init.lua
rename to config/nvim/lua/util/init.lua
diff --git a/config/nvim/lua/fschauen/util/lua.lua b/config/nvim/lua/util/lua.lua
similarity index 97%
rename from config/nvim/lua/fschauen/util/lua.lua
rename to config/nvim/lua/util/lua.lua
index 62c918c..2800b2f 100644
--- a/config/nvim/lua/fschauen/util/lua.lua
+++ b/config/nvim/lua/util/lua.lua
@@ -1,8 +1,5 @@
 local M = {}
 
-local util = require("fschauen.util")
-local exists = util.exists
-
 ---Find lua module source.
 ---@param modname string Module name.
 ---@return table results List of source files in the runtime path that implement
@@ -12,6 +9,8 @@ local find_module_sources = function(modname)
   local base = "lua/" .. modname:gsub("%.", "/")
   local candidates = { base .. ".lua", base .. "/init.lua" }
 
+  local exists = require("util").exists
+
   local results = {}
   for _, directory in ipairs(vim.opt.runtimepath:get()) do
     for _, candidate in ipairs(candidates) do
diff --git a/config/nvim/lua/fschauen/util/lualine.lua b/config/nvim/lua/util/lualine.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/lualine.lua
rename to config/nvim/lua/util/lualine.lua
diff --git a/config/nvim/lua/fschauen/util/options.lua b/config/nvim/lua/util/options.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/options.lua
rename to config/nvim/lua/util/options.lua
diff --git a/config/nvim/lua/fschauen/util/window.lua b/config/nvim/lua/util/window.lua
similarity index 100%
rename from config/nvim/lua/fschauen/util/window.lua
rename to config/nvim/lua/util/window.lua