1

Compare commits

...

4 Commits

4 changed files with 20 additions and 27 deletions

View File

@ -84,7 +84,7 @@
hyprland = {
enable = !headless;
dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
theme = "Foggy-Lake"; # TODO: Remove this in favor of color.lightScheme
wallpaper = "Foggy-Lake";
keybindings = {
main-mod = "SUPER";
@ -225,7 +225,6 @@
rofi = {
enable = !headless;
theme = "Foggy-Lake"; # TODO: Remove this in favor of color.lightScheme
};
waybar.enable = false; # Use hyprpanel
@ -234,7 +233,7 @@
};
manual = {
manpages.enable = true;
manpages.enable = nixosConfig.documentation.enable;
html.enable = false;
};

View File

@ -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;

View File

@ -1026,39 +1026,39 @@ in {
bubbles = ''
{
normal = {
a = { fg = "#${color.hex.base}", bg = "#${color.hex.lavender}", gui = "bold" },
a = { fg = "#${color.hex.bg}", 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.base}", bg = "#${color.hex.green}", gui = "bold" },
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" },
b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
},
visual = {
a = { fg = "#${color.hex.base}", bg = "#${color.hex.mauve}", gui = "bold" },
b = { fg = "#${color.hex.mauve}", bg = "#${color.hex.crust}" },
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.blue}", gui = "bold" },
b = { fg = "#${color.hex.blue}", bg = "#${color.hex.crust}" },
},
replace = {
a = { fg = "#${color.hex.base}", bg = "#${color.hex.red}", gui = "bold" },
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.red}", gui = "bold" },
b = { fg = "#${color.hex.red}", bg = "#${color.hex.crust}" },
},
-- terminal = {
-- a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
-- a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" },
-- b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
-- },
command = {
a = { fg = "#${color.hex.base}", bg = "#${color.hex.peach}", gui = "bold" },
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.peach}", gui = "bold" },
b = { fg = "#${color.hex.peach}", bg = "#${color.hex.crust}" },
},
inactive = {
a = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
a = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" },
c = { fg = "#${color.hex.text}", bg = "NONE" },
},
}
@ -1598,41 +1598,41 @@ in {
opts = {
line.__raw = ''
function(line)
local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
local bg = { fg = "#${color.hex.bg}", bg = "#${color.hex.bg}" }
local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
local lavender = { fg = "#${color.hex.lavender}", bg = "#${color.hex.lavender}" }
local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" }
local numtabs = vim.call("tabpagenr", "$")
return {
-- Head
{
{ " NEOVIM ", hl = { fg = "#${color.hex.base}", bg = "#${color.hex.lavender}", style = "bold" } },
{ " NEOVIM ", hl = { fg = "#${color.hex.bg}", bg = "#${color.hex.accent}", style = "bold" } },
-- The separator gets a foreground and background fill (each have fg + bg).
-- line.sep("", lavender, lavender),
-- line.sep("", accent, lavender),
},
-- Tabs
line.tabs().foreach(function(tab)
-- Switch out the start separator instead of the ending one because the last separator is different
local hl = tab.is_current() and { fg = "#${color.hex.lavender}", bg = "#${color.hex.crust}", style = "bold" } or text
local hl = tab.is_current() and { fg = "#${color.hex.accent}", bg = "#${color.hex.crust}", style = "bold" } or text
local sep_start = tab.number() == 1 and "" or ""
local sep_end = tab.number() == numtabs and "" or ""
return {
line.sep(sep_start, lavender, crust),
line.sep(sep_start, accent, crust),
tab.number(),
tab.name(),
line.sep(sep_end, crust, base),
line.sep(sep_end, crust, bg),
hl = hl,
margin = " ",
}
end),
-- Background
hl = base,
hl = bg,
}
end
'';

View File

@ -6,10 +6,4 @@
with lib;
with mylib.modules; {
enable = mkEnableOption "Rofi";
theme = mkOption {
type = types.str;
example = "Three-Bears";
description = "Color theme to use";
};
}