Compare commits
2 Commits
8660dab9d0
...
5b234344bc
Author | SHA1 | Date | |
---|---|---|---|
5b234344bc
|
|||
d90c5150cd
|
@ -6,7 +6,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) btop;
|
||||
inherit (config.modules) btop color;
|
||||
in {
|
||||
options.modules.btop = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
@ -18,98 +18,97 @@ in {
|
||||
then pkgs.btop-cuda
|
||||
else pkgs.btop;
|
||||
|
||||
# TODO: Use colors module
|
||||
themes = {
|
||||
# https://github.com/catppuccin/btop/tree/main
|
||||
catppuccin-latte = ''
|
||||
system-theme = ''
|
||||
# Main background, empty for terminal default, need to be empty if you want transparent background
|
||||
theme[main_bg]="#eff1f5"
|
||||
theme[main_bg]=${color.hexS.base}
|
||||
|
||||
# Main text color
|
||||
theme[main_fg]="#4c4f69"
|
||||
theme[main_fg]=${color.hexS.text}
|
||||
|
||||
# Title color for boxes
|
||||
theme[title]="#4c4f69"
|
||||
theme[title]=${color.hexS.text}
|
||||
|
||||
# Highlight color for keyboard shortcuts
|
||||
theme[hi_fg]="#1e66f5"
|
||||
theme[hi_fg]=${color.hexS.blue}
|
||||
|
||||
# Background color of selected item in processes box
|
||||
theme[selected_bg]="#bcc0cc"
|
||||
theme[selected_bg]=${color.hexS.surface1}
|
||||
|
||||
# Foreground color of selected item in processes box
|
||||
theme[selected_fg]="#1e66f5"
|
||||
theme[selected_fg]=${color.hexS.blue}
|
||||
|
||||
# Color of inactive/disabled text
|
||||
theme[inactive_fg]="#8c8fa1"
|
||||
theme[inactive_fg]=${color.hexS.overlay1}
|
||||
|
||||
# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
|
||||
theme[graph_text]="#dc8a78"
|
||||
theme[graph_text]=${color.hexS.rosewater}
|
||||
|
||||
# Background color of the percentage meters
|
||||
theme[meter_bg]="#bcc0cc"
|
||||
theme[meter_bg]=${color.hexS.surface1}
|
||||
|
||||
# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
|
||||
theme[proc_misc]="#dc8a78"
|
||||
theme[proc_misc]=${color.hexS.rosewater}
|
||||
|
||||
# CPU, Memory, Network, Proc box outline colors
|
||||
theme[cpu_box]="#8839ef" #Mauve
|
||||
theme[mem_box]="#40a02b" #Green
|
||||
theme[net_box]="#e64553" #Maroon
|
||||
theme[proc_box]="#1e66f5" #Blue
|
||||
theme[cpu_box]=${color.hexS.mauve} #Mauve
|
||||
theme[mem_box]=${color.hexS.green} #Green
|
||||
theme[net_box]=${color.hexS.maroon} #Maroon
|
||||
theme[proc_box]=${color.hexS.blue} #Blue
|
||||
|
||||
# Box divider line and small boxes line color
|
||||
theme[div_line]="#9ca0b0"
|
||||
theme[div_line]=${color.hexS.overlay0}
|
||||
|
||||
# Temperature graph color (Green -> Yellow -> Red)
|
||||
theme[temp_start]="#40a02b"
|
||||
theme[temp_mid]="#df8e1d"
|
||||
theme[temp_end]="#d20f39"
|
||||
theme[temp_start]=${color.hexS.green}
|
||||
theme[temp_mid]=${color.hexS.yellow}
|
||||
theme[temp_end]=${color.hexS.red}
|
||||
|
||||
# CPU graph colors (Teal -> Lavender)
|
||||
theme[cpu_start]="#179299"
|
||||
theme[cpu_mid]="#209fb5"
|
||||
theme[cpu_end]="#7287fd"
|
||||
theme[cpu_start]=${color.hexS.teal}
|
||||
theme[cpu_mid]=${color.hexS.sapphire}
|
||||
theme[cpu_end]=${color.hexS.lavender}
|
||||
|
||||
# Mem/Disk free meter (Mauve -> Lavender -> Blue)
|
||||
theme[free_start]="#8839ef"
|
||||
theme[free_mid]="#7287fd"
|
||||
theme[free_end]="#1e66f5"
|
||||
theme[free_start]=${color.hexS.mauve}
|
||||
theme[free_mid]=${color.hexS.lavender}
|
||||
theme[free_end]=${color.hexS.blue}
|
||||
|
||||
# Mem/Disk cached meter (Sapphire -> Lavender)
|
||||
theme[cached_start]="#209fb5"
|
||||
theme[cached_mid]="#1e66f5"
|
||||
theme[cached_end]="#7287fd"
|
||||
theme[cached_start]=${color.hexS.sapphire}
|
||||
theme[cached_mid]=${color.hexS.blue}
|
||||
theme[cached_end]=${color.hexS.lavender}
|
||||
|
||||
# Mem/Disk available meter (Peach -> Red)
|
||||
theme[available_start]="#fe640b"
|
||||
theme[available_mid]="#e64553"
|
||||
theme[available_end]="#d20f39"
|
||||
theme[available_start]=${color.hexS.peach}
|
||||
theme[available_mid]=${color.hexS.maroon}
|
||||
theme[available_end]=${color.hexS.red}
|
||||
|
||||
# Mem/Disk used meter (Green -> Sky)
|
||||
theme[used_start]="#40a02b"
|
||||
theme[used_mid]="#179299"
|
||||
theme[used_end]="#04a5e5"
|
||||
theme[used_start]=${color.hexS.green}
|
||||
theme[used_mid]=${color.hexS.teal}
|
||||
theme[used_end]=${color.hexS.sky}
|
||||
|
||||
# Download graph colors (Peach -> Red)
|
||||
theme[download_start]="#fe640b"
|
||||
theme[download_mid]="#e64553"
|
||||
theme[download_end]="#d20f39"
|
||||
theme[download_start]=${color.hexS.peach}
|
||||
theme[download_mid]=${color.hexS.maroon}
|
||||
theme[download_end]=${color.hexS.red}
|
||||
|
||||
# Upload graph colors (Green -> Sky)
|
||||
theme[upload_start]="#40a02b"
|
||||
theme[upload_mid]="#179299"
|
||||
theme[upload_end]="#04a5e5"
|
||||
theme[upload_start]=${color.hexS.green}
|
||||
theme[upload_mid]=${color.hexS.teal}
|
||||
theme[upload_end]=${color.hexS.sky}
|
||||
|
||||
# Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
|
||||
theme[process_start]="#209fb5"
|
||||
theme[process_mid]="#7287fd"
|
||||
theme[process_end]="#8839ef"
|
||||
theme[process_start]=${color.hexS.sapphire}
|
||||
theme[process_mid]=${color.hexS.lavender}
|
||||
theme[process_end]=${color.hexS.mauve}
|
||||
'';
|
||||
};
|
||||
|
||||
settings = {
|
||||
color_theme = "catppuccin-latte";
|
||||
color_theme = "system-theme";
|
||||
truecolor = true;
|
||||
vim_keys = true;
|
||||
rounded_corners = true;
|
||||
|
@ -19,7 +19,7 @@ in {
|
||||
fish_color_param ${color.hex.flamingo}
|
||||
fish_color_keyword ${color.hex.red}
|
||||
fish_color_quote ${color.hex.green}
|
||||
fish_color_redirection ${color.hex.accentHL}
|
||||
fish_color_redirection ${color.hex.accentHl}
|
||||
fish_color_end ${color.hex.peach}
|
||||
fish_color_comment ${color.hex.overlay1}
|
||||
fish_color_error ${color.hex.red}
|
||||
@ -27,7 +27,7 @@ in {
|
||||
fish_color_selection --background=${color.hex.surface0}
|
||||
fish_color_search_match --background=${color.hex.surface0}
|
||||
fish_color_option ${color.hex.green}
|
||||
fish_color_operator ${color.hex.accentHL}
|
||||
fish_color_operator ${color.hex.accentHl}
|
||||
fish_color_escape ${color.hex.maroon}
|
||||
fish_color_autosuggestion ${color.hex.overlay0}
|
||||
fish_color_cancel ${color.hex.red}
|
||||
@ -37,7 +37,7 @@ in {
|
||||
fish_color_host_remote ${color.hex.green}
|
||||
fish_color_status ${color.hex.red}
|
||||
fish_pager_color_progress ${color.hex.overlay0}
|
||||
fish_pager_color_prefix ${color.hex.accentHL}
|
||||
fish_pager_color_prefix ${color.hex.accentHl}
|
||||
fish_pager_color_completion ${color.hex.text}
|
||||
fish_pager_color_description ${color.hex.overlay0}
|
||||
'';
|
||||
@ -245,7 +245,7 @@ in {
|
||||
palettes."nixos-palette" = {
|
||||
rosewater = color.hexS.rosewater;
|
||||
flamingo = color.hexS.flamingo;
|
||||
pink = color.hexS.accentHL;
|
||||
pink = color.hexS.accentHl;
|
||||
mauve = color.hexS.accent;
|
||||
red = color.hexS.red;
|
||||
maroon = color.hexS.maroon;
|
||||
|
@ -211,7 +211,7 @@ in {
|
||||
enable = true;
|
||||
settings = {
|
||||
options = {
|
||||
background = "${color.hex.bg}";
|
||||
background = "${color.hex.base}";
|
||||
overlay = true;
|
||||
overlay_font = "${color.font}:12";
|
||||
overlay_background_color = "${color.hex.accent}";
|
||||
@ -400,7 +400,7 @@ in {
|
||||
border_size = 2;
|
||||
|
||||
"col.active_border" = "rgb(${color.hex.accent})";
|
||||
"col.inactive_border" = "rgb(${color.hex.bg})";
|
||||
"col.inactive_border" = "rgb(${color.hex.base})";
|
||||
};
|
||||
|
||||
group = {
|
||||
@ -411,11 +411,11 @@ in {
|
||||
gradients = false;
|
||||
|
||||
"col.active" = "rgb(${color.hex.accent})";
|
||||
"col.inactive" = "rgb(${color.hex.bg})";
|
||||
"col.inactive" = "rgb(${color.hex.base})";
|
||||
};
|
||||
|
||||
"col.border_active" = "rgb(${color.hex.accent})";
|
||||
"col.border_inactive" = "rgb(${color.hex.bg})";
|
||||
"col.border_inactive" = "rgb(${color.hex.base})";
|
||||
};
|
||||
|
||||
input = {
|
||||
|
@ -71,7 +71,7 @@ in {
|
||||
};
|
||||
|
||||
# https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/index.ts
|
||||
"theme.bar.background" = "#${color.hex.bg}";
|
||||
"theme.bar.background" = "#${color.hex.base}";
|
||||
"theme.bar.border.color" = "#${color.hex.accent}";
|
||||
"theme.bar.border.location" = "full";
|
||||
"theme.bar.border_radius" = "6px";
|
||||
@ -82,7 +82,7 @@ in {
|
||||
"theme.bar.margin_bottom" = "0px";
|
||||
"theme.bar.margin_sides" = "10px";
|
||||
"theme.bar.margin_top" = "10px";
|
||||
"theme.bar.opacity" = 60;
|
||||
"theme.bar.opacity" = 80;
|
||||
"theme.bar.outer_spacing" = "0px"; # NOTE: Left/Right bar padding
|
||||
"theme.bar.transparent" = false;
|
||||
|
||||
@ -123,17 +123,17 @@ in {
|
||||
"bar.workspaces.workspaces" = 9;
|
||||
|
||||
# https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/workspaces.ts
|
||||
"theme.bar.buttons.workspaces.active" = "#${color.hex.accentHL}";
|
||||
"theme.bar.buttons.workspaces.active" = "#${color.hex.accentHl}";
|
||||
"theme.bar.buttons.workspaces.available" = "#${color.hex.accentText}";
|
||||
"theme.bar.buttons.workspaces.background" = "#${color.hex.accent}";
|
||||
"theme.bar.buttons.workspaces.border" = "#${color.hex.accent}";
|
||||
"theme.bar.buttons.workspaces.enableBorder" = false;
|
||||
"theme.bar.buttons.workspaces.fontSize" = "18px";
|
||||
"theme.bar.buttons.workspaces.hover" = "#${color.hex.accentHL}";
|
||||
"theme.bar.buttons.workspaces.hover" = "#${color.hex.accentHl}";
|
||||
"theme.bar.buttons.workspaces.numbered_active_highlight_border" = "4px"; # border radius
|
||||
"theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = "#${color.hex.accentText}";
|
||||
"theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "6px";
|
||||
"theme.bar.buttons.workspaces.numbered_active_underline_color" = "#${color.hex.accentHL}";
|
||||
"theme.bar.buttons.workspaces.numbered_active_underline_color" = "#${color.hex.accentHl}";
|
||||
"theme.bar.buttons.workspaces.numbered_inactive_padding" = "6px"; # make the same as numbered_active_highlight_padding to avoid layout jumping
|
||||
"theme.bar.buttons.workspaces.occupied" = "#${color.hex.accentText}";
|
||||
"theme.bar.buttons.workspaces.smartHighlight" = "false";
|
||||
@ -307,7 +307,7 @@ in {
|
||||
# TODO: Menus Config
|
||||
#
|
||||
|
||||
"theme.bar.menus.background" = "#${color.hex.bg}";
|
||||
"theme.bar.menus.background" = "#${color.hex.base}";
|
||||
"theme.bar.menus.border.color" = "#${color.hex.accent}";
|
||||
"theme.bar.menus.border.radius" = "6px";
|
||||
"theme.bar.menus.border.size" = "2px";
|
||||
|
@ -1042,39 +1042,39 @@ in {
|
||||
bubbles = ''
|
||||
{
|
||||
normal = {
|
||||
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.accent}", gui = "bold" },
|
||||
a = { fg = "#${color.hex.base}", bg = "#${color.hex.accent}", gui = "bold" },
|
||||
b = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" },
|
||||
c = { fg = "#${color.hex.text}", bg = "NONE" },
|
||||
},
|
||||
|
||||
insert = {
|
||||
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" },
|
||||
a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
|
||||
b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
|
||||
},
|
||||
|
||||
visual = {
|
||||
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.blue}", gui = "bold" },
|
||||
a = { fg = "#${color.hex.base}", bg = "#${color.hex.blue}", gui = "bold" },
|
||||
b = { fg = "#${color.hex.blue}", bg = "#${color.hex.crust}" },
|
||||
},
|
||||
|
||||
replace = {
|
||||
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.red}", gui = "bold" },
|
||||
a = { fg = "#${color.hex.base}", bg = "#${color.hex.red}", gui = "bold" },
|
||||
b = { fg = "#${color.hex.red}", bg = "#${color.hex.crust}" },
|
||||
},
|
||||
|
||||
-- terminal = {
|
||||
-- a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" },
|
||||
-- a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
|
||||
-- b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
|
||||
-- },
|
||||
|
||||
command = {
|
||||
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.peach}", gui = "bold" },
|
||||
a = { fg = "#${color.hex.base}", bg = "#${color.hex.peach}", gui = "bold" },
|
||||
b = { fg = "#${color.hex.peach}", bg = "#${color.hex.crust}" },
|
||||
},
|
||||
|
||||
inactive = {
|
||||
a = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" },
|
||||
b = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" },
|
||||
a = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
|
||||
b = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
|
||||
c = { fg = "#${color.hex.text}", bg = "NONE" },
|
||||
},
|
||||
}
|
||||
@ -1614,7 +1614,7 @@ in {
|
||||
opts = {
|
||||
line.__raw = ''
|
||||
function(line)
|
||||
local bg = { fg = "#${color.hex.bg}", bg = "#${color.hex.bg}" }
|
||||
local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
|
||||
local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
|
||||
local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
|
||||
local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" }
|
||||
@ -1624,7 +1624,7 @@ in {
|
||||
return {
|
||||
-- Head
|
||||
{
|
||||
{ " NEOVIM ", hl = { fg = "#${color.hex.bg}", bg = "#${color.hex.accent}", style = "bold" } },
|
||||
{ " NEOVIM ", hl = { fg = "#${color.hex.base}", bg = "#${color.hex.accent}", style = "bold" } },
|
||||
|
||||
-- The separator gets a foreground and background fill (each have fg + bg).
|
||||
-- line.sep("", accent, lavender),
|
||||
@ -1641,7 +1641,7 @@ in {
|
||||
line.sep(sep_start, accent, crust),
|
||||
tab.number(),
|
||||
tab.name(),
|
||||
line.sep(sep_end, crust, bg),
|
||||
line.sep(sep_end, crust, base),
|
||||
hl = hl,
|
||||
margin = " ",
|
||||
}
|
||||
|
@ -51,12 +51,12 @@ in {
|
||||
};
|
||||
|
||||
"window" = {
|
||||
height = "50%";
|
||||
width = "33%";
|
||||
height = mkLiteral "50%";
|
||||
width = mkLiteral "33%";
|
||||
border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
|
||||
border-radius = 6;
|
||||
border-color = mkLiteral color.hexS.accent;
|
||||
background-color = mkLiteral "rgba(${color.rgbS.bg}, 0.2)";
|
||||
background-color = mkLiteral "rgba(${color.rgbS.base}, 0.2)";
|
||||
};
|
||||
|
||||
"mainbox" = {
|
||||
@ -85,7 +85,7 @@ in {
|
||||
};
|
||||
|
||||
"prompt" = {
|
||||
background-color = mkLiteral color.hexS.accentHL;
|
||||
background-color = mkLiteral color.hexS.accentHl;
|
||||
padding = 6;
|
||||
text-color = mkLiteral color.hexS.accentText;
|
||||
border-radius = 3;
|
||||
@ -99,7 +99,7 @@ in {
|
||||
background-color = mkLiteral trans;
|
||||
border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
|
||||
border-radius = 3;
|
||||
border-color = mkLiteral color.hexS.accentHL;
|
||||
border-color = mkLiteral color.hexS.accentHl;
|
||||
};
|
||||
|
||||
"listview" = {
|
||||
@ -110,7 +110,7 @@ in {
|
||||
background-color = mkLiteral trans;
|
||||
border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
|
||||
border-radius = 3;
|
||||
border-color = mkLiteral color.hexS.accentHL;
|
||||
border-color = mkLiteral color.hexS.accentHl;
|
||||
};
|
||||
|
||||
"element" = {
|
||||
@ -126,7 +126,7 @@ in {
|
||||
};
|
||||
|
||||
"element selected" = {
|
||||
background-color = mkLiteral color.hexS.accentHL;
|
||||
background-color = mkLiteral color.hexS.accentHl;
|
||||
text-color = mkLiteral color.hexS.accentText;
|
||||
};
|
||||
};
|
||||
@ -176,7 +176,7 @@ in {
|
||||
in
|
||||
mylib.rofi.mkSimpleMenu
|
||||
"wall"
|
||||
(config.modules.hyprland.wallpapers
|
||||
(color.wallpapers
|
||||
|> builtins.map (setWallpaperOnMonitors monitors)
|
||||
|> lib.mergeAttrsList);
|
||||
in {
|
||||
|
@ -25,12 +25,12 @@ in {
|
||||
window-title-home-tilde = statusbar-home-tilde;
|
||||
|
||||
# Colorscheme
|
||||
default-bg = "#${color.hex.bg}";
|
||||
default-bg = "#${color.hex.base}";
|
||||
default-fg = "#${color.hex.text}";
|
||||
|
||||
highlight-color = "rgba(${color.rgbS.accent}, 0.5)";
|
||||
highlight-fg = "rgba(${color.rgbS.accentText}, 0.5)";
|
||||
highlight-active-color = "rgba(${color.rgbS.accentHL}, 0.5)";
|
||||
highlight-active-color = "rgba(${color.rgbS.accentHl}, 0.5)";
|
||||
|
||||
statusbar-bg = "#${color.hex.accent}";
|
||||
statusbar-fg = "#${color.hex.accentText}";
|
||||
@ -38,7 +38,7 @@ in {
|
||||
inputbar-bg = statusbar-bg;
|
||||
inputbar-fg = statusbar-fg;
|
||||
|
||||
completion-bg = "#${color.hex.bg}";
|
||||
completion-bg = "#${color.hex.base}";
|
||||
completion-fg = default-fg;
|
||||
completion-highlight-bg = statusbar-bg;
|
||||
completion-highlight-fg = statusbar-fg;
|
||||
|
Reference in New Issue
Block a user