diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 73ca362..d287b21 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,2 +1,2 @@ -require 'user' +require 'fschauen' diff --git a/config/nvim/lua/user/autocmds.lua b/config/nvim/lua/fschauen/autocmds.lua similarity index 100% rename from config/nvim/lua/user/autocmds.lua rename to config/nvim/lua/fschauen/autocmds.lua diff --git a/config/nvim/lua/user/disable_builtin.lua b/config/nvim/lua/fschauen/disable_builtin.lua similarity index 100% rename from config/nvim/lua/user/disable_builtin.lua rename to config/nvim/lua/fschauen/disable_builtin.lua diff --git a/config/nvim/lua/user/filetypes.lua b/config/nvim/lua/fschauen/filetypes.lua similarity index 100% rename from config/nvim/lua/user/filetypes.lua rename to config/nvim/lua/fschauen/filetypes.lua diff --git a/config/nvim/lua/user/globals.lua b/config/nvim/lua/fschauen/globals.lua similarity index 100% rename from config/nvim/lua/user/globals.lua rename to config/nvim/lua/fschauen/globals.lua diff --git a/config/nvim/lua/fschauen/init.lua b/config/nvim/lua/fschauen/init.lua new file mode 100644 index 0000000..9bd8acb --- /dev/null +++ b/config/nvim/lua/fschauen/init.lua @@ -0,0 +1,10 @@ +vim.g.mapleader = ' ' + +require 'fschauen.disable_builtin' +require 'fschauen.globals' +require 'fschauen.options' +require 'fschauen.keymap' +require 'fschauen.autocmds' +require 'fschauen.filetypes' +require 'fschauen.lazy' + diff --git a/config/nvim/lua/user/keymap.lua b/config/nvim/lua/fschauen/keymap.lua similarity index 95% rename from config/nvim/lua/user/keymap.lua rename to config/nvim/lua/fschauen/keymap.lua index 597abe4..7d51994 100644 --- a/config/nvim/lua/user/keymap.lua +++ b/config/nvim/lua/fschauen/keymap.lua @@ -1,4 +1,4 @@ -local util = require('user.util') +local util = require('fschauen.util') local partial = util.partial local nmap = partial(vim.keymap.set, 'n') local imap = partial(vim.keymap.set, 'i') @@ -65,8 +65,8 @@ nmap('', 'lnextzz', { silent = true }) nmap('', 'lpreviouszz', { silent = true }) -- navigate diagnostics -nmap('j', require('user.util').goto_next_diagnostic) -nmap('k', require('user.util').goto_prev_diagnostic) +nmap('j', require('fschauen.util').goto_next_diagnostic) +nmap('k', require('fschauen.util').goto_prev_diagnostic) -- quickly open lazy.nvim plugin manager nmap('L', 'Lazy') diff --git a/config/nvim/lua/user/lazy.lua b/config/nvim/lua/fschauen/lazy.lua similarity index 94% rename from config/nvim/lua/user/lazy.lua rename to config/nvim/lua/fschauen/lazy.lua index 2d44e5f..4fed18a 100644 --- a/config/nvim/lua/user/lazy.lua +++ b/config/nvim/lua/fschauen/lazy.lua @@ -17,7 +17,7 @@ end local lazy = get_lazy() if lazy then - lazy.setup('user.plugins', { + lazy.setup('fschauen.plugins', { dev = { path = '~/Projects/nvim-plugins', fallback = true, diff --git a/config/nvim/lua/user/options.lua b/config/nvim/lua/fschauen/options.lua similarity index 100% rename from config/nvim/lua/user/options.lua rename to config/nvim/lua/fschauen/options.lua diff --git a/config/nvim/lua/user/plugins/colorizer.lua b/config/nvim/lua/fschauen/plugins/colorizer.lua similarity index 100% rename from config/nvim/lua/user/plugins/colorizer.lua rename to config/nvim/lua/fschauen/plugins/colorizer.lua diff --git a/config/nvim/lua/user/plugins/colorscheme.lua b/config/nvim/lua/fschauen/plugins/colorscheme.lua similarity index 100% rename from config/nvim/lua/user/plugins/colorscheme.lua rename to config/nvim/lua/fschauen/plugins/colorscheme.lua diff --git a/config/nvim/lua/user/plugins/comment.lua b/config/nvim/lua/fschauen/plugins/comment.lua similarity index 100% rename from config/nvim/lua/user/plugins/comment.lua rename to config/nvim/lua/fschauen/plugins/comment.lua diff --git a/config/nvim/lua/user/plugins/completion.lua b/config/nvim/lua/fschauen/plugins/completion.lua similarity index 97% rename from config/nvim/lua/user/plugins/completion.lua rename to config/nvim/lua/fschauen/plugins/completion.lua index b31aa6a..34dd6cd 100644 --- a/config/nvim/lua/user/plugins/completion.lua +++ b/config/nvim/lua/fschauen/plugins/completion.lua @@ -2,8 +2,8 @@ local config = function() local cmp = require('cmp') local map = cmp.mapping - local flip = require('user.util').flip - local partial = require('user.util').partial + local flip = require('fschauen.util').flip + local partial = require('fschauen.util').partial -- assign('i', { key = func, ... }) == { key = { i = func }, ... } -- assign({'i', 'c'}, { key = func, ... }) == { key = { i = func, c = func }, ...} diff --git a/config/nvim/lua/user/plugins/fugitive.lua b/config/nvim/lua/fschauen/plugins/fugitive.lua similarity index 100% rename from config/nvim/lua/user/plugins/fugitive.lua rename to config/nvim/lua/fschauen/plugins/fugitive.lua diff --git a/config/nvim/lua/user/plugins/indent-blankline.lua b/config/nvim/lua/fschauen/plugins/indent-blankline.lua similarity index 100% rename from config/nvim/lua/user/plugins/indent-blankline.lua rename to config/nvim/lua/fschauen/plugins/indent-blankline.lua diff --git a/config/nvim/lua/user/plugins/init.lua b/config/nvim/lua/fschauen/plugins/init.lua similarity index 100% rename from config/nvim/lua/user/plugins/init.lua rename to config/nvim/lua/fschauen/plugins/init.lua diff --git a/config/nvim/lua/user/plugins/lsp.lua b/config/nvim/lua/fschauen/plugins/lsp.lua similarity index 100% rename from config/nvim/lua/user/plugins/lsp.lua rename to config/nvim/lua/fschauen/plugins/lsp.lua diff --git a/config/nvim/lua/user/plugins/lualine.lua b/config/nvim/lua/fschauen/plugins/lualine.lua similarity index 100% rename from config/nvim/lua/user/plugins/lualine.lua rename to config/nvim/lua/fschauen/plugins/lualine.lua diff --git a/config/nvim/lua/user/plugins/markdown-preview.lua b/config/nvim/lua/fschauen/plugins/markdown-preview.lua similarity index 100% rename from config/nvim/lua/user/plugins/markdown-preview.lua rename to config/nvim/lua/fschauen/plugins/markdown-preview.lua diff --git a/config/nvim/lua/user/plugins/neogit.lua b/config/nvim/lua/fschauen/plugins/neogit.lua similarity index 100% rename from config/nvim/lua/user/plugins/neogit.lua rename to config/nvim/lua/fschauen/plugins/neogit.lua diff --git a/config/nvim/lua/user/plugins/nvim-tree.lua b/config/nvim/lua/fschauen/plugins/nvim-tree.lua similarity index 100% rename from config/nvim/lua/user/plugins/nvim-tree.lua rename to config/nvim/lua/fschauen/plugins/nvim-tree.lua diff --git a/config/nvim/lua/user/plugins/tabular.lua b/config/nvim/lua/fschauen/plugins/tabular.lua similarity index 100% rename from config/nvim/lua/user/plugins/tabular.lua rename to config/nvim/lua/fschauen/plugins/tabular.lua diff --git a/config/nvim/lua/user/plugins/telescope.lua b/config/nvim/lua/fschauen/plugins/telescope.lua similarity index 99% rename from config/nvim/lua/user/plugins/telescope.lua rename to config/nvim/lua/fschauen/plugins/telescope.lua index aa5548d..e36cb13 100644 --- a/config/nvim/lua/user/plugins/telescope.lua +++ b/config/nvim/lua/fschauen/plugins/telescope.lua @@ -90,7 +90,7 @@ local config = function() })) end, selection = function(_) - local selected = require('user.util').get_selected_text() + local selected = require('fschauen.util').get_selected_text() ts.grep_string { prompt_title = string.format('  Grep: %s ', selected), search = selected, diff --git a/config/nvim/lua/user/plugins/treesitter.lua b/config/nvim/lua/fschauen/plugins/treesitter.lua similarity index 100% rename from config/nvim/lua/user/plugins/treesitter.lua rename to config/nvim/lua/fschauen/plugins/treesitter.lua diff --git a/config/nvim/lua/user/plugins/trouble.lua b/config/nvim/lua/fschauen/plugins/trouble.lua similarity index 100% rename from config/nvim/lua/user/plugins/trouble.lua rename to config/nvim/lua/fschauen/plugins/trouble.lua diff --git a/config/nvim/lua/user/plugins/undotree.lua b/config/nvim/lua/fschauen/plugins/undotree.lua similarity index 100% rename from config/nvim/lua/user/plugins/undotree.lua rename to config/nvim/lua/fschauen/plugins/undotree.lua diff --git a/config/nvim/lua/user/plugins/vim-better-whitespace.lua b/config/nvim/lua/fschauen/plugins/vim-better-whitespace.lua similarity index 100% rename from config/nvim/lua/user/plugins/vim-better-whitespace.lua rename to config/nvim/lua/fschauen/plugins/vim-better-whitespace.lua diff --git a/config/nvim/lua/user/plugins/virt-column.lua b/config/nvim/lua/fschauen/plugins/virt-column.lua similarity index 100% rename from config/nvim/lua/user/plugins/virt-column.lua rename to config/nvim/lua/fschauen/plugins/virt-column.lua diff --git a/config/nvim/lua/user/plugins/visual-multi.lua.disabled b/config/nvim/lua/fschauen/plugins/visual-multi.lua.disabled similarity index 100% rename from config/nvim/lua/user/plugins/visual-multi.lua.disabled rename to config/nvim/lua/fschauen/plugins/visual-multi.lua.disabled diff --git a/config/nvim/lua/user/util.lua b/config/nvim/lua/fschauen/util.lua similarity index 100% rename from config/nvim/lua/user/util.lua rename to config/nvim/lua/fschauen/util.lua diff --git a/config/nvim/lua/user/init.lua b/config/nvim/lua/user/init.lua deleted file mode 100644 index daedf00..0000000 --- a/config/nvim/lua/user/init.lua +++ /dev/null @@ -1,10 +0,0 @@ -vim.g.mapleader = ' ' - -require 'user.disable_builtin' -require 'user.globals' -require 'user.options' -require 'user.keymap' -require 'user.autocmds' -require 'user.filetypes' -require 'user.lazy' -