From 17e4e8264f3c454ab8ed8706a3545f2a2fc0d32e Mon Sep 17 00:00:00 2001 From: geremia Date: Sat, 9 Sep 2023 15:38:19 +0200 Subject: [PATCH 1/9] First changes to kickstart --- init.lua | 21 ++++++++++++++------- lua/custom/plugins/init.lua | 4 +++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index ea330eb1..23087a39 100644 --- a/init.lua +++ b/init.lua @@ -86,7 +86,7 @@ require('lazy').setup({ -- Useful status updates for LSP -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, + { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, -- Additional lua configuration, makes nvim stuff amazing! 'folke/neodev.nvim', @@ -110,7 +110,7 @@ require('lazy').setup({ }, -- Useful plugin to show you pending keybinds. - { 'folke/which-key.nvim', opts = {} }, + { 'folke/which-key.nvim', opts = {} }, { -- Adds git related signs to the gutter, as well as utilities for managing changes 'lewis6991/gitsigns.nvim', @@ -128,16 +128,16 @@ require('lazy').setup({ -- don't override the built-in and fugitive keymaps local gs = package.loaded.gitsigns - vim.keymap.set({'n', 'v'}, ']c', function() + vim.keymap.set({ 'n', 'v' }, ']c', function() if vim.wo.diff then return ']c' end vim.schedule(function() gs.next_hunk() end) return '' - end, {expr=true, buffer = bufnr, desc = "Jump to next hunk"}) - vim.keymap.set({'n', 'v'}, '[c', function() + end, { expr = true, buffer = bufnr, desc = "Jump to next hunk" }) + vim.keymap.set({ 'n', 'v' }, '[c', function() if vim.wo.diff then return '[c' end vim.schedule(function() gs.prev_hunk() end) return '' - end, {expr=true, buffer = bufnr, desc = "Jump to previous hunk"}) + end, { expr = true, buffer = bufnr, desc = "Jump to previous hunk" }) end, }, }, @@ -221,7 +221,7 @@ require('lazy').setup({ -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, }, {}) -- [[ Setting options ]] @@ -233,6 +233,7 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true +vim.wo.relativenumber = true -- Enable mouse mode vim.o.mouse = 'a' @@ -254,6 +255,7 @@ vim.o.smartcase = true -- Keep signcolumn on by default vim.wo.signcolumn = 'yes' +vim.o.colorcolumn = '80' -- Decrease update time vim.o.updatetime = 250 @@ -393,6 +395,11 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnos vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) +-- Toggle diagnostics +require('toggle_lsp_diagnostics').init() +vim.keymap.set('n', 'td', ':ToggleDiag', { desc = '[T]oggle [d]iagnostics' }); + +--vim.keymap.set('n', 'td', require('toggle_lsp_diagnostics')) -- [[ Configure LSP ]] -- This function gets run when an LSP connects to a particular buffer. local on_attach = function(_, bufnr) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index be0eb9d8..25d60b2f 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -2,4 +2,6 @@ -- I promise not to create any merge conflicts in this directory :) -- -- See the kickstart.nvim README for more information -return {} +return { + 'WhoIsSethDaniel/toggle-lsp-diagnostics.nvim', +} From 3b8f438b140e11531558a71c331503b1cc59cbf8 Mon Sep 17 00:00:00 2001 From: geremia Date: Mon, 11 Sep 2023 15:05:14 +0200 Subject: [PATCH 2/9] added basic keymaps --- init.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/init.lua b/init.lua index 23087a39..cbaf0400 100644 --- a/init.lua +++ b/init.lua @@ -459,7 +459,7 @@ local servers = { -- pyright = {}, -- rust_analyzer = {}, -- tsserver = {}, - -- html = { filetypes = { 'html', 'twig', 'hbs'} }, + -- html = { filetypes = { 'html', 'blade' } }, lua_ls = { Lua = { @@ -542,5 +542,13 @@ cmp.setup { }, } --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et +-- MY KEYMAPS -- + +-- exit insert mode with lk +vim.keymap.set("i", "lk", "") + +-- open Netrw +vim.keymap.set("n", "x", vim.cmd.Ex) + +-- open fugitive in vertical split +vim.keymap.set('n', 'gs', ':vertical G') From e9588d6ef122c637e8d3cc09687ff6c83f60aa43 Mon Sep 17 00:00:00 2001 From: geremia Date: Fri, 15 Sep 2023 14:02:55 +0200 Subject: [PATCH 3/9] look and small plugins --- init.lua | 53 ++++++++++++++++++++++++++++++++++++- lua/custom/plugins/init.lua | 5 ++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index cbaf0400..bd5c049b 100644 --- a/init.lua +++ b/init.lua @@ -147,9 +147,48 @@ require('lazy').setup({ 'navarasu/onedark.nvim', priority = 1000, config = function() + require('onedark').setup { + transparent = true, + } vim.cmd.colorscheme 'onedark' end, }, + { + 'rebelot/kanagawa.nvim', + priority = 1000, + config = function() + -- wave / dragon / lotus + -- require("kanagawa").load("wave") + end, + }, + { + 'n1ghtmare/noirblaze-vim', + priority = 1000, + config = function() + -- vim.cmd.colorscheme 'noirblaze' + end, + }, + { + 'olivercederborg/poimandres.nvim', + lazy = false, + priority = 1000, + config = function() + require('poimandres').setup { } + end, + + -- optionally set the colorscheme within lazy config + init = function() + -- vim.cmd("colorscheme poimandres") + end + }, + { + 'ellisonleao/gruvbox.nvim', + priority = 1000, + config = function() + -- vim.o.background = "dark" -- or "light" for light mode + -- vim.cmd([[colorscheme gruvbox]]) + end, + }, { -- Set lualine as statusline @@ -459,7 +498,7 @@ local servers = { -- pyright = {}, -- rust_analyzer = {}, -- tsserver = {}, - -- html = { filetypes = { 'html', 'blade' } }, + -- intelephense = { filetypes = { 'blade' } }, lua_ls = { Lua = { @@ -552,3 +591,15 @@ vim.keymap.set("n", "x", vim.cmd.Ex) -- open fugitive in vertical split vim.keymap.set('n', 'gs', ':vertical G') + +-- transparent bg +require("transparent").setup({ -- Optional, you don't have to run setup. + groups = { -- table: default groups + 'Normal', 'NormalNC', 'Comment', 'Constant', 'Special', 'Identifier', + 'Statement', 'PreProc', 'Type', 'Underlined', 'Todo', 'String', 'Function', + 'Conditional', 'Repeat', 'Operator', 'Structure', 'LineNr', 'NonText', + 'SignColumn', 'CursorLineNr', 'EndOfBuffer', + }, + extra_groups = {}, -- table: additional groups that should be cleared + exclude_groups = {}, -- table: groups you don't want to clear +}) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 25d60b2f..cfd5bfdc 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -3,5 +3,10 @@ -- -- See the kickstart.nvim README for more information return { + -- toggle diagnostics visibility 'WhoIsSethDaniel/toggle-lsp-diagnostics.nvim', + -- blade support + 'jwalton512/vim-blade', + -- transparent bg + 'xiyaowong/transparent.nvim', } From 0fd87138056eaecfc5e284ca58aea82d236279aa Mon Sep 17 00:00:00 2001 From: geremia Date: Tue, 10 Oct 2023 00:00:13 +0200 Subject: [PATCH 4/9] colorschemes + tried transparent + harpoon --- init.lua | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index bd5c049b..d669b1c9 100644 --- a/init.lua +++ b/init.lua @@ -147,10 +147,11 @@ require('lazy').setup({ 'navarasu/onedark.nvim', priority = 1000, config = function() - require('onedark').setup { - transparent = true, - } - vim.cmd.colorscheme 'onedark' + --require('onedark').setup { + -- style = 'deep', + -- transparent = true, + --} + --vim.cmd.colorscheme 'onedark' end, }, { @@ -173,7 +174,7 @@ require('lazy').setup({ lazy = false, priority = 1000, config = function() - require('poimandres').setup { } + -- require('poimandres').setup { } end, -- optionally set the colorscheme within lazy config @@ -185,11 +186,24 @@ require('lazy').setup({ 'ellisonleao/gruvbox.nvim', priority = 1000, config = function() - -- vim.o.background = "dark" -- or "light" for light mode - -- vim.cmd([[colorscheme gruvbox]]) + vim.o.background = "dark" -- or "light" for light mode + vim.cmd([[colorscheme gruvbox]]) end, }, + { + 'nyoom-engineering/oxocarbon.nvim', + priority = 1000, + config = function() + --[[ + vim.opt.background = "dark" -- set this to dark or light + vim.cmd.colorscheme "oxocarbon" + -- transparent + vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) + vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) + --]] + end, + }, { -- Set lualine as statusline 'nvim-lualine/lualine.nvim', @@ -197,7 +211,7 @@ require('lazy').setup({ opts = { options = { icons_enabled = false, - theme = 'onedark', + -- theme = 'onedark', component_separators = '|', section_separators = '', }, @@ -261,6 +275,9 @@ require('lazy').setup({ -- -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins { import = 'custom.plugins' }, + + -- jump between files + 'ThePrimeagen/harpoon', }, {}) -- [[ Setting options ]] @@ -593,6 +610,7 @@ vim.keymap.set("n", "x", vim.cmd.Ex) vim.keymap.set('n', 'gs', ':vertical G') -- transparent bg +--[[ require("transparent").setup({ -- Optional, you don't have to run setup. groups = { -- table: default groups 'Normal', 'NormalNC', 'Comment', 'Constant', 'Special', 'Identifier', @@ -603,3 +621,4 @@ require("transparent").setup({ -- Optional, you don't have to run setup. extra_groups = {}, -- table: additional groups that should be cleared exclude_groups = {}, -- table: groups you don't want to clear }) +--]] From f5a36a7b74079e2b21aa13c6b642a7cecfcd5371 Mon Sep 17 00:00:00 2001 From: geremia Date: Thu, 12 Oct 2023 16:32:37 +0200 Subject: [PATCH 5/9] updated keymaps + added harpoon keymaps + scrolloff --- init.lua | 79 ++++++++++++++++++++++---------------------------------- 1 file changed, 31 insertions(+), 48 deletions(-) diff --git a/init.lua b/init.lua index d669b1c9..8249eeca 100644 --- a/init.lua +++ b/init.lua @@ -1,42 +1,3 @@ ---[[ - -===================================================================== -==================== READ THIS BEFORE CONTINUING ==================== -===================================================================== - -Kickstart.nvim is *not* a distribution. - -Kickstart.nvim is a template for your own configuration. - The goal is that you can read every line of code, top-to-bottom, understand - what your configuration is doing, and modify it to suit your needs. - - Once you've done that, you should start exploring, configuring and tinkering to - explore Neovim! - - If you don't know anything about Lua, I recommend taking some time to read through - a guide. One possible example: - - https://learnxinyminutes.com/docs/lua/ - - - And then you can explore or search through `:help lua-guide` - - https://neovim.io/doc/user/lua-guide.html - - -Kickstart Guide: - -I have left several `:help X` comments throughout the init.lua -You should run that command and read that help section for more information. - -In addition, I have some `NOTE:` items throughout the file. -These are for you, the reader to help understand what is happening. Feel free to delete -them once you know what you're doing, but they should serve as a guide for when you -are first encountering a few different constructs in your nvim config. - -I hope you enjoy your Neovim journey, -- TJ - -P.S. You can delete this when you're done too. It's your config now :) ---]] -- Set as the leader key -- See `:help mapleader` -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) @@ -373,11 +334,13 @@ end, { desc = '[/] Fuzzily search in current buffer' }) vim.keymap.set('n', 'gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) -vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = '[S]earch [R]resume' }) +-- vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) +vim.keymap.set('n', 'sh', require("harpoon.ui").toggle_quick_menu, { desc = '[S]earch [H]arpoon' }) + -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` @@ -448,12 +411,12 @@ require('nvim-treesitter.configs').setup { -- Diagnostic keymaps vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) -vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) +vim.keymap.set('n', 'dm', vim.diagnostic.open_float, { desc = 'Open floating [d]iagnostic [m]essage' }) +vim.keymap.set('n', 'dl', vim.diagnostic.setloclist, { desc = 'Open [d]iagnostics [l]ist' }) -- Toggle diagnostics require('toggle_lsp_diagnostics').init() -vim.keymap.set('n', 'td', ':ToggleDiag', { desc = '[T]oggle [d]iagnostics' }); +vim.keymap.set('n', 'dt', ':ToggleDiag', { desc = '[d]iagnostics [T]oggle' }); --vim.keymap.set('n', 'td', require('toggle_lsp_diagnostics')) -- [[ Configure LSP ]] @@ -473,15 +436,15 @@ local on_attach = function(_, bufnr) vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc }) end - nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') + -- nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame') nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction') nmap('gd', vim.lsp.buf.definition, '[G]oto [D]efinition') nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') - nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') + -- nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition') + -- nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') + -- nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') -- See `:help K` for why this keymap nmap('K', vim.lsp.buf.hover, 'Hover Documentation') @@ -489,11 +452,13 @@ local on_attach = function(_, bufnr) -- Lesser used LSP functionality nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') + --[[ nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') nmap('wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, '[W]orkspace [L]ist Folders') + --]] -- Create a command `:Format` local to the LSP buffer vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_) @@ -525,6 +490,21 @@ local servers = { }, } +-- harpoon +vim.keymap.set('n', 'm', require("harpoon.mark").add_file, { desc = '[M]ark' }); +vim.keymap.set('n', 'q', function() + require("harpoon.ui").nav_file(1) +end, { desc = '[q] Harpoon -> file number 1' }) +vim.keymap.set('n', 'w', function() + require("harpoon.ui").nav_file(2) +end, { desc = '[q] Harpoon -> file number 2' }) +vim.keymap.set('n', 'e', function() + require("harpoon.ui").nav_file(3) +end, { desc = '[q] Harpoon -> file number 3' }) +vim.keymap.set('n', 'r', function() + require("harpoon.ui").nav_file(4) +end, { desc = '[q] Harpoon -> file number 4' }) + -- Setup neovim lua configuration require('neodev').setup() @@ -599,7 +579,6 @@ cmp.setup { } -- MY KEYMAPS -- - -- exit insert mode with lk vim.keymap.set("i", "lk", "") @@ -609,6 +588,10 @@ vim.keymap.set("n", "x", vim.cmd.Ex) -- open fugitive in vertical split vim.keymap.set('n', 'gs', ':vertical G') +-- MY SETTINGS -- +vim.opt.scrolloff = 10 + + -- transparent bg --[[ require("transparent").setup({ -- Optional, you don't have to run setup. From ab03325dccb77e70d9d334d6a573cb9d845ded6f Mon Sep 17 00:00:00 2001 From: geremia Date: Tue, 7 Nov 2023 15:28:21 +0100 Subject: [PATCH 6/9] indent blank line - from v2 to v3 --- init.lua | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 8249eeca..37790791 100644 --- a/init.lua +++ b/init.lua @@ -85,7 +85,7 @@ require('lazy').setup({ changedelete = { text = '~' }, }, on_attach = function(bufnr) - vim.keymap.set('n', 'hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' }) + vim.keymap.set('n', 'cp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[c]hange [p]review' }) -- don't override the built-in and fugitive keymaps local gs = package.loaded.gitsigns @@ -179,8 +179,9 @@ require('lazy').setup({ }, }, + -- Add indentation guides even on blank lines + --[[ V2 { - -- Add indentation guides even on blank lines 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` @@ -189,6 +190,13 @@ require('lazy').setup({ show_trailing_blankline_indent = false, }, }, + --]] + -- V3 + { + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = {} + }, -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, @@ -237,8 +245,8 @@ require('lazy').setup({ -- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins { import = 'custom.plugins' }, - -- jump between files - 'ThePrimeagen/harpoon', + -- jump between files + -- 'ThePrimeagen/harpoon' -- not working with new nvim version, }, {}) -- [[ Setting options ]] @@ -339,7 +347,7 @@ vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = '[S]earch [R]resume' }) -- vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'sh', require("harpoon.ui").toggle_quick_menu, { desc = '[S]earch [H]arpoon' }) +-- vim.keymap.set('n', 'sh', require("harpoon.ui").toggle_quick_menu, { desc = '[S]earch [H]arpoon' }) -- [[ Configure Treesitter ]] @@ -491,6 +499,7 @@ local servers = { } -- harpoon +--[[ vim.keymap.set('n', 'm', require("harpoon.mark").add_file, { desc = '[M]ark' }); vim.keymap.set('n', 'q', function() require("harpoon.ui").nav_file(1) @@ -504,6 +513,7 @@ end, { desc = '[q] Harpoon -> file number 3' }) vim.keymap.set('n', 'r', function() require("harpoon.ui").nav_file(4) end, { desc = '[q] Harpoon -> file number 4' }) +--]] -- Setup neovim lua configuration require('neodev').setup() From aeab929ca40fc7e318cacb0832b996835ba31793 Mon Sep 17 00:00:00 2001 From: geremia Date: Thu, 23 Nov 2023 11:48:36 +0100 Subject: [PATCH 7/9] tried new plugin - not useful for now --- init.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/init.lua b/init.lua index 37790791..3a9c8340 100644 --- a/init.lua +++ b/init.lua @@ -192,6 +192,7 @@ require('lazy').setup({ }, --]] -- V3 + { "lukas-reineke/indent-blankline.nvim", main = "ibl", @@ -222,6 +223,14 @@ require('lazy').setup({ }, }, + --[[ + -- Github copilot with down sindrome, but free + { + 'Exafunction/codeium.vim', + event = 'BufEnter' + }, + --]] + { -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', From 9058b106c5ffd5bab0e623114f8b03d7f6e5e7e7 Mon Sep 17 00:00:00 2001 From: geremia Date: Thu, 23 Nov 2023 12:09:57 +0100 Subject: [PATCH 8/9] fix indent blankline v3 config --- init.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 3a9c8340..db0c9053 100644 --- a/init.lua +++ b/init.lua @@ -196,7 +196,11 @@ require('lazy').setup({ { "lukas-reineke/indent-blankline.nvim", main = "ibl", - opts = {} + opts = { + indent = { + char = "┊" + }, + } }, -- "gc" to comment visual regions/lines From 65fc530c1c2d49633ba26ffe6c5962c43cc441b1 Mon Sep 17 00:00:00 2001 From: geremia Date: Thu, 1 Feb 2024 18:54:21 +0100 Subject: [PATCH 9/9] last commit before sync fork --- init.lua | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index db0c9053..59eb2853 100644 --- a/init.lua +++ b/init.lua @@ -147,8 +147,8 @@ require('lazy').setup({ 'ellisonleao/gruvbox.nvim', priority = 1000, config = function() - vim.o.background = "dark" -- or "light" for light mode - vim.cmd([[colorscheme gruvbox]]) + -- vim.o.background = "dark" -- or "light" for light mode + -- vim.cmd([[colorscheme gruvbox]]) end, }, { @@ -178,6 +178,18 @@ require('lazy').setup({ }, }, }, + { + 'projekt0n/github-nvim-theme', + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + require('github-theme').setup({ + -- ... + }) + + vim.cmd('colorscheme github_dark_dimmed') + end, + }, -- Add indentation guides even on blank lines --[[ V2 @@ -193,6 +205,7 @@ require('lazy').setup({ --]] -- V3 + --[[ { "lukas-reineke/indent-blankline.nvim", main = "ibl", @@ -202,7 +215,7 @@ require('lazy').setup({ }, } }, - + --]] -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, @@ -367,7 +380,22 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { + 'c', + 'cpp', + 'go', + 'lua', + 'python', + 'rust', + 'tsx', + 'javascript', + 'typescript', + 'vimdoc', + 'vim', + 'markdown', + 'markdown_inline', + }, + -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false,