hard contrast gruvbox
This commit is contained in:
parent
533602e263
commit
450e658c97
8 changed files with 79 additions and 71 deletions
|
@ -1,7 +1,7 @@
|
||||||
! hard *.background: #1D2021
|
|
||||||
! soft ! *.background: #32302F
|
! soft ! *.background: #32302F
|
||||||
! medium
|
! medium *.background: #282828
|
||||||
*.background: #282828
|
! hard
|
||||||
|
*.background: #1D2021
|
||||||
|
|
||||||
*.foreground: #D4BE98
|
*.foreground: #D4BE98
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
fish_color_normal D4BE98
|
fish_color_normal D4BE98
|
||||||
fish_color_command A9B665
|
fish_color_command A9B665
|
||||||
fish_color_keyword 7DAEA3
|
fish_color_keyword 7DAEA3
|
||||||
fish_color_quote D8A657
|
fish_color_quote 89B482
|
||||||
fish_color_redirection D4BE98
|
fish_color_redirection E78A4E
|
||||||
fish_color_end E78A4E
|
fish_color_end 7C6F64
|
||||||
fish_color_error EA6962
|
fish_color_error EA6962
|
||||||
fish_color_param D4BE98
|
fish_color_param D4BE98
|
||||||
fish_color_comment 7C6F64
|
fish_color_comment 7C6F64
|
||||||
|
@ -11,7 +11,7 @@ fish_color_selection --background=504945
|
||||||
fish_color_search_match --background=504945
|
fish_color_search_match --background=504945
|
||||||
fish_color_operator A9B665
|
fish_color_operator A9B665
|
||||||
fish_color_escape 7DAEA3
|
fish_color_escape 7DAEA3
|
||||||
fish_color_autosuggestion 5A524C
|
fish_color_autosuggestion 7C6F64
|
||||||
|
|
||||||
fish_pager_color_progress 8F3F71
|
fish_pager_color_progress 8F3F71
|
||||||
fish_pager_color_prefix 89B482
|
fish_pager_color_prefix 89B482
|
||||||
|
|
|
@ -41,11 +41,12 @@ return {
|
||||||
"sainnhe/gruvbox-material",
|
"sainnhe/gruvbox-material",
|
||||||
priority = 1000,
|
priority = 1000,
|
||||||
config = function()
|
config = function()
|
||||||
local contrast = "medium"
|
local contrast = "hard"
|
||||||
if background == "light" then
|
if background == "light" then
|
||||||
contrast = "soft"
|
contrast = "soft"
|
||||||
end
|
end
|
||||||
vim.g.gruvbox_material_background = contrast
|
vim.g.gruvbox_material_background = contrast
|
||||||
|
-- Available values: `'material'`, `'mix'`, `'original'`
|
||||||
vim.g.gruvbox_material_foreground = "material"
|
vim.g.gruvbox_material_foreground = "material"
|
||||||
SetColor()
|
SetColor()
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -38,15 +38,16 @@ return {
|
||||||
mapping = {
|
mapping = {
|
||||||
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
|
||||||
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }),
|
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||||
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-e>"] = cmp.mapping.abort(),
|
["<C-e>"] = cmp.mapping.abort(),
|
||||||
["<C-y>"] = cmp.mapping.confirm({
|
["<C-y>"] = cmp.mapping(
|
||||||
behavior = cmp.ConfirmBehavior.Insert,
|
cmp.mapping.confirm({
|
||||||
select = true,
|
behavior = cmp.ConfirmBehavior.Insert,
|
||||||
}),
|
select = true,
|
||||||
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
}),
|
||||||
|
{ "i", "c" }
|
||||||
|
),
|
||||||
["<C-l>"] = cmp.mapping(function()
|
["<C-l>"] = cmp.mapping(function()
|
||||||
if luasnip.expand_or_jumpable() then
|
if luasnip.expand_or_jumpable() then
|
||||||
luasnip.expand_or_jump()
|
luasnip.expand_or_jump()
|
||||||
|
@ -57,6 +58,20 @@ return {
|
||||||
luasnip.jump(-1)
|
luasnip.jump(-1)
|
||||||
end
|
end
|
||||||
end),
|
end),
|
||||||
|
["<C-Space>"] = cmp.mapping({
|
||||||
|
i = cmp.mapping.complete(),
|
||||||
|
c = function(
|
||||||
|
_ --[[fallback]]
|
||||||
|
)
|
||||||
|
if cmp.visible() then
|
||||||
|
if not cmp.confirm({ select = true }) then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
else
|
||||||
|
cmp.complete()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}),
|
||||||
},
|
},
|
||||||
|
|
||||||
formatting = {
|
formatting = {
|
||||||
|
@ -175,8 +190,7 @@ return {
|
||||||
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
||||||
vim.keymap.set("n", "<leader>ve", vim.diagnostic.setloclist)
|
vim.keymap.set("n", "<leader>ve", vim.diagnostic.setloclist)
|
||||||
|
|
||||||
|
-- autocmd LSP keybinds
|
||||||
-- autocmd LSP keybinds
|
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
group = vim.api.nvim_create_augroup("TsousaLspConfig", {}),
|
group = vim.api.nvim_create_augroup("TsousaLspConfig", {}),
|
||||||
callback = function(e)
|
callback = function(e)
|
||||||
|
|
|
@ -1,42 +1,42 @@
|
||||||
return {
|
return {
|
||||||
"folke/todo-comments.nvim",
|
"folke/todo-comments.nvim",
|
||||||
dependencies = { "nvim-lua/plenary.nvim" },
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
require("todo-comments").setup({
|
require("todo-comments").setup({
|
||||||
signs = true, -- show icons in the signs column
|
signs = true, -- show icons in the signs column
|
||||||
sign_priority = 8, -- sign priority
|
sign_priority = 8, -- sign priority
|
||||||
-- keywords recognized as todo comments
|
-- keywords recognized as todo comments
|
||||||
keywords = {
|
keywords = {
|
||||||
FIX = {
|
FIX = {
|
||||||
icon = " ", -- icon used for the sign, and in search results
|
icon = " ", -- icon used for the sign, and in search results
|
||||||
color = "error", -- can be a hex color, or a named color (see below)
|
color = "error", -- can be a hex color, or a named color (see below)
|
||||||
alt = { "FIXME", "BUG", "FIXIT", "ISSUE", "fix" }, -- a set of other keywords that all map to this FIX keywords
|
alt = { "FIXME", "BUG", "FIXIT", "ISSUE", "fix" }, -- a set of other keywords that all map to this FIX keywords
|
||||||
-- signs = false, -- configure signs for some keywords individually
|
-- signs = false, -- configure signs for some keywords individually
|
||||||
},
|
},
|
||||||
TODO = { icon = " ", color = "info", alt = { "todo" } },
|
TODO = { icon = " ", color = "info", alt = { "todo" } },
|
||||||
HACK = { icon = " ", color = "warning", alt = { "hack" } },
|
HACK = { icon = " ", color = "warning", alt = { "hack" } },
|
||||||
WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX", "warn" } },
|
WARN = { icon = " ", color = "warning", alt = { "WARNING", "XXX", "warn" } },
|
||||||
PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE", "perf" } },
|
PERF = { icon = " ", alt = { "OPTIM", "PERFORMANCE", "OPTIMIZE", "perf" } },
|
||||||
NOTE = { icon = " ", color = "hint", alt = { "INFO", "info", "note" } },
|
NOTE = { icon = " ", color = "hint", alt = { "INFO", "info", "note" } },
|
||||||
TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED", "test" } },
|
TEST = { icon = "⏲ ", color = "test", alt = { "TESTING", "PASSED", "FAILED", "test" } },
|
||||||
},
|
},
|
||||||
merge_keywords = true, -- when true, custom keywords will be merged with the defaults
|
merge_keywords = true, -- when true, custom keywords will be merged with the defaults
|
||||||
-- highlighting of the line containing the todo comment
|
-- highlighting of the line containing the todo comment
|
||||||
-- * before: highlights before the keyword (typically comment characters)
|
-- * before: highlights before the keyword (typically comment characters)
|
||||||
-- * keyword: highlights of the keyword
|
-- * keyword: highlights of the keyword
|
||||||
-- * after: highlights after the keyword (todo text)
|
-- * after: highlights after the keyword (todo text)
|
||||||
highlight = {
|
highlight = {
|
||||||
multiline = true, -- enable multine todo comments
|
multiline = true, -- enable multine todo comments
|
||||||
multiline_pattern = "^.", -- lua pattern to match the next multiline from the start of the matched keyword
|
multiline_pattern = "^.", -- lua pattern to match the next multiline from the start of the matched keyword
|
||||||
multiline_context = 10, -- extra lines that will be re-evaluated when changing a line
|
multiline_context = 10, -- extra lines that will be re-evaluated when changing a line
|
||||||
before = "", -- "fg" or "bg" or empty
|
before = "", -- "fg" or "bg" or empty
|
||||||
keyword = "wide", -- "fg", "bg", "wide", "wide_bg", "wide_fg" or empty. (wide and wide_bg is the same as bg, but will also highlight surrounding characters, wide_fg acts accordingly but with fg)
|
keyword = "wide", -- "fg", "bg", "wide", "wide_bg", "wide_fg" or empty. (wide and wide_bg is the same as bg, but will also highlight surrounding characters, wide_fg acts accordingly but with fg)
|
||||||
after = "fg", -- "fg" or "bg" or empty
|
after = "fg", -- "fg" or "bg" or empty
|
||||||
pattern = [[.*<(KEYWORDS)\s*:]], -- pattern or table of patterns, used for highlighting (vim regex)
|
pattern = [[.*<(KEYWORDS)\s*:]], -- pattern or table of patterns, used for highlighting (vim regex)
|
||||||
comments_only = true, -- uses treesitter to match keywords in comments only
|
comments_only = true, -- uses treesitter to match keywords in comments only
|
||||||
max_line_len = 400, -- ignore lines longer than this
|
max_line_len = 400, -- ignore lines longer than this
|
||||||
exclude = {}, -- list of file types to exclude highlighting
|
exclude = {}, -- list of file types to exclude highlighting
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,10 +33,10 @@ font-2 = inter:size=10:weight=regular;2
|
||||||
|
|
||||||
[bar/desktop]
|
[bar/desktop]
|
||||||
inherit = section/base
|
inherit = section/base
|
||||||
width = 99.7%
|
; width = 99.7%
|
||||||
height = 24pt
|
height = 24pt
|
||||||
offset-x = 0.15%
|
; offset-x = 0.15%
|
||||||
offset-y = 0.4%
|
; offset-y = 0.4%
|
||||||
;radius = 8
|
;radius = 8
|
||||||
|
|
||||||
modules-left = i3 sep title
|
modules-left = i3 sep title
|
||||||
|
@ -58,12 +58,9 @@ wm-restack = i3
|
||||||
[bar/laptop]
|
[bar/laptop]
|
||||||
inherit = section/base
|
inherit = section/base
|
||||||
; width = 99.5%
|
; width = 99.5%
|
||||||
width = 100%
|
|
||||||
height = 24pt
|
height = 24pt
|
||||||
; offset-x = 0.3%
|
; offset-x = 0.3%
|
||||||
; offset-y = 0.5%
|
; offset-y = 0.5%
|
||||||
offset-x = 0%
|
|
||||||
offset-y = 0%
|
|
||||||
;radius = 8
|
;radius = 8
|
||||||
|
|
||||||
modules-left = i3 sep title
|
modules-left = i3 sep title
|
||||||
|
@ -84,13 +81,9 @@ wm-restack = i3
|
||||||
[bar/secondary]
|
[bar/secondary]
|
||||||
inherit = section/base
|
inherit = section/base
|
||||||
; width = 99.5%
|
; width = 99.5%
|
||||||
width = 100%
|
|
||||||
height = 24pt
|
height = 24pt
|
||||||
; offset-x = 0.3%
|
; offset-x = 0.3%
|
||||||
; offset-y = 0.5%
|
; offset-y = 0.5%
|
||||||
offset-x = 0%
|
|
||||||
offset-y = 0%
|
|
||||||
;radius = 8
|
|
||||||
|
|
||||||
modules-left = i3
|
modules-left = i3
|
||||||
modules-center = date dot time
|
modules-center = date dot time
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
* {
|
* {
|
||||||
background: #282828FF;
|
background: #1D2021FF;
|
||||||
background-alt: #1D2021FF;
|
background-alt: #282828FF;
|
||||||
foreground: #D4BE98FF;
|
foreground: #D4BE98FF;
|
||||||
selected: #7DAEA3FF;
|
selected: #7DAEA3FF;
|
||||||
active: #A9B665FF;
|
active: #A9B665FF;
|
||||||
|
|
|
@ -4,7 +4,7 @@ set -ag terminal-overrides ",*:RGB"
|
||||||
unbind C-b
|
unbind C-b
|
||||||
set-option -g prefix C-a
|
set-option -g prefix C-a
|
||||||
bind-key C-a send-prefix
|
bind-key C-a send-prefix
|
||||||
set -g status-style 'bg=#282828 fg=#D4BE98'
|
set -g status-style 'bg=#1D2021 fg=#D4BE98'
|
||||||
set-option -g status-position top
|
set-option -g status-position top
|
||||||
set-option -g status-right ""
|
set-option -g status-right ""
|
||||||
set -g status-left-length 20
|
set -g status-left-length 20
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue