This commit is contained in:
Hadi
2024-10-05 11:48:16 +02:00
parent 270c1b959e
commit 23dcfd5290
14 changed files with 531 additions and 298 deletions

View File

@@ -1,9 +0,0 @@
{
programs.btop = {
enable = true;
settings = {
color_theme = "Default";
theme_background = false;
};
};
}

View File

@@ -1,13 +0,0 @@
{ config, ... }: {
programs.cava = {
enable = true;
settings = {
general.framerate = 60;
smoothing.noise_reduction = 88;
color = {
background = "'#${config.var.theme.colors.bg}'";
foreground = "'#${config.var.theme.colors.accent}'";
};
};
};
}

View File

@@ -24,34 +24,6 @@
cursor_shape = "Underline";
cursor_underline_thickness = config.var.theme.border-size;
window_padding_width = config.var.theme.gaps-in;
# Font
font_family = config.var.theme.font-mono;
font_size = config.var.theme.font-size;
# Colors
background = "#" + config.var.theme.colors.bg;
url_color = "#" + config.var.theme.colors.accent;
color0 = "#" + config.var.theme.colors.c0;
color8 = "#" + config.var.theme.colors.c8;
color1 = "#" + config.var.theme.colors.c1;
color9 = "#" + config.var.theme.colors.c9;
color2 = "#" + config.var.theme.colors.c2;
color10 = "#" + config.var.theme.colors.c10;
color3 = "#" + config.var.theme.colors.c3;
color11 = "#" + config.var.theme.colors.c11;
color4 = "#" + config.var.theme.colors.c4;
color12 = "#" + config.var.theme.colors.c12;
color5 = "#" + config.var.theme.colors.c5;
color13 = "#" + config.var.theme.colors.c13;
color6 = "#" + config.var.theme.colors.c6;
color14 = "#" + config.var.theme.colors.c14;
color7 = "#" + config.var.theme.colors.c7;
color15 = "#" + config.var.theme.colors.c15;
cursor = "#" + config.var.theme.colors.fg;
cursor_text_color = "#" + config.var.theme.colors.bg;
selection_foreground = "#" + config.var.theme.colors.accentFg;
selection_background = "#" + config.var.theme.colors.accent;
};
};
}

View File

@@ -1,47 +1,47 @@
{
programs.nixvim = {
colorschemes = {
catppuccin = {
enable = true;
settings = {
background = {
light = "macchiato";
dark = "mocha";
};
flavour =
"mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code
disable_bold = false;
disable_italic = false;
disable_underline = false;
transparent_background = true;
term_colors = true;
integrations = {
cmp = true;
noice = true;
notify = true;
neotree = true;
harpoon = true;
gitsigns = true;
which_key = true;
illuminate = { enabled = true; };
treesitter = true;
treesitter_context = true;
telescope.enabled = true;
indent_blankline.enabled = true;
mini.enabled = true;
native_lsp = {
enabled = true;
inlay_hints = { background = true; };
underlines = {
errors = [ "underline" ];
hints = [ "underline" ];
information = [ "underline" ];
warnings = [ "underline" ];
};
};
};
};
};
};
# colorschemes = {
# catppuccin = {
# enable = true;
# settings = {
# background = {
# light = "macchiato";
# dark = "mocha";
# };
# flavour =
# "mocha"; # "latte", "mocha", "frappe", "macchiato" or raw lua code
# disable_bold = false;
# disable_italic = false;
# disable_underline = false;
# transparent_background = true;
# term_colors = true;
# integrations = {
# cmp = true;
# noice = true;
# notify = true;
# neotree = true;
# harpoon = true;
# gitsigns = true;
# which_key = true;
# illuminate = { enabled = true; };
# treesitter = true;
# treesitter_context = true;
# telescope.enabled = true;
# indent_blankline.enabled = true;
# mini.enabled = true;
# native_lsp = {
# enabled = true;
# inlay_hints = { background = true; };
# underlines = {
# errors = [ "underline" ];
# hints = [ "underline" ];
# information = [ "underline" ];
# warnings = [ "underline" ];
# };
# };
# };
# };
# };
# };
};
}

View File

@@ -117,88 +117,88 @@ in {
};
colors = {
tabs = {
odd.bg = "#${config.var.theme.colors.bg}";
odd.fg = "#${config.var.theme.colors.fg}";
even.bg = "#${config.var.theme.colors.bg}";
even.fg = "#${config.var.theme.colors.fg}";
selected = {
odd = {
bg = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}";
};
even = {
bg = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}";
};
};
indicator = {
error = "#${config.var.theme.colors.c1}";
start = "#${config.var.theme.colors.bgalt}";
stop = "#${config.var.theme.colors.bgalt}";
};
};
hints = {
bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}";
match.fg = "#${config.var.theme.colors.bg}";
};
completion = {
category = {
bg = "#${config.var.theme.colors.bg}";
fg = "#${config.var.theme.colors.fg}";
border = {
top = "#${config.var.theme.colors.bg}";
bottom = "#${config.var.theme.colors.bg}";
};
};
odd.bg = "#${config.var.theme.colors.bg}";
even.bg = "#${config.var.theme.colors.bg}";
fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
match.fg = "#${config.var.theme.colors.accent}";
item.selected = {
bg = "#${config.var.theme.colors.accent}";
border.top = "#${config.var.theme.colors.accent}";
border.bottom = "#${config.var.theme.colors.accent}";
fg = "#${config.var.theme.colors.accentFg}";
match.fg = "#${config.var.theme.colors.accentFg}";
};
};
statusbar = {
normal.bg = "#${config.var.theme.colors.bg}";
normal.fg = "#${config.var.theme.colors.fg}";
private.bg = "#${config.var.theme.colors.bg}";
private.fg = "#${config.var.theme.colors.fg}";
insert.bg = "#${config.var.theme.colors.accent}";
insert.fg = "#${config.var.theme.colors.accentFg}";
command = {
bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}";
private.bg = "#${config.var.theme.colors.bgalt}";
private.fg = "#${config.var.theme.colors.fgalt}";
};
};
messages = {
info = {
bg = "#${config.var.theme.colors.bgalt}";
fg = "#${config.var.theme.colors.fgalt}";
border = "#${config.var.theme.colors.bgalt}";
};
error = {
bg = "#${config.var.theme.colors.c1}";
fg = "#${config.var.theme.colors.fgalt}";
border = "#${config.var.theme.colors.c1}";
};
};
# tabs = {
# odd.bg = "#${config.var.theme.colors.bg}";
# odd.fg = "#${config.var.theme.colors.fg}";
# even.bg = "#${config.var.theme.colors.bg}";
# even.fg = "#${config.var.theme.colors.fg}";
# selected = {
# odd = {
# bg = "#${config.var.theme.colors.accent}";
# fg = "#${config.var.theme.colors.accentFg}";
# };
# even = {
# bg = "#${config.var.theme.colors.accent}";
# fg = "#${config.var.theme.colors.accentFg}";
# };
# };
# indicator = {
# error = "#${config.var.theme.colors.c1}";
# start = "#${config.var.theme.colors.bgalt}";
# stop = "#${config.var.theme.colors.bgalt}";
# };
# };
#
# hints = {
# bg = "#${config.var.theme.colors.bgalt}";
# fg = "#${config.var.theme.colors.fgalt}";
# match.fg = "#${config.var.theme.colors.bg}";
# };
#
# completion = {
# category = {
# bg = "#${config.var.theme.colors.bg}";
# fg = "#${config.var.theme.colors.fg}";
# border = {
# top = "#${config.var.theme.colors.bg}";
# bottom = "#${config.var.theme.colors.bg}";
# };
# };
#
# odd.bg = "#${config.var.theme.colors.bg}";
# even.bg = "#${config.var.theme.colors.bg}";
#
# fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
#
# match.fg = "#${config.var.theme.colors.accent}";
#
# item.selected = {
# bg = "#${config.var.theme.colors.accent}";
# border.top = "#${config.var.theme.colors.accent}";
# border.bottom = "#${config.var.theme.colors.accent}";
# fg = "#${config.var.theme.colors.accentFg}";
# match.fg = "#${config.var.theme.colors.accentFg}";
# };
# };
#
# statusbar = {
# normal.bg = "#${config.var.theme.colors.bg}";
# normal.fg = "#${config.var.theme.colors.fg}";
# private.bg = "#${config.var.theme.colors.bg}";
# private.fg = "#${config.var.theme.colors.fg}";
# insert.bg = "#${config.var.theme.colors.accent}";
# insert.fg = "#${config.var.theme.colors.accentFg}";
# command = {
# bg = "#${config.var.theme.colors.bgalt}";
# fg = "#${config.var.theme.colors.fgalt}";
# private.bg = "#${config.var.theme.colors.bgalt}";
# private.fg = "#${config.var.theme.colors.fgalt}";
# };
# };
#
# messages = {
# info = {
# bg = "#${config.var.theme.colors.bgalt}";
# fg = "#${config.var.theme.colors.fgalt}";
# border = "#${config.var.theme.colors.bgalt}";
# };
#
# error = {
# bg = "#${config.var.theme.colors.c1}";
# fg = "#${config.var.theme.colors.fgalt}";
# border = "#${config.var.theme.colors.c1}";
# };
# };
#webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
webpage.preferred_color_scheme =
@@ -207,7 +207,7 @@ in {
statusbar.show = "in-mode";
fonts = { default_family = "${config.var.theme.font}"; };
# fonts = { default_family = "${config.var.theme.font}"; };
completion = {
height = "30%";
@@ -236,7 +236,7 @@ in {
};
hints = {
border = "none";
# border = "none";
radius = 1;
};

View File

@@ -2,14 +2,14 @@
programs.fzf = {
enable = true;
enableZshIntegration = true;
colors = {
"fg+" = config.var.theme.colors.accentName;
"bg+" = "-1";
"fg" = "white";
"bg" = "-1";
"prompt" = "grey";
"pointer" = config.var.theme.colors.accentName;
};
# colors = {
# "fg+" = config.var.theme.colors.accentName;
# "bg+" = "-1";
# "fg" = "white";
# "bg" = "-1";
# "prompt" = "grey";
# "pointer" = config.var.theme.colors.accentName;
# };
defaultOptions = [
"--margin=1"
"--layout=reverse"

View File

@@ -7,26 +7,7 @@ in {
builtins.elem (lib.getName pkg) [ "spotify" ];
programs.spicetify = {
enable = true;
theme = spicePkgs.themes.text;
colorScheme = "custom";
customColorScheme = {
text = "${config.var.theme.colors.fg}";
subtext = "${config.var.theme.colors.fgalt}";
sidebar-text = "${config.var.theme.colors.fgalt}";
main = "${config.var.theme.colors.bg}";
sidebar = "${config.var.theme.colors.bg}";
background = "${config.var.theme.colors.bg}";
player = "${config.var.theme.colors.bg}";
card = "${config.var.theme.colors.bg}";
shadow = "000000";
selected-row = "${config.var.theme.colors.bgalt}";
button = "${config.var.theme.colors.accent}";
button-active = "${config.var.theme.colors.accent}";
button-disabled = "${config.var.theme.colors.bgalt}";
tab-active = "${config.var.theme.colors.accent}";
misc = "${config.var.theme.colors.fgalt}";
};
theme = lib.mkForce spicePkgs.themes.text;
enabledExtensions = with spicePkgs.extensions; [
playlistIcons

View File

@@ -147,8 +147,8 @@
gaps_in = config.var.theme.gaps-in;
gaps_out = config.var.theme.gaps-out;
border_size = config.var.theme.border-size;
"col.active_border" = "rgba(${config.var.theme.colors.accent}ff)";
"col.inactive_border" = "rgba(00000055)";
# "col.active_border" = "rgba(${config.var.theme.colors.accent}ff)";
# "col.inactive_border" = "rgba(00000055)";
border_part_of_window = true;
layout = "master";
};
@@ -160,7 +160,7 @@
drop_shadow = true;
shadow_range = 20;
shadow_render_power = 3;
"col.shadow" = "rgba(00000055)";
# "col.shadow" = "rgba(00000055)";
blur = { enabled = if config.var.theme.blur then "true" else "false"; };
};

View File

@@ -33,66 +33,66 @@
key_exit = "Escape";
};
style = ''
/** ********** Fonts ********** **/
* {
font-family: "${config.var.theme.font}";
font-weight: 500;
font-size: ${toString config.var.theme.font-size}px;
}
#window {
background-color: #${config.var.theme.colors.bgalt};
color: #${config.var.theme.colors.fgalt};
border-radius: ${toString config.var.theme.rounding}px;
}
#outer-box {
padding: 20px;
}
#input {
background-color: #${config.var.theme.colors.bg};
border: 0px solid #${config.var.theme.colors.accent};
padding: 8px 12px;
}
#scroll {
margin-top: 20px;
}
#inner-box {}
#img {
padding-right: 8px;
}
#text {
color: #${config.var.theme.colors.c7};
}
#text:selected {
color: #${config.var.theme.colors.fg};
}
#entry {
padding: 6px;
}
#entry:selected {
background-color: #${config.var.theme.colors.accent};
color: #${config.var.theme.colors.accentFg};
}
#unselected {}
#selected {}
#input,
#entry:selected {
border-radius: ${toString config.var.theme.rounding}px;
}
'';
# style = ''
# /** ********** Fonts ********** **/
#
# * {
# font-family: "${config.var.theme.font}";
# font-weight: 500;
# font-size: ${toString config.var.theme.font-size}px;
# }
#
# #window {
# background-color: #${config.var.theme.colors.bgalt};
# color: #${config.var.theme.colors.fgalt};
# border-radius: ${toString config.var.theme.rounding}px;
# }
#
# #outer-box {
# padding: 20px;
# }
#
# #input {
# background-color: #${config.var.theme.colors.bg};
# border: 0px solid #${config.var.theme.colors.accent};
# padding: 8px 12px;
# }
#
# #scroll {
# margin-top: 20px;
# }
#
# #inner-box {}
#
# #img {
# padding-right: 8px;
# }
#
# #text {
# color: #${config.var.theme.colors.c7};
# }
#
# #text:selected {
# color: #${config.var.theme.colors.fg};
# }
#
# #entry {
# padding: 6px;
# }
#
# #entry:selected {
# background-color: #${config.var.theme.colors.accent};
# color: #${config.var.theme.colors.accentFg};
# }
#
# #unselected {}
#
# #selected {}
#
# #input,
# #entry:selected {
# border-radius: ${toString config.var.theme.rounding}px;
# }
# '';
};
}