From 9de7bf70c3965231393859d6837aa92d3b1708f6 Mon Sep 17 00:00:00 2001 From: Cheick Diarra Date: Wed, 8 May 2024 17:05:01 +0200 Subject: [PATCH 1/4] remove bg for line numbers --- lua/plugins/color-scheme.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/plugins/color-scheme.lua b/lua/plugins/color-scheme.lua index f1de14a..45ff8f8 100644 --- a/lua/plugins/color-scheme.lua +++ b/lua/plugins/color-scheme.lua @@ -40,6 +40,7 @@ return { highlights.NormalFloat = { bg = "#f8f9fa" } highlights.CursorLine = { bg = "#effaff" } highlights.Directory = { fg = "#000000" } + highlights.LineNr = { fg = colors.fg_dim, bg = "#ffffff" } end, }) From ddf018fd531507a75f5e37d66e1e456f72e1d031 Mon Sep 17 00:00:00 2001 From: Cheick Diarra Date: Wed, 8 May 2024 17:05:18 +0200 Subject: [PATCH 2/4] revert icon changes in neotree --- lua/plugins/neo-tree.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/plugins/neo-tree.lua b/lua/plugins/neo-tree.lua index 5c84426..4f26ace 100644 --- a/lua/plugins/neo-tree.lua +++ b/lua/plugins/neo-tree.lua @@ -5,8 +5,8 @@ return { default_component_configs = { indent = { with_expanders = true, -- if nil and file nesting is enabled, will enable expanders - expander_collapsed = " ", - expander_expanded = "", + expander_collapsed = "", + expander_expanded = "", expander_highlight = "NeoTreeExpander", }, icon = { From 8e403e22a13a66fb5726fc71b14341a5fd0999ad Mon Sep 17 00:00:00 2001 From: Cheick Diarra Date: Wed, 8 May 2024 23:26:52 +0200 Subject: [PATCH 3/4] add custom visual color #cbf0d3 --- lua/plugins/color-scheme.lua | 10 +++++----- lua/plugins/lua-line.lua | 37 +++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/lua/plugins/color-scheme.lua b/lua/plugins/color-scheme.lua index 45ff8f8..509b0be 100644 --- a/lua/plugins/color-scheme.lua +++ b/lua/plugins/color-scheme.lua @@ -9,8 +9,8 @@ return { -- `auto` will automatically set style based on background set with vim.o.background style = "auto", variant = "default", -- Theme comes in four variants `default`, `tinted`, `deuteranopia`, and `tritanopia` - transparent = true, -- Transparent background (as supported by the terminal) - dim_inactive = false, -- "non-current" windows are dimmed + transparent = false, -- Transparent background (as supported by the terminal) + dim_inactive = true, -- "non-current" windows are dimmed styles = { -- Style to be applied to different syntax groups -- Value is any valid attr-list value for `:help nvim_set_hl` @@ -25,7 +25,7 @@ return { ---@param colors ColorScheme on_colors = function(colors) colors.bg_active = "#ffffff" -- changed from #e0e0e0, we also like #f8f9fa - colors.visual = "#72f64a" + colors.visual = "#cbf0d3" end, --- You can override specific highlights to use other groups or a hex color @@ -37,10 +37,10 @@ return { highlights.PmenuSel = { bg = colors.bg_hl_line } highlights.PmenuExtra = { bg = colors.bg_alt } highlights.FloatBorder = { bg = colors.bg_alt } - highlights.NormalFloat = { bg = "#f8f9fa" } + -- highlights.NormalFloat = { bg = "#f8f9fa" } -- Change the floating windows background to light grey highlights.CursorLine = { bg = "#effaff" } highlights.Directory = { fg = "#000000" } - highlights.LineNr = { fg = colors.fg_dim, bg = "#ffffff" } + -- highlights.LineNr = { fg = colors.fg_dim, bg = "#ffffff" } end, }) diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua index d5575c2..250f54e 100644 --- a/lua/plugins/lua-line.lua +++ b/lua/plugins/lua-line.lua @@ -1,3 +1,38 @@ +local colors = { + black = "#000000", + maroon = "#800000", + green = "#008000", + hlGreen = "#cbf0d3", + olive = "#808000", + navy = "#000080", + purple = "#800080", + teal = "#008080", + silver = "#c0c0c0", + gray = "#808080", + red = "#ff0000", + lime = "#00ff00", + yellow = "#ffff00", + blue = "#0000ff", + fuchsia = "#ff00ff", + aqua = "#00ffff", + white = "#ffffff", +} + +local custom16Colors = { + normal = { + a = { fg = colors.white, bg = colors.blue, gui = "bold" }, + b = { fg = colors.white, bg = colors.gray }, + c = { fg = colors.silver, bg = colors.black }, + }, + insert = { a = { fg = colors.white, bg = colors.green, gui = "bold" } }, + visual = { a = { fg = colors.black, bg = colors.hlGreen, gui = "bold" } }, + replace = { a = { fg = colors.white, bg = colors.red, gui = "bold" } }, + inactive = { + a = { fg = colors.silver, bg = colors.gray, gui = "bold" }, + b = { fg = colors.gray, bg = colors.black }, + c = { fg = colors.silver, bg = colors.black }, + }, +} return { "nvim-lualine/lualine.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, @@ -8,7 +43,7 @@ return { require("lualine").setup({ options = { icons_enabled = true, - theme = "16color", + theme = custom16Colors, component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, disabled_filetypes = { From 00a6823f00ad48edddc8f2e3c664069a9eeffc62 Mon Sep 17 00:00:00 2001 From: Cheick Diarra Date: Fri, 7 Jun 2024 17:01:26 +0200 Subject: [PATCH 4/4] add neogit --- lazy-lock.json | 3 +++ lua/plugins/neogit.lua | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 lua/plugins/neogit.lua diff --git a/lazy-lock.json b/lazy-lock.json index 0faa41f..45d3921 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,9 +10,11 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conform.nvim": { "branch": "master", "commit": "6dc1603ea408f476a57937bbeaf7f86520a21a98" }, + "diffview.nvim": { "branch": "main", "commit": "9bdd5537575c2ea7925b71ae06585b934beea13d" }, "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, "flit.nvim": { "branch": "main", "commit": "56490317983218b09698f8c960c3669958b12b32" }, "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" }, + "fzf-lua": { "branch": "main", "commit": "677055fc5793ad6d52dac89957c8b015fc74de55" }, "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, @@ -30,6 +32,7 @@ "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, "neoconf.nvim": { "branch": "main", "commit": "d4a48c2a6fdeec138605cee4eb6f8c6fafd0b3ed" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, + "neogit": { "branch": "master", "commit": "b93316d15c590377f50ca61e70e9129e4aa9b848" }, "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" }, "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, diff --git a/lua/plugins/neogit.lua b/lua/plugins/neogit.lua new file mode 100644 index 0000000..ed0fa1e --- /dev/null +++ b/lua/plugins/neogit.lua @@ -0,0 +1,12 @@ +return { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", -- required + "sindrets/diffview.nvim", -- optional - Diff integration + + -- Only one of these is needed, not both. + "nvim-telescope/telescope.nvim", -- optional + "ibhagwan/fzf-lua", -- optional + }, + config = true, +}