Compare commits

...

2 Commits

4 changed files with 232 additions and 10 deletions

View File

@ -4,6 +4,7 @@
"arrow.nvim": { "branch": "master", "commit": "0b0191d967d9fd837a850f2ccaa95d5917239404" }, "arrow.nvim": { "branch": "master", "commit": "0b0191d967d9fd837a850f2ccaa95d5917239404" },
"blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" }, "blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" },
"bookmarks.nvim": { "branch": "main", "commit": "42371a76cdd786452b537490926b1b6a041672e5" }, "bookmarks.nvim": { "branch": "main", "commit": "42371a76cdd786452b537490926b1b6a041672e5" },
"ccc.nvim": { "branch": "main", "commit": "22924b7bde685e1816140f17a897950ef82b969a" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
@ -27,7 +28,6 @@
"neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
"neogit": { "branch": "master", "commit": "71eb98630b5cb2277636fdccc74a7358e910c01b" }, "neogit": { "branch": "master", "commit": "71eb98630b5cb2277636fdccc74a7358e910c01b" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" }, "nvim-lspconfig": { "branch": "master", "commit": "bd7c76375a511994c9ca8d69441f134dc10ae3bd" },
"nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" }, "nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
"nvim-treesitter": { "branch": "master", "commit": "9d68e876cce94fc9f8f8819da0c956a4429a3766" }, "nvim-treesitter": { "branch": "master", "commit": "9d68e876cce94fc9f8f8819da0c956a4429a3766" },

View File

@ -12,7 +12,6 @@ key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" }) key("n", "<leader>dd", "<cmd>Oil<CR>", { desc = "[D]isplay [d]irectory" })
key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" }) key("n", "<leader>df", "<cmd>Oil --float<CR>", { desc = "[D]isplay directory [f]loat" })
key("n", "<leader>ct", "<cmd>ColorizerToggle<CR>", { desc = "[C]olorizer [t]oggle" })
key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" }) key("n", "<leader>ut", "<cmd>UndotreeToggle<CR>", { desc = "[U]undotree [t]oggle" })
-- tabs -- tabs

View File

@ -21,12 +21,6 @@ return {
vim.cmd.colorscheme('tokyonight') vim.cmd.colorscheme('tokyonight')
end, end,
}, },
{
-- Statusline
'freddiehaddad/feline.nvim',
opts = {},
},
{ {
-- Indentation guides (see `:help indent_blankline.txt`) -- Indentation guides (see `:help indent_blankline.txt`)
'lukas-reineke/indent-blankline.nvim', 'lukas-reineke/indent-blankline.nvim',
@ -35,7 +29,15 @@ return {
}, },
{ {
'norcalli/nvim-colorizer.lua', --- Create Color Code
cmd = 'ColorizerToggle' 'uga-rosa/ccc.nvim',
config = function(_, opts)
require('ccc').setup(opts)
end,
cmd = { 'CccPick', 'CccHighlighterToggle' },
keys = {
{ "<leader>ct", "<cmd>CccHighlighterToggle<cr>", desc = "[C]olorizer [T]oggle" },
{ "<leader>cp", "<cmd>CccPick<cr>", desc = "[C]olor [P]ick" },
},
}, },
} }

View File

@ -0,0 +1,221 @@
local function feline_config(_, opts)
local theme = {
bg = '#394b70',
black = '#1d202f',
skyblue = '#7aa2f7',
cyan = '#0db9d7',
fg = '#c0caf5',
green = '#1abc9c',
oceanblue = '#3d59a1',
magenta = '#bb9af7',
orange = '#ff9e64',
red = '#f7768e',
violet = '#9d7cd8',
white = '#a9b1d6',
yellow = '#e0af68',
}
local statusline = require('arrow.statusline')
local vimode = require('feline.providers.vi_mode')
local c = {
vi_mode = {
provider = 'vi_mode',
hl = function()
return {
name = vimode.get_mode_highlight_name(),
fg = vimode.get_mode_color(),
bg = theme.fg,
style = 'bold',
}
end,
left_sep = {
str = ' █',
always_visible = true,
hl = {
fg = theme.fg,
},
},
right_sep = {
str = '',
always_visible = true,
hl = {
fg = theme.fg,
},
}
},
file_info = {
provider = 'file_info',
hl = {
fg = theme.fg,
},
left_sep = {
str = ' ',
},
right_sep = {
str = ' ',
},
},
arrow = {
provider = function() return statusline.text_for_statusline_with_icons() end,
hl = {
fg = theme.red,
style = 'bold',
},
},
file_size = {
provider = 'file_size',
hl = {
fg = theme.bg,
bg = theme.fg,
style = 'bold',
},
left_sep = {
str = ' █',
always_visible = true,
hl = {
fg = theme.fg,
},
},
},
line_percentage = {
provider = 'line_percentage',
hl = {
fg = theme.bg,
bg = theme.fg,
style = 'bold',
},
left_sep = {
str = '',
hl = {
fg = theme.bg,
bg = theme.fg,
},
},
right_sep = {
str = '',
hl = {
fg = theme.bg,
bg = theme.fg,
},
},
},
position = {
provider = 'position',
hl = {
fg = theme.bg,
bg = theme.fg,
style = 'bold',
},
right_sep = {
str = '█ ',
always_visible = true,
hl = {
fg = theme.fg,
},
}
},
diagnostic_errors = {
provider = 'diagnostic_errors',
hl = {
fg = theme.red,
},
},
diagnostic_warnings = {
provider = 'diagnostic_warnings',
hl = {
fg = theme.yellow,
},
},
diagnostic_info = {
provider = 'diagnostic_info',
hl = {
fg = theme.green,
},
},
diagnostic_hints = {
provider = 'diagnostic_hints',
hl = {
fg = theme.blue,
},
},
git_diff_added = {
provider = 'git_diff_added',
hl = {
fg = theme.green,
},
},
git_diff_removed = {
provider = 'git_diff_removed',
hl = {
fg = theme.red,
},
},
git_diff_changed = {
provider = 'git_diff_changed',
hl = {
fg = theme.yellow,
},
},
git_branch = {
provider = 'git_branch',
hl = {
fg = theme.bg,
bg = theme.fg,
style = 'bold',
},
left_sep = {
str = ' █',
hl = {
fg = theme.fg,
},
},
right_sep = {
str = '',
hl = {
fg = theme.fg,
},
}
},
}
local active = {
{
c.vi_mode,
c.file_info,
c.arrow,
c.file_size,
c.line_percentage,
c.position,
c.diagnostic_errors,
c.diagnostic_warnings,
c.diagnostic_info,
c.diagnostic_hints,
},
{
c.git_diff_added,
c.git_diff_removed,
c.git_diff_changed,
c.git_branch,
},
}
local inactive = {
{
c.file_info,
},
{},
}
opts.components = { active = active, inactive = inactive }
local feline = require('feline')
feline.setup(opts)
feline.use_theme(theme)
end
return {
-- Statusline
'freddiehaddad/feline.nvim',
opts = {},
config = feline_config,
}