diff options
Diffstat (limited to '.config/nvim/init.lua')
| -rw-r--r-- | .config/nvim/init.lua | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 033963e..042e95b 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,41 +1,21 @@ -local home_dir = vim.loop.os_homedir() - --- TODO: we need something like this: vim.opt.packpath = vim.opt.rtp -vim.cmd [[let &packpath = &runtimepath]] --- }}} +require("bootstrap"):init() local config = require "config" -config:init() +-- config:init() config:load() local plugins = require "plugins" -local plugin_loader = require("plugin-loader").init() -plugin_loader:load { plugins, options.plugins } +require("plugin-loader"):load { plugins, options.plugins } local Log = require "core.log" -Log:info "Starting nvim" +Log:debug "Starting nvim" vim.g.colors_name = options.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs. vim.cmd("colorscheme " .. options.colorscheme) -local utils = require "utils" -utils.toggle_autoformat() local commands = require "core.commands" commands.load(commands.defaults) -require("lsp").config() - -local null_status_ok, null_ls = pcall(require, "null-ls") -if null_status_ok then - null_ls.config {} - require("lspconfig")["null-ls"].setup(options.lsp.null_ls.setup) -end - -local lsp_settings_status_ok, lsp_settings = pcall(require, "nlspsettings") -if lsp_settings_status_ok then - lsp_settings.setup { - config_home = home_dir .. "/.config/nvim/lsp-settings", - } -end - require("keymappings").setup() + +require("lsp").setup() |