diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index c25d69a..53b8109 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,6 +4,7 @@ -- Description : neovim configuration file require("globals") -- ./lua/globals.lua +require("utils") -- ./lua/utils.lua require("settings") -- ./lua/settings.lua require("plugins") -- ./lua/plugins.lua require("maps") -- ./lua/maps.lua diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index 62bc300..4652999 100644 --- a/.config/nvim/lua/globals.lua +++ b/.config/nvim/lua/globals.lua @@ -1,4 +1,11 @@ -globals = { +-- Author : swytch +-- Created : Friday May 21, 2021 22:26:24 CET +-- License : GPLv3 +-- Description : neovim global variables file + +local M = {} -- The module to export + +M = { lsp_path = vim.fn.stdpath("data").. "/lsp", -- misc @@ -7,3 +14,8 @@ globals = { sign_hint = "", sign_info = "", } + +-- Make it accessible everywhere +_G.globals = M +-- Export the module +return M diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua index 293d617..8f1e5e4 100644 --- a/.config/nvim/lua/maps.lua +++ b/.config/nvim/lua/maps.lua @@ -3,8 +3,6 @@ -- License : GPLv3 -- Description : neovim mappings file -utils = require("utils") - utils.map("n", "", "") utils.map("n", "j", "bn") utils.map("n", "k", "bp") diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 6b8289a..37b8bc8 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -3,8 +3,6 @@ -- License : GPLv3 -- Description : neovim settings file -utils = require("utils") - local g = vim.g local o = vim.o diff --git a/.config/nvim/lua/statusline.lua b/.config/nvim/lua/statusline.lua index e979b01..ada01d3 100644 --- a/.config/nvim/lua/statusline.lua +++ b/.config/nvim/lua/statusline.lua @@ -6,7 +6,7 @@ local function gen_section(hl_string, items) - out = "" + local out = "" for _, item in pairs(items) do if item ~= "" then out = out .. " " .. item @@ -134,7 +134,7 @@ end local function spell_check() if vim.wo.spell then - lang = vim.o.spelllang + local lang = vim.o.spelllang return "[SPELL=" .. lang .. "]" else return "" @@ -204,7 +204,7 @@ local function statusline_not_focused() } end -function gen_statusline() +function _G.gen_statusline() if vim.g.statusline_winid == vim.fn.win_getid() then return statusline_focused() else