diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 90faae3..0e6e354 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -23,21 +23,17 @@ Languages = { -- Used to configure highlighting 'markdown', } -- Languages to support Plugins = { -- Plugins to use - { 'nvim-telescope/telescope.nvim', dependencies = { - 'nvim-lua/plenary.nvim', - } }, -- Fuzzy-finding + { 'nvim-telescope/telescope.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + }, + }, -- Fuzzy-finding { 'nvim-treesitter/nvim-treesitter' }, -- Better syntax highlighting { 'nvim-lualine/lualine.nvim' }, -- Status line { 'm4xshen/autoclose.nvim' }, -- Autoclose brackets { 'romgrk/doom-one.vim' }, -- Doom-One theme { 'stevearc/conform.nvim' }, -- Formatting - { 'NeogitOrg/neogit', - dependencies = { - 'nvim-lua/plenary.nvim', - 'sindrets/diffview.nvim', - 'nvim-telescope/telescope.nvim', - }, - }, -- Git integration + { 'tpope/vim-fugitive' }, -- Git integration { 'romgrk/barbar.nvim', dependencies = { 'lewis6991/gitsigns.nvim', @@ -50,14 +46,22 @@ Plugins = { -- Plugins to use { 'williamboman/mason.nvim', dependencies = { 'williamboman/mason-lspconfig.nvim', - } }, -- Server auto-install - { 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x', dependencies = { - 'neovim/nvim-lspconfig', - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/nvim-cmp', - 'L3MON4D3/LuaSnip', - } }, -- LSP + }, + }, -- Server auto-install + { 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x', + dependencies = { + 'neovim/nvim-lspconfig', + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/nvim-cmp', + 'L3MON4D3/LuaSnip', + }, + }, -- LSP { 'nvim-tree/nvim-tree.lua' }, -- File manager + { 'lukas-reineke/indent-blankline.nvim', + dependencies = { + 'nvim-treesitter/nvim-treesitter', + }, + }, -- Indentation blankline } require('bootstrap') -- Set up Lazy and plugins. @@ -189,8 +193,8 @@ autocmd('VimLeave', { -- Save session on exit require('conform_config') require('autoclose_config') require('lsp_config') -require('neogit_config') require('lualine_config') +require('ibl_config') require('tree_config') require('ts_config') require('theme_config') diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 18034f6..0a0b48e 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -4,20 +4,20 @@ "barbar.nvim": { "branch": "master", "commit": "4ba9ac54f0c5d82131905160afff94172e3325e6" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "conform.nvim": { "branch": "master", "commit": "cbc5745bf7519acaf3a5cbaaa677fd556aa813d7" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "doom-one.vim": { "branch": "master", "commit": "323b7c31c617b153d12095e9fd9648f2fda2b646" }, "gitsigns.nvim": { "branch": "main", "commit": "4aaacbf5e5e2218fd05eb75703fe9e0f85335803" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "dec1c21204e2d9d49dad989b577c88958ed2c113" }, "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, - "neogit": { "branch": "master", "commit": "38dd297a905ec6869f4c20ea9184a3e514316e3b" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lspconfig": { "branch": "master", "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928" }, "nvim-tree.lua": { "branch": "master", "commit": "f24afa2cef551122b8bd53bb2e4a7df42343ce2e" }, "nvim-treesitter": { "branch": "master", "commit": "090880c0f1fec219f7de838cb51b8dc07ce74a6d" }, "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" } + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "vim-fugitive": { "branch": "master", "commit": "ec8f7eed103c6d5b75eac69196bb87db0825629a" } } \ No newline at end of file diff --git a/.config/nvim/lua/ibl_config.lua b/.config/nvim/lua/ibl_config.lua new file mode 100644 index 0000000..8a50642 --- /dev/null +++ b/.config/nvim/lua/ibl_config.lua @@ -0,0 +1,17 @@ +--[[ + speedie's neovim configuration + -- https://git.speedie.site/speedie/speedie-nvim -- +]]-- + +local highlight = { + "CursorColumn", + "Whitespace", +} +require("ibl").setup { + indent = { highlight = highlight, char = "▏" }, + whitespace = { + highlight = highlight, + remove_blankline_trail = false, + }, + scope = { enabled = false }, +} diff --git a/.config/nvim/lua/lualine_config.lua b/.config/nvim/lua/lualine_config.lua index 2bc1d28..6ec6815 100644 --- a/.config/nvim/lua/lualine_config.lua +++ b/.config/nvim/lua/lualine_config.lua @@ -93,7 +93,7 @@ ins_left { ins_left { -- mode component function() - return '' + return '' end, color = function() -- auto change color according to neovims mode diff --git a/.config/nvim/lua/neogit_config.lua b/.config/nvim/lua/neogit_config.lua deleted file mode 100644 index 0c18142..0000000 --- a/.config/nvim/lua/neogit_config.lua +++ /dev/null @@ -1,9 +0,0 @@ ---[[ - speedie's neovim configuration - -- https://git.speedie.site/speedie/speedie-nvim -- -]]-- - --- Requires vim 0.9 or later -if vim.fn.has('nvim-0.9') == 1 or vim.fn.has('nvim-1') == 1 then - require('neogit').setup({}) -end