diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config/nvim/README.md | 19 | ||||
| -rw-r--r-- | config/nvim/init.lua | 2 | ||||
| -rw-r--r-- | config/nvim/lazy-lock.json | 6 | ||||
| -rw-r--r-- | config/nvim/lua/core/keymaps.lua | 5 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/colors.lua | 35 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/harpoon.lua | 19 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/init.lua | 3 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/nvim-terminal.lua | 11 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/telescope-undo.lua | 29 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/telescope.lua | 33 | ||||
| -rw-r--r-- | config/nvim/lua/plugins/toggleterm.lua | 27 |
12 files changed, 154 insertions, 37 deletions
@@ -1,4 +1,4 @@ -/home/black/Dev/dotfiles/config/nvim/lazy-lock.json +config/nvim/lazy-lock.json # Compiled bytes diff --git a/config/nvim/README.md b/config/nvim/README.md new file mode 100644 index 0000000..64531f5 --- /dev/null +++ b/config/nvim/README.md @@ -0,0 +1,19 @@ +# Lua based Neovim Configuration + +## Directory Structure +In ```~/.config/nvim``` +``` +|-- lua +| |-- core +| |-- lsp +| |-- plugins +| | |-- plug 1 +|-- init.lua +``` + + +## Plugins +## Mappings +## UI +### Theme +### Vimline diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 3b8c4c3..2d6bb1e 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -20,3 +20,5 @@ require("core.keymaps") require("core.statusline").setup() require("core.autocmds") require("lazy").setup("plugins") + +vim.api.nvim_set_keymap('n', '<Esc>[59;5u', '<C-;>', { noremap = true, silent = true }) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index e99597b..d88d8b9 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,7 +1,6 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "base16-black-metal-scheme": { "branch": "master", "commit": "c7a32bec8105a1ceddb9fcc90b713dabde5e7e5e" }, "c-syntax.vim": { "branch": "master", "commit": "e0f36366b8ad6ba9eca32c9e50eb4d47f0eac197" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, @@ -11,6 +10,8 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "gitsigns.nvim": { "branch": "main", "commit": "68114837e81ca16d06514c3a997c9102d1b25c15" }, + "gruber-darker.nvim": { "branch": "main", "commit": "a2dda61d9c1225e16951a51d6b89795b0ac35cd6" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, @@ -19,10 +20,13 @@ "nvim-autopairs": { "branch": "master", "commit": "d2f791ceeb26d04d87aa54343bc94e8ad8d7be1c" }, "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, + "nvim-terminal": { "branch": "main", "commit": "e058de4b8029d7605b17275f30f83be8f8df5f62" }, "nvim-treesitter": { "branch": "master", "commit": "306dd6e9dc806db1d79568d26e1c9b6c98b95fbc" }, + "papercolor-theme": { "branch": "master", "commit": "0cfe64ffb24c21a6101b5f994ca342a74c977aef" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" } } diff --git a/config/nvim/lua/core/keymaps.lua b/config/nvim/lua/core/keymaps.lua index 3d6cc2a..40db6c2 100644 --- a/config/nvim/lua/core/keymaps.lua +++ b/config/nvim/lua/core/keymaps.lua @@ -30,9 +30,12 @@ keymap.set("n", "E", ":e ") -- Get rid of this shit vim.api.nvim_set_keymap('n', 'q:', '<Nop>', { noremap = true, silent = true }) +vim.api.nvim_command('cabbrev E e') +vim.api.nvim_command('cabbrev Q q') +vim.api.nvim_command('cabbrev W w') -- Clear search highlight -vim.api.nvim_set_keymap('n', '<Leader>cs', ':nohlsearch<CR><C-l>', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', '<Leader>C', ':nohlsearch<CR><C-l>', { noremap = true, silent = true }) --[[-- Tabs --]] diff --git a/config/nvim/lua/plugins/colors.lua b/config/nvim/lua/plugins/colors.lua index b27f10e..962b5d6 100644 --- a/config/nvim/lua/plugins/colors.lua +++ b/config/nvim/lua/plugins/colors.lua @@ -1,6 +1,38 @@ return { - --[[-- PaperColor --]] + --[[-- gruber-darker --]] + --[[ { + lazy = false, + priority = 1000, + "blazkowolf/gruber-darker.nvim", + opts = { + bold = false, + italic = { + strings = false, + }, + }, + config = function() + vim.opt.background = "dark" + vim.cmd.colorscheme "gruber-darker" + vim.api.nvim_set_hl(0, "Normal", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "NormalNC", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "SignColumn", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "LineNr", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "Folded", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "NonText", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "SpecialKey", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "VertSplit", { bg = "NONE", ctermbg = "NONE" }) + vim.api.nvim_set_hl(0, "Comment", { fg = "#ADD8E6", italic = true }) + vim.api.nvim_set_hl(0, "TabChar", { fg = "#1A1A1A", ctermfg = "darkgray"}) + vim.api.nvim_set_hl(0, "String", { fg = "#b58c4a" }) + vim.api.nvim_set_hl(0, "cType", { fg = "NONE" }) + + end, + }, ]] + + + --[[-- PaperColor --]] { "NLKNguyen/papercolor-theme", lazy = false, @@ -31,6 +63,7 @@ return { end, }, + --[[-- Ice Cave --]] --[[ { diff --git a/config/nvim/lua/plugins/harpoon.lua b/config/nvim/lua/plugins/harpoon.lua new file mode 100644 index 0000000..f13d18e --- /dev/null +++ b/config/nvim/lua/plugins/harpoon.lua @@ -0,0 +1,19 @@ +return { + { + "ThePrimeagen/harpoon", + lazy = false, + dependencies = { 'nvim-lua/plenary.nvim' }, + + config = function() + local mark = require("harpoon.mark") + local ui = require("harpoon.ui") + + vim.keymap.set("n", "<leader>a", mark.add_file) + vim.keymap.set("n", "<leader>l", ui.toggle_quick_menu) + vim.keymap.set("n", "<C-j>", function() ui.nav_file(1) end) + vim.keymap.set("n", "<C-k>", function() ui.nav_file(2) end) + vim.keymap.set("n", "<C-l>", function() ui.nav_file(3) end) + vim.keymap.set("n", "<C-;>", function() ui.nav_file(4) end) + end + }, +} diff --git a/config/nvim/lua/plugins/init.lua b/config/nvim/lua/plugins/init.lua index ffd4623..1903806 100644 --- a/config/nvim/lua/plugins/init.lua +++ b/config/nvim/lua/plugins/init.lua @@ -8,4 +8,7 @@ return { require("plugins.gitsigns"), require("plugins.comment"), require("plugins.markdown-preview"), + --require("plugins.toggleterm"), + --require("plugins.nvim-terminal"), + require("plugins.harpoon"), } diff --git a/config/nvim/lua/plugins/nvim-terminal.lua b/config/nvim/lua/plugins/nvim-terminal.lua new file mode 100644 index 0000000..50e6918 --- /dev/null +++ b/config/nvim/lua/plugins/nvim-terminal.lua @@ -0,0 +1,11 @@ +return { + { + 's1n7ax/nvim-terminal', + lazy = false, + config = function() + vim.o.hidden = true + require("toggleterm").setup{} + --vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<CR>", { desc = "Toggle terminal" }) + end, + } +} diff --git a/config/nvim/lua/plugins/telescope-undo.lua b/config/nvim/lua/plugins/telescope-undo.lua new file mode 100644 index 0000000..8156bcd --- /dev/null +++ b/config/nvim/lua/plugins/telescope-undo.lua @@ -0,0 +1,29 @@ +return { + { + "debugloop/telescope-undo.nvim", + dependencies = { + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + }, + keys = { + { -- lazy style key map + "<leader>u", + "<cmd>Telescope undo<cr>", + desc = "undo history", + }, + }, + opts = { + extensions = { + undo = { + }, + }, + }, + config = function(_, opts) + require("telescope").setup(opts) + require("telescope").load_extension("undo") + end, + }, + +} diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua index 2151a33..b55b46c 100644 --- a/config/nvim/lua/plugins/telescope.lua +++ b/config/nvim/lua/plugins/telescope.lua @@ -17,37 +17,4 @@ return { end, { silent = true}) end }, - - { - "debugloop/telescope-undo.nvim", - dependencies = { -- note how they're inverted to above example - { - "nvim-telescope/telescope.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - }, - }, - keys = { - { -- lazy style key map - "<leader>u", - "<cmd>Telescope undo<cr>", - desc = "undo history", - }, - }, - opts = { - -- don't use `defaults = { }` here, do this in the main telescope spec - extensions = { - undo = { - -- telescope-undo.nvim config, see below - }, - -- no other extensions here, they can have their own spec too - }, - }, - config = function(_, opts) - -- Calling telescope's setup from multiple specs does not hurt, it will happily merge the - -- configs for us. We won't use data, as everything is in it's own namespace (telescope - -- defaults, as well as each extension). - require("telescope").setup(opts) - require("telescope").load_extension("undo") - end, - }, } diff --git a/config/nvim/lua/plugins/toggleterm.lua b/config/nvim/lua/plugins/toggleterm.lua new file mode 100644 index 0000000..3b4b2bf --- /dev/null +++ b/config/nvim/lua/plugins/toggleterm.lua @@ -0,0 +1,27 @@ +-- return { +-- { +-- 'akinsho/toggleterm.nvim', +-- version = "*", +-- lazy = false, +-- config = function() +-- require("toggleterm").setup{} +-- +-- vim.keymap.set("n", "<leader>t", function() +-- require("toggleterm").toggle() +-- end, { desc = "Toggle terminal" }) +-- end, +-- } +-- } + +return { + { + 'akinsho/toggleterm.nvim', + version = "*", + lazy = false, + config = function() + require("toggleterm").setup{} + + vim.keymap.set("n", "<leader>t", "<cmd>ToggleTerm<CR>", { desc = "Toggle terminal" }) + end, + } +} |