Improve themes

This commit is contained in:
mintycube 2024-05-25 20:48:42 +05:00
parent 0697857330
commit a3cdb6e102
20 changed files with 474 additions and 160 deletions

View File

@ -20,7 +20,6 @@
"lf.nvim": { "branch": "master", "commit": "69ab1efcffee6928bf68ac9bd0c016464d9b2c8b" }, "lf.nvim": { "branch": "master", "commit": "69ab1efcffee6928bf68ac9bd0c016464d9b2c8b" },
"lsp-zero.nvim": { "branch": "v3.x", "commit": "f12d50716e8e59ea9f5cf484eac6968c33a95917" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "f12d50716e8e59ea9f5cf484eac6968c33a95917" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"luarocks.nvim": { "branch": "main", "commit": "d3dda396d66e484590f253d1ac6d8980e3130807" }, "luarocks.nvim": { "branch": "main", "commit": "d3dda396d66e484590f253d1ac6d8980e3130807" },
"luasnip-latex-snippets.nvim": { "branch": "main", "commit": "4b91f28d91979f61a3e8aef1cee5b7c7f2c7beb8" }, "luasnip-latex-snippets.nvim": { "branch": "main", "commit": "4b91f28d91979f61a3e8aef1cee5b7c7f2c7beb8" },
"markdown-preview.nvim": { "branch": "main", "commit": "462ce41af003f5cdadab856f3a42dc27e39b89c8" }, "markdown-preview.nvim": { "branch": "main", "commit": "462ce41af003f5cdadab856f3a42dc27e39b89c8" },
@ -28,6 +27,7 @@
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
"mini.ai": { "branch": "main", "commit": "a0262e61f79dfc7bb940d1719c00b0ede042ddd7" }, "mini.ai": { "branch": "main", "commit": "a0262e61f79dfc7bb940d1719c00b0ede042ddd7" },
"mini.statusline": { "branch": "main", "commit": "dfd3d2ba295473930f78f143852b9b53eb54ae2a" },
"mini.surround": { "branch": "main", "commit": "c52aa751daf62d4a9e6ee24c4a91882ef6842f99" }, "mini.surround": { "branch": "main", "commit": "c52aa751daf62d4a9e6ee24c4a91882ef6842f99" },
"none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" }, "none-ls.nvim": { "branch": "main", "commit": "37671797d6e5f9bd0ee3ab965ab2e6de251e1930" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
@ -48,14 +48,17 @@
"nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" }, "nvim-ufo": { "branch": "main", "commit": "4b4077850d1b3af09f4957b67144943cf3da401a" },
"nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" }, "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
"outline.nvim": { "branch": "main", "commit": "139e363dd5a44f66a51041264aabe3884df4dd98" }, "outline.nvim": { "branch": "main", "commit": "139e363dd5a44f66a51041264aabe3884df4dd98" },
"oxocarbon.nvim": { "branch": "main", "commit": "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2" },
"persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
"plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" }, "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" },
"project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
"promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
"qalc.nvim": { "branch": "main", "commit": "1b800b5d8f956c4780f079333cba4d8fb8c335a3" }, "qalc.nvim": { "branch": "main", "commit": "1b800b5d8f956c4780f079333cba4d8fb8c335a3" },
"refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" },
"rose-pine": { "branch": "main", "commit": "b6fe88c3282cf9f117a3e836d761c2d78d02f417" },
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
"toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" },
"tokyodark.nvim": { "branch": "master", "commit": "ba538ab69e8a4e3ebac127734b7deff9e7462463" },
"tokyonight.nvim": { "branch": "main", "commit": "7fc18e82575f5b482b758b6dddfe97b606819a20" }, "tokyonight.nvim": { "branch": "main", "commit": "7fc18e82575f5b482b758b6dddfe97b606819a20" },
"trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },

View File

@ -32,10 +32,9 @@ vim.opt.scrolloff = 8
vim.opt.sidescrolloff = 8 vim.opt.sidescrolloff = 8
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes"
vim.opt.cursorline = true vim.opt.cursorline = true
vim.opt.cursorlineopt = "both" vim.opt.cursorlineopt = "number"
vim.opt.conceallevel = 2 vim.opt.conceallevel = 2
vim.opt.list = true vim.opt.list = false
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '' }
vim.opt.showmode = false vim.opt.showmode = false
-- vim.opt.colorcolumn = "80" -- vim.opt.colorcolumn = "80"
vim.opt.winminwidth = 5 vim.opt.winminwidth = 5

View File

@ -119,7 +119,7 @@ return {
vim.diagnostic.config({ vim.diagnostic.config({
underline = false, underline = false,
virtual_text = false, virtual_text = true,
signs = { signs = {
text = { text = {
[vim.diagnostic.severity.ERROR] = "", [vim.diagnostic.severity.ERROR] = "",

View File

@ -1,5 +1,63 @@
return { return {
-- colorscheme -- colorscheme
{
"rose-pine/neovim",
name = "rose-pine",
priority = 1000,
lazy = false,
config = function()
require("rose-pine").setup({
variant = "moon",
dim_inactive_windows = true,
groups = {
error = "subtle",
warn = "subtle",
info = "subtle",
hint = "subtle",
}
})
vim.cmd.colorscheme("rose-pine")
end
},
{
"tiagovla/tokyodark.nvim",
lazy = false,
priority = 1000,
config = function()
require("tokyodark").setup({
transparent_background = false, -- set background to transparent
gamma = 1.00, -- adjust the brightness of the theme
styles = {
comments = { italic = true }, -- style for comments
keywords = { italic = true }, -- style for keywords
identifiers = { italic = true }, -- style for identifiers
functions = {}, -- style for functions
variables = {}, -- style for variables
},
custom_highlights = {} or function(highlights, palette) return {} end, -- extend highlights
custom_palette = {} or function(palette) return {} end, -- extend palette
terminal_colors = true, -- enable terminal colors
})
-- vim.cmd.colorscheme("tokyodark")
end,
},
{
"nyoom-engineering/oxocarbon.nvim",
lazy = false,
priority = 1000,
config = function()
-- vim.cmd.colorscheme("oxocarbon")
local hl = vim.api.nvim_set_hl
hl(0, "DiagnosticVirtualTextError", { link = "Comment" })
hl(0, "DiagnosticVirtualTextInfo", { link = "Comment" })
hl(0, "DiagnosticVirtualTextWarn", { link = "Comment" })
hl(0, "DiagnosticVirtualTextHint", { link = "Comment" })
hl(0, "DiagnosticUnderlineError", { underline = true, sp = "#858694" })
hl(0, "DiagnosticUnderlineWarn", { underline = true, sp = "#858694" })
hl(0, "DiagnosticUnderlineInfo", { underline = true, sp = "#858694" })
hl(0, "DiagnosticUnderlineHint", { underline = true, sp = "#858694" })
end,
},
{ {
"folke/tokyonight.nvim", "folke/tokyonight.nvim",
lazy = false, lazy = false,
@ -43,7 +101,7 @@ return {
} }
end, end,
}) })
vim.cmd.colorscheme("tokyonight") -- vim.cmd.colorscheme("tokyonight")
vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
end, end,
@ -55,45 +113,48 @@ return {
}, },
-- statusline -- statusline
{ {
"nvim-lualine/lualine.nvim", "nvim-lualine/lualine.nvim",
event = "VeryLazy", event = "VeryLazy",
config = function() config = function()
local lualine = require("lualine") local function get_colors()
local themecolor = require("tokyonight.colors").setup() local colorscheme = vim.g.colors_name
local colors = { if colorscheme == "rose-pine" then
bg = "#0d0d12", return {
fg = themecolor.fg_dark, bg = "#232136",
yellow = themecolor.yellow, fg = "#908caa",
cyan = themecolor.cyan, active_buf = "#e0def4",
green = themecolor.green,
magenta = themecolor.magenta,
blue = themecolor.blue,
red = themecolor.red,
low = themecolor.terminal_black,
mode = themecolor.terminal_black,
bg2 = "#292e42",
bg3 = "#16161e"
} }
local mode_color = { elseif colorscheme == "tokyonight" then
n = colors.blue, return {
i = colors.green, bg = '#16161e',
v = colors.magenta, fg = '#3B4261',
["^V"] = colors.magenta, active_buf = "#c0caf5",
V = colors.magenta,
c = colors.blue,
no = colors.red,
ic = colors.yellow,
R = colors.red,
Rv = colors.red,
cv = colors.red,
ce = colors.red,
r = colors.blue,
rm = colors.blue,
["r?"] = colors.blue,
["!"] = colors.blue,
t = colors.blue,
} }
elseif colorscheme == "tokyodark" then
return {
bg = '#11121D',
fg = '#4A5057',
active_buf = "#a0a8cd",
}
elseif colorscheme == "oxocarbon" then
return {
bg = '#161616',
fg = '#525252',
active_buf = "#dde1e6",
}
else
return {
bg = "",
fg = "",
active_buf = "",
}
end
end
local colors = get_colors()
local conditions = { local conditions = {
buffer_not_empty = function() buffer_not_empty = function()
return vim.fn.empty(vim.fn.expand("%:t")) ~= 1 return vim.fn.empty(vim.fn.expand("%:t")) ~= 1
@ -105,16 +166,17 @@ return {
local filepath = vim.fn.expand("%:p:h") local filepath = vim.fn.expand("%:p:h")
local gitdir = vim.fn.finddir(".git", filepath .. ";") local gitdir = vim.fn.finddir(".git", filepath .. ";")
return gitdir and #gitdir > 0 and #gitdir < #filepath return gitdir and #gitdir > 0 and #gitdir < #filepath
end, end
} }
local config = { local config = {
options = { options = {
component_separators = "", component_separators = "",
section_separators = "", section_separators = " ",
disabled_filetypes = { "help", "lazy", "mason", "fzf", "lspinfo", "alpha" }, disabled_filetypes = { "help", "lazy", "mason", "fzf", "lspinfo", "alpha" },
theme = { theme = {
normal = { c = { fg = colors.fg, bg = colors.bg3 } }, normal = { c = { fg = colors.fg, bg = colors.bg } },
inactive = { c = { fg = colors.fg, bg = colors.bg3 } }, inactive = { c = { fg = colors.fg, bg = colors.bg } },
}, },
}, },
sections = { sections = {
@ -140,44 +202,47 @@ return {
local function ins_right(component) local function ins_right(component)
table.insert(config.sections.lualine_x, component) table.insert(config.sections.lualine_x, component)
end end
ins_left({ ins_left({
function() function()
return "" return ""
end, end
color = { fg = colors.bg2, bg = colors.bg3 },
padding = { left = 0, right = 0 },
}) })
ins_left({ ins_left({
function() "mode",
return ""
-- return " "
-- return " "
end,
color = function()
return { fg = mode_color[vim.fn.mode()], bg = colors.bg2 }
end,
padding = { left = 0, right = 0 },
}) })
ins_left({
ins_left {
'diagnostics',
sources = { 'nvim_diagnostic' },
-- Displays diagnostics for the defined severity types
sections = { 'error', 'warn' },
symbols = { error = '', warn = '' },
colored = false,
}
ins_left {
function() function()
return "" return '%='
end, end,
color = { fg = colors.bg2 }, }
padding = { left = 0, right = 1 },
})
ins_left({ ins_left({
"buffers", "buffers",
hide_filename_extension = false,
buffers_color = { buffers_color = {
active = { fg = colors.magenta, bg = colors.bg3 }, active = { fg = colors.active_buf, bg = colors.bg },
inactive = { fg = colors.low, bg = colors.bg3 }, inactive = { fg = colors.fg, bg = colors.bg },
}, },
symbols = { symbols = {
modified = "", modified = "",
alternate_file = "", alternate_file = "",
}, },
cond = conditions.buffer_not_empty, cond = conditions.buffer_not_empty,
color = { fg = colors.magenta, gui = "bold" }, color = { fg = colors.active_buf, gui = "bold" },
}) })
ins_right({ ins_right({
function() function()
if vim.bo.filetype == "txt" or vim.bo.filetype == "markdown" or vim.bo.filetype == "tex" then if vim.bo.filetype == "txt" or vim.bo.filetype == "markdown" or vim.bo.filetype == "tex" then
@ -192,8 +257,8 @@ return {
return "" return ""
end end
end, end,
color = { fg = colors.low },
}) })
ins_right({ ins_right({
-- Lsp server name -- Lsp server name
function() function()
@ -212,53 +277,19 @@ return {
return msg return msg
end, end,
icon = "", icon = "",
color = { fg = colors.low },
}) })
ins_right({ ins_right({
"branch", "branch",
icon = "", icon = "",
color = { fg = colors.low, gui = "bold" }, color = { gui = "bold" },
})
ins_right({
"diff",
symbols = { added = "", modified = "", removed = "" },
diff_color = {
added = { fg = colors.low },
modified = { fg = colors.low },
removed = { fg = colors.low },
},
cond = conditions.hide_in_width,
}) })
ins_right({ ins_right({
"location", "location",
color = function()
return { fg = mode_color[vim.fn.mode()] }
end,
padding = { left = 0, right = 1 },
}) })
ins_right({
function() require("lualine").setup(config)
return "" end
end,
color = { fg = colors.bg2 },
padding = { left = 0, right = 0 },
})
ins_right({
"progress",
color = function()
return { fg = mode_color[vim.fn.mode()], bg = colors.bg2, gui = "bold" }
end,
padding = { left = 0, right = 0 },
})
ins_right({
function()
return ""
end,
color = { fg = colors.bg2, bg = colors.bg3 },
padding = { left = 0, right = 0 },
})
lualine.setup(config)
end,
}, },
-- indentation lines -- indentation lines

View File

@ -85,7 +85,6 @@ static char *colors[][ColCount] = {
static const char *const autostart[] = { static const char *const autostart[] = {
// "st", NULL, // "st", NULL,
"dwmblocks", NULL, "dwmblocks", NULL,
"pipewire", NULL,
"picom", NULL, "picom", NULL,
NULL /* terminate */ NULL /* terminate */
}; };
@ -168,7 +167,7 @@ static const Rule rules[] = {
RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1) RULE(.wintype = WTYPE "TOOLBAR", .isfloating = 1)
RULE(.wintype = WTYPE "SPLASH", .isfloating = 1) RULE(.wintype = WTYPE "SPLASH", .isfloating = 1)
RULE(.class = "st-terminal", .tags = 1 << 0, .switchtag = 1) // RULE(.class = "st-terminal", .tags = 1 << 0, .switchtag = 1)
RULE(.class = "firefox", .tags = 1 << 1, .switchtag = 1) RULE(.class = "firefox", .tags = 1 << 1, .switchtag = 1)
RULE(.title = "nvim", .tags = 1 << 2, .switchtag = 1) RULE(.title = "nvim", .tags = 1 << 2, .switchtag = 1)
RULE(.title = "lf", .tags = 1 << 3, .switchtag = 1) RULE(.title = "lf", .tags = 1 << 3, .switchtag = 1)
@ -187,6 +186,7 @@ static const Rule rules[] = {
RULE(.instance = "dictionary", .isfloating = 1) RULE(.instance = "dictionary", .isfloating = 1)
RULE(.class = "volume-ui", .isfloating = 1) RULE(.class = "volume-ui", .isfloating = 1)
RULE(.class = "gping-ui", .isfloating = 1)
}; };
/* Bar rules allow you to configure what is shown where on the bar, as well as /* Bar rules allow you to configure what is shown where on the bar, as well as
@ -268,6 +268,7 @@ static const Key on_empty_keys[] = {
{0, XK_a, spawn, {.v = (const char*[]){"dmenu_hub", NULL } } }, {0, XK_a, spawn, {.v = (const char*[]){"dmenu_hub", NULL } } },
{0, XK_space, spawn, {.v = (const char*[]){"dmenu_web", NULL } } }, {0, XK_space, spawn, {.v = (const char*[]){"dmenu_web", NULL } } },
{0, XK_n, spawn, {.v = (const char*[]){"st", "-e", "nvim", NULL } } }, {0, XK_n, spawn, {.v = (const char*[]){"st", "-e", "nvim", NULL } } },
{0, XK_p, spawn, {.v = (const char*[]){"st", "-c", "gping-ui", "-g=80x15+353+20", "-e", "gping", "duckduckgo.com", NULL } } },
}; };
static const Key keys[] = { static const Key keys[] = {
@ -318,6 +319,7 @@ static const Key keys[] = {
{ MODKEY, XK_i, setlayout, {0} }, { MODKEY, XK_i, setlayout, {0} },
{ MODKEY, XK_o, incnmaster, {.i = +1 } }, { MODKEY, XK_o, incnmaster, {.i = +1 } },
{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } },
{ MODKEY, XK_p, spawn, {.v = (const char*[]){"st", "-c", "gping-ui", "-g=80x15+353+20", "-e", "gping", "duckduckgo.com", NULL } } },
{ MODKEY, XK_a, spawn, {.v = (const char*[]){ "dmenu_hub", NULL } } }, { MODKEY, XK_a, spawn, {.v = (const char*[]){ "dmenu_hub", NULL } } },
{ MODKEY, XK_d, spawn, {.v = dmenu_run_cmd } }, { MODKEY, XK_d, spawn, {.v = dmenu_run_cmd } },
{ MODKEY, XK_f, togglefakefullscreen, {0} }, { MODKEY, XK_f, togglefakefullscreen, {0} },

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.background: #24273A
*.foreground: #CAD3F5
*.cursorColor: #B8C0E0
*.color0: #494D64
*.color8: #5B6078
*.color1: #ED8796
*.color9: #ED8796
*.color2: #A6DA95
*.color10: #A6DA95
*.color3: #EED49F
*.color11: #EED49F
*.color4: #8AADF4
*.color12: #8AADF4
*.color5: #F5BDE6
*.color13: #F5BDE6
*.color6: #8BD5CA
*.color14: #8BD5CA
*.color7: #B8C0E0
*.color15: #A5ADCB
dwm.normbordercolor: #262626
dwm.normbgcolor: #1c2023
dwm.normfgcolor: #a2a9b0
dwm.selbordercolor: #666666
dwm.selbgcolor: #262626
dwm.selfgcolor: #a2a9b0
dwm.tagsnormfgcolor: #a2a9b0
dwm.tagsnormbgcolor: #1c2023
dwm.tagsselfgcolor: #eeeeee
dwm.tagsselbgcolor: #343E44
dmenu.foreground: #d3c6aa
dmenu.background: #1c2023
dmenu.selforeground: #1c2023
dmenu.selbackground: #88c096
dmenu.bordercolor: #88c096
slock.locked: #2E383F
slock.input: #ADB3BA
slock.failed: #555555

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.foreground: #d3c6aa
*.background: #1c2023
*.cursorColor: #d3c6aa
*.color0: #272e32
*.color8: #7a8478
*.color1: #e67e80
*.color9: #dbbc7f
*.color2: #b2c98f
*.color10: #b2c98f
*.color3: #dbbc7f
*.color11: #dbbc7f
*.color4: #A2C8C3
*.color12: #A2C8C3
*.color5: #D699B6
*.color13: #D699B6
*.color6: #88c096
*.color14: #88c096
*.color7: #9da9a0
*.color15: #dde1e6
dwm.normbordercolor: #262626
dwm.normbgcolor: #1c2023
dwm.normfgcolor: #a2a9b0
dwm.selbordercolor: #666666
dwm.selbgcolor: #262626
dwm.selfgcolor: #a2a9b0
dwm.tagsnormfgcolor: #a2a9b0
dwm.tagsnormbgcolor: #1c2023
dwm.tagsselfgcolor: #eeeeee
dwm.tagsselbgcolor: #343E44
dmenu.foreground: #d3c6aa
dmenu.background: #1c2023
dmenu.selforeground: #1c2023
dmenu.selbackground: #88c096
dmenu.bordercolor: #88c096
slock.locked: #2E383F
slock.input: #ADB3BA
slock.failed: #555555

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.foreground: #c8ccd4
*.background: #1e222a
*.cursorColor: #abb2bf
*.color0: #282c34
*.color8: #545862
*.color1: #e06c75
*.color9: #e06c75
*.color2: #98c379
*.color10: #98c379
*.color3: #e5c07b
*.color11: #e5c07b
*.color4: #8fa1b3
*.color12: #8fa1b3
*.color5: #c678dd
*.color13: #c678dd
*.color6: #56b6c2
*.color14: #56b6c2
*.color7: #abb2bf
*.color15: #c8ccd4
dwm.normbordercolor: #262626
dwm.normbgcolor: #1c2023
dwm.normfgcolor: #a2a9b0
dwm.selbordercolor: #666666
dwm.selbgcolor: #262626
dwm.selfgcolor: #a2a9b0
dwm.tagsnormfgcolor: #a2a9b0
dwm.tagsnormbgcolor: #1c2023
dwm.tagsselfgcolor: #eeeeee
dwm.tagsselbgcolor: #343E44
dmenu.background: #1e222a
dmenu.foreground: #c8ccd4
dmenu.selbackground: #e5c07b
dmenu.selforeground: #1e222a
dmenu.bordercolor: #e5c07b
slock.locked: #2E383F
slock.input: #ADB3BA
slock.failed: #555555

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.foreground: #dde1e6
*.background: #161616
*.cursorColor: #dde1e6
*.color0: #161616
*.color8: #37474f
*.color1: #ee5396
*.color9: #ee5396
*.color2: #42be65
*.color10: #42be65
*.color3: #ffab91
*.color11: #ffab91
*.color4: #be95ff
*.color12: #be95ff
*.color5: #78a9ff
*.color13: #33b1ff
*.color6: #3ddbd9
*.color14: #08bdba
*.color7: #f2f4f8
*.color15: #a2a9b0
dwm.normbordercolor: #262626
dwm.normbgcolor: #161616
dwm.normfgcolor: #a2a9b0
dwm.selbordercolor: #666666
dwm.selbgcolor: #262626
dwm.selfgcolor: #a2a9b0
dwm.tagsnormfgcolor: #a2a9b0
dwm.tagsnormbgcolor: #161616
dwm.tagsselfgcolor: #eeeeee
dwm.tagsselbgcolor: #303030
dmenu.foreground: #dde1e6
dmenu.background: #161616
dmenu.selforeground: #161616
dmenu.selbackground: #be95ff
dmenu.bordercolor: #be95ff
slock.locked: #2E383F
slock.input: #ADB3BA
slock.failed: #555555

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.foreground: #e0def4
*.background: #232136
*.cursorColor: #e0def4
*.color0: #2a273f
*.color8: #393552
*.color1: #eb6f92
*.color9: #eb6f92
*.color2: #f6c177
*.color10: #f6c177
*.color3: #ea9a97
*.color11: #ea9a97
*.color4: #3e8fb0
*.color12: #3e8fb0
*.color5: #c4a7e7
*.color13: #c4a7e7
*.color6: #9ccfd8
*.color14: #9ccfd8
*.color7: #6e6a86
*.color15: #908caa
dwm.normbordercolor: #393552
dwm.normbgcolor: #232136
dwm.normfgcolor: #e0def4
dwm.selbordercolor: #988caa
dwm.selbgcolor: #262626
dwm.selfgcolor: #e0def4
dwm.tagsnormfgcolor: #e0def4
dwm.tagsnormbgcolor: #232136
dwm.tagsselfgcolor: #e0def4
dwm.tagsselbgcolor: #393552
dmenu.foreground: #e0def4
dmenu.background: #232136
dmenu.selforeground: #232136
dmenu.selbackground: #ea9a97
dmenu.bordercolor: #ea9a97
slock.locked: #393552
slock.input: #6e6a86
slock.failed: #3e8fb0

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*.background: #11121D
*.foreground: #A0A8CD
*.cursorColor: #A0A8CD
*.color0: #1d1e29
*.color8: #4e4f5a
*.color1: #ee6d85
*.color9: #f3627a
*.color2: #98c379
*.color10: #98c379
*.color3: #dfae67
*.color11: #dfae67
*.color4: #7199ee
*.color12: #7199ee
*.color5: #a485dd
*.color13: #a485dd
*.color6: #38a89d
*.color14: #38a89d
*.color7: #90A8CD
*.color15: #a2b9c6
dwm.normbordercolor: #15161e
dwm.normbgcolor: #1a1b26
dwm.normfgcolor: #c0caf5
dwm.selbordercolor: #414868
dwm.selbgcolor: #15161e
dwm.selfgcolor: #c0caf5
dwm.tagsnormfgcolor: #c0caf5
dwm.tagsnormbgcolor: #1a1b26
dwm.tagsselfgcolor: #c0caf5
dwm.tagsselbgcolor: #343E44
dmenu.foreground: #c0caf5
dmenu.background: #1a1b26
dmenu.selforeground: #1a1b26
dmenu.selbackground: #7aa2f7
dmenu.bordercolor: #7aa2f7
slock.locked: #414868
slock.input: #7aa2f7
slock.failed: #f7768e

View File

@ -0,0 +1,42 @@
!! vim: filetype=xdefaults
*background: #16161e
*foreground: #c0caf5
*.cursorColor: #c0caf5
*color0: #15161e
*color8: #414868
*.color1: #f7768e
*.color9: #f7768e
*.color2: #9ece6a
*.color10: #9ece6a
*.color3: #e0af68
*.color11: #e0af68
*.color4: #7aa2f7
*.color12: #7aa2f7
*.color5: #bb9af7
*.color13: #bb9af7
*.color6: #7dcfff
*.color14: #7dcfff
*.color7: #a9b1d6
*.color15: #c0caf5
dwm.normbordercolor: #15161e
dwm.normbgcolor: #1a1b26
dwm.normfgcolor: #c0caf5
dwm.selbordercolor: #414868
dwm.selbgcolor: #15161e
dwm.selfgcolor: #c0caf5
dwm.tagsnormfgcolor: #c0caf5
dwm.tagsnormbgcolor: #1a1b26
dwm.tagsselfgcolor: #c0caf5
dwm.tagsselbgcolor: #343E44
dmenu.foreground: #c0caf5
dmenu.background: #1a1b26
dmenu.selforeground: #1a1b26
dmenu.selbackground: #7aa2f7
dmenu.bordercolor: #7aa2f7
slock.locked: #414868
slock.input: #7aa2f7
slock.failed: #f7768e

View File

@ -9,7 +9,9 @@ nvim --headless "+Lazy! load all" +qa &
xrdb "${XDG_CONFIG_HOME:-$HOME/.config}"/x11/xresources & xrdb "${XDG_CONFIG_HOME:-$HOME/.config}"/x11/xresources &
xrdbpid=$! # Uncomment to use Xresources colors/settings on startup xrdbpid=$! # Uncomment to use Xresources colors/settings on startup
autostart="mpd dunst unclutter remapd clipmenud" pidof -sx dunst || dunst -config "${XDG_CONFIG_HOME:-$HOME/.config}"/dunst/config &
autostart="mpd pipewire unclutter remapd clipmenud"
for program in $autostart; do for program in $autostart; do
pidof -sx "$program" || "$program" & pidof -sx "$program" || "$program" &

View File

@ -1,7 +1,7 @@
!! vim: filetype=xdefaults !! vim: filetype=xdefaults
*.foreground: #e0def4 *.foreground: #e0def4
*.background: #191724 *.background: #232136
*.cursorColor: #e0def4 *.cursorColor: #e0def4
*.color0: #2a273f *.color0: #2a273f
*.color8: #393552 *.color8: #393552

View File

@ -1,42 +1,17 @@
! vim: filetype=xdefaults ! vim: filetype=xdefaults
! ▄ ▄ ! Choices: tokyonight, rose-pine, onedark,
! ▄▀▄ ! evergarden, nord, oxocarbon, catpuccin, tokyodark
#include "colors/rose-pine"
Xcursor.theme: Bibata-Modern-Ice Xcursor.theme: Bibata-Modern-Ice
Xcursor.size: 24 Xcursor.size: 24
! Choices: tokyonight, rosepine, cellia, custom-onedark, ashes st.font: JetBrains Mono Nerd Font:style:Medium:size=10
! dracula, eighties, lighthaus, violla,, gruvchad, evergarden,
! gruvbox, monokai, nord, ocean, oxocarbon, tomorrow, mountain
! catpuccin, kanagawa, tokyodark, terafox, duskfox, nordfox, rhxyn
#include "xrdb/color/tokyonight"
! ▄█▀▀█▀
! st.font: CaskaydiaCove Nerd Font:style:Regular:size=10
st.font: JetBrainsMono Nerd Font:style:Medium:size=10
st.borderpx: 10 st.borderpx: 10
st.alpha: 0.9 st.alpha: 1.0
st.tabspaces: 2 st.tabspaces: 2
st.cwscale: 1.0 st.cwscale: 1.0
st.chscale: 1.0 st.chscale: 1.0
! █
! ███▀█▀██▄█▀█▄█
! Choices: tokyo, tokyodark, oxocarbon, nord, tomorrow, banana
#include "xrdb/dmenu/tokyonight"
dmenu.font: JetBrainsMono Nerd Font:style:medium:size=10 dmenu.font: JetBrainsMono Nerd Font:style:medium:size=10
! dmenu.font: CaskaydiaCove Nerd Font:style:Regular:size=10
! █
! ███▄█▄█▀█▀█
! Choices: oxocarbon, tokyonight
#include "xrdb/dwm/tokyonight"
! ▄▄█ ▄▄ ▄▄ █ ▄
! ▄█ █▄██▄█▄▄█▀▄
! Choices: tokyonight, ashes
#include "xrdb/slock/ashes"

View File

@ -53,12 +53,8 @@ export TERMINAL_PROG="st"
export BROWSER="firefox" export BROWSER="firefox"
export MANPAGER="nvim +Man!" export MANPAGER="nvim +Man!"
export XDG_SESSION_TYPE="x11" export XDG_SESSION_TYPE="x11"
export FZF_DEFAULT_OPTS="--height=50% --reverse --info=inline \ export FZF_DEFAULT_OPTS="--height=50% --reverse --info=inline-right \
--color=fg:#c0caf5,bg:#1a1b26,hl:#ff9e64 \ --height=100% --prompt='  ' --pointer=' ' --ellipsis='' --border=horizontal"
--color=fg+:#c0caf5,bg+:#292e42,hl+:#ff9e64 \
--color=info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff \
--height=100% --prompt='  ' --pointer=' ' --ellipsis='' --border=horizontal \
--color=marker:#9ece6a,spinner:#9ece6a,header:#9ece6a"
# ~/ Clean-up: # ~/ Clean-up:
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"

View File

@ -13,13 +13,16 @@ selection=$(fd --hidden --color=always -E .cache -E .git -E \*github\* -E .local
--bind "alt-3:change-prompt( Documents  )+reload(fd --color=always --hidden -e pdf -e epub -e djvu -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \ --bind "alt-3:change-prompt( Documents  )+reload(fd --color=always --hidden -e pdf -e epub -e djvu -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \
--bind "alt-4:change-prompt( Images  )+reload(fd --color=always --hidden -e jpg -e jpg -e jpeg -e png -e webp -e bmp -e tiff -e tif -e raw -e ico -e exif -e heic -e heif -e gif -e avif -e jxl -e JPG -e PNG -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \ --bind "alt-4:change-prompt( Images  )+reload(fd --color=always --hidden -e jpg -e jpg -e jpeg -e png -e webp -e bmp -e tiff -e tif -e raw -e ico -e exif -e heic -e heif -e gif -e avif -e jxl -e JPG -e PNG -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \
--bind "alt-5:change-prompt( Videos  )+reload(fd --color=always --hidden -e mkv -e mp4 -e mkv -e webm -e avi -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \ --bind "alt-5:change-prompt( Videos  )+reload(fd --color=always --hidden -e mkv -e mp4 -e mkv -e webm -e avi -E .cache -E .git -E \*github\* -E .local/state -E .ssh -E .android -E GIMP -E Thunar -E .config/blender -E .config/mpv/script_modules -E .config/mpv/scripts -E .config/tmux/plugins -E fontforge -E fzf-tab-completion -E .gnupg -E libreoffice -E node_modules -E \*obsidian -E qBittorrent -E subversion -E \*terminfo)" \
--header " Prefix:Alt :: 1:All/Folders :: 2:Git :: 3:Documents :: 4:Images :: 5:Videos" \ --header "  Prefix:Alt :: 1:All/Folders :: 2:Git :: 3:Documents :: 4:Images :: 5:Videos" \
--color="fg:#c0caf5,bg:#1a1b26,hl:#ff9e64" \ --height=100% --pointer=" " --ellipsis= --info=inline-right --header-first --scheme=path --algo=v2 --color="16" \
--color="fg+:#c0caf5,bg+:#292e42,hl+:#ff9e64" \ --preview-window "bottom,60%,border-top" --border=none --margin=5%,10%,5%,10% \
--color="info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff" \ --preview "fuz-preview {}")
--color="marker:#9ece6a,spinner:#9ece6a,header:#9ece6a" \
--height=100% --pointer=" " --ellipsis= --no-info --header-first --scheme=path --algo=v2 \ # --color="fg:#c0caf5,bg:#16161e,hl:#ff9e64" \
--preview-window "border-vertical" --border=horizontal) # --color="fg+:#c0caf5,bg+:#292e42,hl+:#ff9e64" \
# --color="info:#7aa2f7,prompt:#7dcfff,pointer:#7dcfff" \
# --color="marker:#9ece6a,spinner:#9ece6a,header:#9ece6a,border:#292e42" \
[ -n "$selection" ] && [ -n "$selection" ] &&
case $(file --mime-type "$(readlink -f "$selection")" -b) in case $(file --mime-type "$(readlink -f "$selection")" -b) in

View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
dwmc setlayoutex 2
search_dir="${1:-.}" search_dir="${1:-.}"
preview='bat --style=header,numbers --color=always {}' preview='bat --style=header,numbers --color=always {}'
@ -20,12 +22,15 @@ fzf_command="fzf \
--keep-right \ --keep-right \
--layout=reverse \ --layout=reverse \
--scheme=path \ --scheme=path \
--multi \ --multi --color=16 \
--preview=\"[[ -n {1} ]] && $preview\" \ --preview=\"[[ -n {1} ]] && $preview\" \
--preview-window='bottom,60%,border-top' \ --preview-window='bottom,60%,border-top' \
--scrollbar='▐' --info=hidden \ --scrollbar='▐' --info=inline-right \
--margin=5%,10%,5%,10% --border=none \ --margin=5%,10%,5%,10% --border=none \
--prompt='  ' --pointer=' ' --ellipsis='' " --prompt='  ' --pointer=' ' --ellipsis='' "
eval "$fd_command" | eval "$fzf_command" eval "$fd_command" | eval "$fzf_command"
dwmc setlayoutex 0
exit 0 exit 0

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
dwmc setlayoutex 2
rm -f /tmp/rg-fzf-{r,f} rm -f /tmp/rg-fzf-{r,f}
[ -d "$1" ] && SEARCH_DIR="$1" && shift || SEARCH_DIR="." [ -d "$1" ] && SEARCH_DIR="$1" && shift || SEARCH_DIR="."
@ -14,7 +16,7 @@ INITIAL_QUERY="${*:-}"
--bind "ctrl-t:transform:[[ ! \$FZF_PROMPT =~ ripgrep ]] && --bind "ctrl-t:transform:[[ ! \$FZF_PROMPT =~ ripgrep ]] &&
echo \"rebind(change)+change-prompt(ripgrep  )+disable-search+transform-query:echo {q} > /tmp/rg-fzf-f; cat /tmp/rg-fzf-r\" || echo \"rebind(change)+change-prompt(ripgrep  )+disable-search+transform-query:echo {q} > /tmp/rg-fzf-f; cat /tmp/rg-fzf-r\" ||
echo \"unbind(change)+change-prompt(fzf  )+enable-search+transform-query:echo {q} > /tmp/rg-fzf-r; cat /tmp/rg-fzf-f\"" \ echo \"unbind(change)+change-prompt(fzf  )+enable-search+transform-query:echo {q} > /tmp/rg-fzf-r; cat /tmp/rg-fzf-f\"" \
--margin=5%,10%,5%,10% --height=100% --reverse \ --margin=5%,10%,5%,10% --height=100% --reverse --color=16 --info=inline-right \
--scrollbar=▐ --keep-right --info=hidden --border=none --ellipsis= \ --scrollbar=▐ --keep-right --info=hidden --border=none --ellipsis= \
--prompt 'ripgrep  ' \ --prompt 'ripgrep  ' \
--delimiter : \ --delimiter : \
@ -23,4 +25,6 @@ INITIAL_QUERY="${*:-}"
--preview-window 'bottom,60%,border-top,+{2}+3/3,~1' \ --preview-window 'bottom,60%,border-top,+{2}+3/3,~1' \
--bind 'enter:become(nvim {1} +{2})' --bind 'enter:become(nvim {1} +{2})'
dwmc setlayoutex 0
# --color "hl:-1:underline,hl+:-1:underline:reverse" \ # --color "hl:-1:underline,hl+:-1:underline:reverse" \

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Scrpt for generating a colors.conf file using the xresources file to use as a kitty-colorscheme # Script for generating a colors.conf file using the xresources file to use as a kitty-colorscheme
# Colors from xresources # Colors from xresources
xresources_colors=("*.background" "*.foreground" "*.cursorColor" "*.color0" "*.color1" "*.color2" "*.color3" "*.color4" "*.color5" "*.color6" "*.color7" "*.color8" "*.color9" "*.color10" ".*color11" "*.color12" "*.color13" "*.color14" "*.color15") xresources_colors=("*.background" "*.foreground" "*.cursorColor" "*.color0" "*.color1" "*.color2" "*.color3" "*.color4" "*.color5" "*.color6" "*.color7" "*.color8" "*.color9" "*.color10" ".*color11" "*.color12" "*.color13" "*.color14" "*.color15")