diff --git a/.config/nvim/lua/goodhumored/common-bindings.lua b/.config/nvim/lua/goodhumored/common-bindings.lua index 1631e51..79b08bd 100644 --- a/.config/nvim/lua/goodhumored/common-bindings.lua +++ b/.config/nvim/lua/goodhumored/common-bindings.lua @@ -1,3 +1,8 @@ +-- Set as the leader key +-- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) +vim.g.mapleader = " " +vim.g.maplocalleader = " " + -- ───────────────────── disable highlight on search ───────────────────── vim.keymap.set({ "n", "i" }, "", "", { noremap = true, desc = "Delete word" }) diff --git a/.config/nvim/lua/goodhumored/common-vim-settings.lua b/.config/nvim/lua/goodhumored/common-vim-settings.lua index 2d1eb21..d878f32 100644 --- a/.config/nvim/lua/goodhumored/common-vim-settings.lua +++ b/.config/nvim/lua/goodhumored/common-vim-settings.lua @@ -1,8 +1,3 @@ --- Set as the leader key --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) -vim.g.mapleader = " " -vim.g.maplocalleader = " " - -- Set the number of spaces to use for each step of (auto)indent vim.opt.tabstop = 2 -- Number of spaces that a counts for vim.opt.shiftwidth = 2 -- Number of spaces to use for each step of (auto)indent @@ -20,6 +15,7 @@ vim.g.have_nerd_font = true -- For more options, you can see `:help option-list` -- Make line numbers default +vim.opt.number = true vim.opt.relativenumber = true -- Enable mouse mode, can be useful for resizing splits for example! @@ -42,7 +38,10 @@ vim.opt.ignorecase = true vim.opt.smartcase = true -- Keep signcolumn on by default -vim.opt.signcolumn = "yes" +vim.opt.signcolumn = "number" + +-- Removes ~ after file end +vim.opt.fillchars:append({ eob = " " }) -- Decrease update time vim.opt.updatetime = 250 diff --git a/.config/nvim/lua/goodhumored/init.lua b/.config/nvim/lua/goodhumored/init.lua index 2dad7d2..54538c1 100644 --- a/.config/nvim/lua/goodhumored/init.lua +++ b/.config/nvim/lua/goodhumored/init.lua @@ -1,6 +1,6 @@ -require("goodhumored.common-vim-settings") require("goodhumored.common-bindings") -require("goodhumored.autocommands") require("goodhumored.lazy") +require("goodhumored.common-vim-settings") +require("goodhumored.autocommands") -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et