ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix-colors): config.colorscheme.colors -> config.colorscheme.palette

Browse source
This commit is contained in:
ooks-io 2024-05-19 17:12:40 +12:00
parent 58447dcf84
commit 5f3c9de7e7
21 changed files with 282 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

28
inputs/home/modules/desktop/wayland/bar/waybar/default.nix
View file

@ -1,10 +1,10 @@
{ config, lib, pkgs, inputs, ... }:
{ config, lib, pkgs, ... }:
let
fonts = config.homeModules.theme.fonts;
cfg = config.homeModules.desktop.wayland.bar.waybar;
monitorWidth = (lib.head config.monitors).width - 20;
inherit (config.colorscheme) colors;
inherit (config.colorscheme) palette;
in
{
@ -81,7 +81,7 @@ in
* {
font-family: "${fonts.monospace.family}";
font-size: 19px;
border: solid #${colors.base05};
border: solid #${palette.base05};
}
window#waybar {
@ -92,32 +92,32 @@ in
#clock,
#battery,
#workspaces {
background-color: #${colors.base00};
background-color: #${palette.base00};
padding-right: 10px;
}
#clock {
padding-left: 10px;
border: 2px solid #${colors.base05};
border: 2px solid #${palette.base05};
border-right: 0px;
border-top-left-radius: 10px;
}
#battery {
padding-left: 10px;
border-top: 2px solid #${colors.base05};
border-bottom: 2px solid #${colors.base05};
border-top: 2px solid #${palette.base05};
border-bottom: 2px solid #${palette.base05};
border-left: 0px;
}
#battery.good {
color: #${colors.base0B};
color: #${palette.base0B};
}
#battery.warning {
color: #${colors.base0A};
color: #${palette.base0A};
}
#battery.critical {
color: #${colors.base08};
color: #${palette.base08};
}
#tray {
@ -128,7 +128,7 @@ in
}
#workspaces {
border: 2px solid #${colors.base05};
border: 2px solid #${palette.base05};
border-left: 0;
border-top-right-radius: 10px;
}
@ -136,15 +136,15 @@ in
#workspace button,
#workspaces button.active,
#workspaces button.visible {
color: #${colors.base0B};
color: #${palette.base0B};
}
#workspaces button.urgent {
color: #${colors.base08};
color: #${palette.base08};
}
#custom-hyprrecord {
color: #${colors.base08};
color: #${palette.base08};
padding-right: 20px;
}
'';

10
inputs/home/modules/desktop/wayland/launcher/rofi/default.nix
View file

@ -13,14 +13,14 @@ in
package = pkgs.rofi-wayland;
terminal = "${config.home.sessionVariables.TERMINAL}";
theme = let
inherit (config.colorscheme ) colors;
inherit (config.colorscheme ) palette;
inherit (config.lib.formats.rasi) mkLiteral;
in {
"*" = {
background = mkLiteral "#${colors.base00}";
foreground = mkLiteral "#${colors.base05}";
selected = mkLiteral "#${colors.base0B}";
message = mkLiteral "#${colors.base0D}";
background = mkLiteral "#${palette.base00}";
foreground = mkLiteral "#${palette.base05}";
selected = mkLiteral "#${palette.base0B}";
message = mkLiteral "#${palette.base0D}";
background-color = mkLiteral "@background";
border-color = mkLiteral "@foreground";

12
inputs/home/modules/desktop/wayland/launcher/tofi/default.nix
View file

@ -3,7 +3,7 @@
let
cfg = config.homeModules.desktop.wayland.launcher.tofi;
fonts = config.homeModules.theme.fonts;
inherit (config.colorscheme) colors;
inherit (config.colorscheme) palette;
in
{
@ -30,11 +30,11 @@ in
prompt-text = " "
background-color = #0000
prompt-background = #0000
prompt-color = ${colors.base0B}
input-color = ${colors.base05}
placeholder-color = ${colors.base03}
default-result-color = ${colors.base03}
selection-color = ${colors.base04}
prompt-color = ${palette.base0B}
input-color = ${palette.base05}
placeholder-color = ${palette.base03}
default-result-color = ${palette.base03}
selection-color = ${palette.base04}
'';
};

14
inputs/home/modules/desktop/wayland/lockscreen/hyprlock/default.nix
View file

@ -3,7 +3,7 @@
let
cfg = config.homeModules.desktop.wayland.lockscreen.hyprlock;
fonts = config.homeModules.theme.fonts;
inherit (config.colorscheme) colors;
inherit (config.colorscheme) palette;
in
{
@ -25,7 +25,7 @@ in
{
monitor = "";
path = "";
color = "0xff${colors.base01}";
color = "0xff${palette.base01}";
}
];
input-fields = [
@ -42,9 +42,9 @@ in
dots_spacing = 0.2;
fade_on_empty = false;
placeholder_text = "";
outer_color = "0xff${colors.base02}";
inner_color = "0xff${colors.base00}";
font_color = "0xff${colors.base05}";
outer_color = "0xff${palette.base02}";
inner_color = "0xff${palette.base00}";
font_color = "0xff${palette.base05}";
}
];
labels = [
@ -55,7 +55,7 @@ in
x = 0;
y = 80;
};
color = "0xff${colors.base08}";
color = "0xff${palette.base08}";
font_size = 30;
font_family = "${fonts.monospace.family}";
}
@ -66,7 +66,7 @@ in
x = 0;
y = -80;
};
color = "0xff${colors.base0B}";
color = "0xff${palette.base0B}";
font_size = 20;
font_family = "${fonts.monospace.family}";
}

40
inputs/home/modules/desktop/wayland/lockscreen/swaylock/default.nix
View file

@ -1,7 +1,7 @@
{ config, lib, ... }:
let
inherit (config.colorscheme) colors;
inherit (config.colorscheme) palette;
fonts = config.homeModules.theme.fonts;
wallpaperPath = config.homeModules.theme.wallpaper.path;
cfg = config.homeModules.desktop.wayland.lockscreen.swaylock;
@ -14,25 +14,25 @@ in
settings = {
image = "${wallpaperPath}";
font = fonts.monospace.family;
color = "#${colors.base01}";
ring-color = "#${colors.base02}";
inside-wrong-color = "#${colors.base08}";
ring-wrong-color = "#${colors.base08}";
key-hl-color = "#${colors.base0B}";
bs-hl-color = "#${colors.base08}";
ring-ver-color = "#${colors.base09}";
inside-ver-color = "#${colors.base09}";
inside-color = "#${colors.base01}";
text-color = "#${colors.base07}";
text-clear-color = "#${colors.base01}";
text-ver-color = "#${colors.base01}";
text-wrong-color = "#${colors.base01}";
text-caps-lock-color = "#${colors.base07}";
inside-clear-color = "#${colors.base0C}";
ring-clear-color = "#${colors.base0C}";
inside-caps-lock-color = "#${colors.base09}";
ring-caps-lock-color = "#${colors.base02}";
separator-color = "#${colors.base02}";
color = "#${palette.base01}";
ring-color = "#${palette.base02}";
inside-wrong-color = "#${palette.base08}";
ring-wrong-color = "#${palette.base08}";
key-hl-color = "#${palette.base0B}";
bs-hl-color = "#${palette.base08}";
ring-ver-color = "#${palette.base09}";
inside-ver-color = "#${palette.base09}";
inside-color = "#${palette.base01}";
text-color = "#${palette.base07}";
text-clear-color = "#${palette.base01}";
text-ver-color = "#${palette.base01}";
text-wrong-color = "#${palette.base01}";
text-caps-lock-color = "#${palette.base07}";
inside-clear-color = "#${palette.base0C}";
ring-clear-color = "#${palette.base0C}";
inside-caps-lock-color = "#${palette.base09}";
ring-caps-lock-color = "#${palette.base02}";
separator-color = "#${palette.base02}";
};
};
};

12
inputs/home/modules/desktop/wayland/notification/mako/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }:
let
inherit (config.colorscheme) colors kind;
inherit (config.colorscheme) palette variant;
fonts = config.homeModules.theme.fonts;
cfg = config.homeModules.desktop.wayland.notification.mako;
in {
@ -8,7 +8,7 @@ in {
services.mako = {
enable = true;
iconPath =
if kind == "dark" then
if variant == "dark" then
"${config.gtk.iconTheme.package}/share/icons/Papirus-Dark"
else
"${config.gtk.iconTheme.package}/share/icons/Papirus-Light";
@ -19,9 +19,9 @@ in {
height = 100;
borderSize = 2;
defaultTimeout = 3000;
backgroundColor = "#${colors.base00}dd";
borderColor = "#${colors.base05}dd";
textColor = "#${colors.base05}dd";
backgroundColor = "#${palette.base00}dd";
borderColor = "#${palette.base05}dd";
textColor = "#${palette.base05}dd";
extraConfig = ''
[app-name="system-notify"]
padding=3,3
@ -32,7 +32,7 @@ in {
width=100
height=100
anchor=top-center
border-color=#${colors.base08}dd
border-color=#${palette.base08}dd
'';
};
};

5
inputs/home/modules/desktop/wayland/windowManager/hyprland/settings/appearance.nix
View file

@ -3,6 +3,7 @@
let
cfg = config.homeModules.desktop.wayland.windowManager.hyprland;
pointer = config.home.pointerCursor;
inherit (config.colorscheme) palette;
in
{
@ -16,8 +17,8 @@ in
gaps_in = 10;
gaps_out = 10;
border_size = 2;
"col.active_border" = "0xff${config.colorscheme.colors.base05}";
"col.inactive_border" = "0xff${config.colorscheme.colors.base02}";
"col.active_border" = "0xff${palette.base05}";
"col.inactive_border" = "0xff${palette.base02}";
};
exec-once = [