diff --git a/.config/nvim/.github/README.md b/.config/nvim/.github/README.md index b635e8e6..a23a20c7 100644 --- a/.config/nvim/.github/README.md +++ b/.config/nvim/.github/README.md @@ -404,6 +404,7 @@ - [TobinPalmer/rayso.nvim](https://dotfyle.com/plugins/TobinPalmer/rayso.nvim) - [L3MON4D3/LuaSnip](https://dotfyle.com/plugins/L3MON4D3/LuaSnip) +- [chrisgrieser/nvim-scissors](https://dotfyle.com/plugins/chrisgrieser/nvim-scissors) - [mrcjkb/haskell-snippets.nvim](https://dotfyle.com/plugins/mrcjkb/haskell-snippets.nvim) - [cvigilv/esqueleto.nvim](https://dotfyle.com/plugins/cvigilv/esqueleto.nvim) - [rafamadriz/friendly-snippets](https://dotfyle.com/plugins/rafamadriz/friendly-snippets) diff --git a/.config/nvim/lua/config/keymaps.lua b/.config/nvim/lua/config/keymaps.lua index 605f6b44..c0feb2d9 100644 --- a/.config/nvim/lua/config/keymaps.lua +++ b/.config/nvim/lua/config/keymaps.lua @@ -2,6 +2,7 @@ -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here local map = vim.keymap.set + local Util = require("lazyvim.util") -- Search current word diff --git a/.config/nvim/lua/config/options.lua b/.config/nvim/lua/config/options.lua index 2a6f7cd4..063106c9 100644 --- a/.config/nvim/lua/config/options.lua +++ b/.config/nvim/lua/config/options.lua @@ -1,6 +1,8 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +local opt = vim.g + -- Neovide options require("config.neovide") @@ -8,9 +10,12 @@ require("config.neovide") vim.loader.enable() -- Font -vim.g.gui_font_default_size = 10 -vim.g.gui_font_size = vim.g.gui_font_default_size -vim.g.gui_font_face = "JetBrainsMono Nerd Font" +opt.gui_font_default_size = 10 +opt.gui_font_size = opt.gui_font_default_size +opt.gui_font_face = "JetBrainsMono Nerd Font" -- Define leader key -vim.g.mapleader = " " +opt.mapleader = " " + +-- Enable EditorConfig integration +opt.editorconfig = true