From 9310ba9d649b3aec3f913ee6679c3ec240a08038 Mon Sep 17 00:00:00 2001 From: frumsy Date: Fri, 16 Feb 2024 14:10:29 -0500 Subject: [PATCH] style: gruv --- init.lua | 25 ++++++++++++++++--------- lazy-lock.json | 5 ++++- lua/custom/plugins/init.lua | 2 ++ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/init.lua b/init.lua index 731d644c..2fd01736 100644 --- a/init.lua +++ b/init.lua @@ -203,16 +203,11 @@ require('lazy').setup({ }, { - -- Theme inspired by Atom - 'navarasu/onedark.nvim', + "ellisonleao/gruvbox.nvim", priority = 1000, lazy = false, config = function() - require('onedark').setup { - -- Set a style preset. 'dark' is default. - style = 'dark', -- dark, darker, cool, deep, warm, warmer, light - } - require('onedark').load() + require('gruvbox').load() end, }, @@ -223,8 +218,8 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'auto', - component_separators = '|', + theme = 'gruvbox_dark', + component_separators = '•', section_separators = '', }, }, @@ -313,6 +308,9 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true +--put both relative and normal lune numbers: +vim.wo.relativenumber = true + -- Enable mouse mode vim.o.mouse = 'a' @@ -354,6 +352,15 @@ vim.keymap.set(main_modes, '', '"+y', { noremap = true, silent = true }) -- add vscode like telescope vim.keymap.set({ 'i', 'n', 'v' }, '', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) +-- add ctrl+d to select word and enable multiple cursors +--TODO: fix this +-- vim.keymap.set({ 'i', 'n', 'v' }, '', 'lua require("multi_cursor").multiple_cursors()', +-- { noremap = true, silent = true }) + +--key bidning for ctrl+enter in insert mode: maps to normal modes o +--TODO: fix this +-- vim.keymap.set('i', '>', 'o', { noremap = true, silent = true }) + -- select all: vim.keymap.set({ 'i', 'n' }, '', function() vim.cmd("normal! ggVG") end, { noremap = true, silent = true }) vim.keymap.set('v', '', 'ggVG', { noremap = true, silent = true }) diff --git a/lazy-lock.json b/lazy-lock.json index 153c439c..0cb7b03d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,9 +7,11 @@ ======= >>>>>>> 4effd4b (get copilot working in neovim) "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "copilot.vim": { "branch": "release", "commit": "309b3c803d1862d5e84c7c9c5749ae04010123b8" }, "fidget.nvim": { "branch": "main", "commit": "bd0b8b644d4fb293dc4df2718b1f2df3abd90767" }, "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, "gitsigns.nvim": { "branch": "main", "commit": "0ccd5fb2316b3f8d8b2f775bc31cae7bc6a77a55" }, + "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, @@ -20,12 +22,13 @@ "nvim-lspconfig": { "branch": "master", "commit": "7384e7149e79365c96dc623d9fa3444737776982" }, "nvim-treesitter": { "branch": "master", "commit": "0df364926d39f59471ebc5ca83054d74e457350e" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dbcd9388e3b119a87c785e10a00d62876077d23d" }, - "onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "prettier.nvim": { "branch": "main", "commit": "d98e732cb73690b07c00c839c924be1d1d9ac5c2" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" }, "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index b0602212..946106c5 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -3,6 +3,8 @@ -- -- See the kickstart.nvim README for more information return { + "MunifTanjim/prettier.nvim", + "mg979/vim-visual-multi", "github/copilot.vim", cmd = "Copilot", event = "InsertEnter",