pixelifytica/home-manager
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update accent colour definitions

Browse source 
Rename variables to be clear these are colour names, not the actual
colours. Redefine as baseXX to be used in all scheme variables.

Update all uses to remove "with scheme" form and make more explicit.
This commit is contained in:
Evie Litherland-Smith 2024-06-16 11:28:05 +01:00
parent dea9837a50
commit e9a3bcd858
13 changed files with 215 additions and 211 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -35,8 +35,8 @@
... ...
}: rec { }: rec {
inherit hostname; inherit hostname;
accentColour = "blue"; accentColourName = "base0D";
accentColour2 = "cyan"; altAccentColourName = "base0C";
iosevkaCustom = { iosevkaCustom = {
packages = iosevka-custom.outputs.packages.${system}; packages = iosevka-custom.outputs.packages.${system};
names = iosevka-custom.outputs.names; names = iosevka-custom.outputs.names;
@ -84,18 +84,6 @@
packages = [pkgs.nil]; packages = [pkgs.nil];
}; };
homeConfigurations = { homeConfigurations = {
# Fallback entry
pixelifytica = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {system = "x86_64-linux";};
modules = defaultModules {
username = "pixelifytica";
hostname = "Atlas";
};
extraSpecialArgs = defaultExtraSpecialArgs {
system = "x86_64-linux";
hostname = "Atlas";
};
};
# Server # Server
"pixelifytica@Legion" = home-manager.lib.homeManagerConfiguration { "pixelifytica@Legion" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {system = "x86_64-linux";}; pkgs = import nixpkgs {system = "x86_64-linux";};

1
home/Atlas.nix
View file

@ -1 +0,0 @@
{...}: {imports = [./default.nix];}

19
programs/desktop/avizo/default.nix
View file

@ -1,11 +1,18 @@
{config, ...}: { {
config,
accentColourName,
...
}: {
services.avizo = { services.avizo = {
enable = true; enable = true;
settings.default = with config.scheme; { settings.default = let
background = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9)"; sc = config.scheme;
bar-bg-color = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.9)"; rgba = colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, 1.0)"; in {
border-color = "rgba(${base0E-rgb-r}, ${base0E-rgb-g}, ${base0E-rgb-b}, 1.0)"; # Make dynamic background = "rgba(${rgba "base00"}, 0.9)";
bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
bar-fg-color = "rgba(${rgba "base05"}, 1.0)";
border-color = "rgba(${rgba accentColourName}, 1.0)";
image-opacity = "1.0"; image-opacity = "1.0";
}; };
}; };

20
programs/desktop/fuzzel/default.nix
View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
... ...
}: { }: {
programs.fuzzel = { programs.fuzzel = {
@ -26,14 +26,16 @@
tabs = 4; tabs = 4;
layer = "overlay"; layer = "overlay";
}; };
colors = with config.scheme; { colors = let
background = "${base00}cc"; # 80% Opacity sc = config.scheme;
text = "${base05}ff"; in {
match = "${red}ff"; background = "${sc.base00}cc"; # 80% Opacity
selection = "${base01}ff"; text = "${sc.base05}ff";
selection-text = "${base05}ff"; match = "${sc.red}ff";
selection-match = "${red}ff"; selection = "${sc.base01}ff";
border = "${config.scheme.${accentColour}}ff"; selection-text = "${sc.base05}ff";
selection-match = "${sc.red}ff";
border = "${sc.${accentColourName}}ff";
}; };
border = { border = {
width = 1; width = 1;

14
programs/desktop/mako/default.nix
View file

@ -1,10 +1,12 @@
{ {
config, config,
fonts, fonts,
accentColour, accentColourName,
... ...
}: { }: {
services.mako = with config.scheme.withHashtag; { services.mako = let
sc = config.scheme.withHashtag;
in {
enable = true; enable = true;
anchor = "top-right"; anchor = "top-right";
font = "${fonts.monospace.name} ${toString fonts.sizes.popups}"; font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
@ -13,10 +15,10 @@
maxVisible = 10; maxVisible = 10;
icons = true; icons = true;
iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}"; iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
textColor = "${base05}ff"; textColor = "${sc.base05}ff";
progressColor = "over ${red}ff"; progressColor = "over ${sc.red}ff";
backgroundColor = "${base00}cc"; backgroundColor = "${sc.base00}cc";
borderColor = "${config.scheme.withHashtag.${accentColour}}ff"; borderColor = "${sc.${accentColourName}}ff";
borderRadius = 10; borderRadius = 10;
borderSize = 1; borderSize = 1;
defaultTimeout = 0; defaultTimeout = 0;

18
programs/desktop/rofi/default.nix
View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
... ...
}: { }: {
programs.rofi = { programs.rofi = {
@ -36,15 +36,15 @@
display-emoji = " 󰞅 Emoji "; display-emoji = " 󰞅 Emoji ";
display-combi = " 󰛡 Combi "; display-combi = " 󰛡 Combi ";
}; };
theme = with builtins; theme = with builtins; let
with config.scheme; let
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
bg = mkLiteral "rgba (${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 80%)"; sc = config.scheme;
bg2 = mkLiteral "rgba (${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, 100%)"; bg = mkLiteral "rgba (${sc.base00-rgb-r}, ${sc.base00-rgb-g}, ${sc.base00-rgb-b}, 80%)";
fg = mkLiteral withHashtag.base05; bg2 = mkLiteral "rgba (${sc.base01-rgb-r}, ${sc.base01-rgb-g}, ${sc.base01-rgb-b}, 100%)";
fg2 = mkLiteral withHashtag.base04; fg = mkLiteral sc.withHashtag.base05;
border = mkLiteral withHashtag.${accentColour}; fg2 = mkLiteral sc.withHashtag.base04;
blue = mkLiteral withHashtag.blue; border = mkLiteral sc.withHashtag.${accentColour};
blue = mkLiteral sc.withHashtag.blue;
in { in {
"*" = { "*" = {
background-color = mkLiteral "transparent"; background-color = mkLiteral "transparent";

21
programs/desktop/sway/default.nix
View file

@ -3,8 +3,8 @@
lib, lib,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
accentColour2, altAccentColourName,
... ...
}: { }: {
programs.waybar.systemd.target = lib.mkIf config.wayland.windowManager.sway.systemd.enable "sway-session.target"; programs.waybar.systemd.target = lib.mkIf config.wayland.windowManager.sway.systemd.enable "sway-session.target";
@ -48,32 +48,33 @@
style = "regular"; style = "regular";
size = fonts.sizes.desktop * 1.0; size = fonts.sizes.desktop * 1.0;
}; };
colors = with config.scheme.withHashtag; let colors = let
text = toString base05; sc = config.scheme.withHashtag;
indicator = toString config.scheme.withHashtag.${accentColour2}; text = toString sc.base05;
background = toString base00; indicator = toString sc.${altAccentColourName};
background = toString sc.base00;
in { in {
inherit background; inherit background;
focused = let focused = let
border = toString config.scheme.withHashtag.${accentColour}; border = toString sc.${accentColourName};
in { in {
inherit background text indicator border; inherit background text indicator border;
childBorder = border; childBorder = border;
}; };
focusedInactive = let focusedInactive = let
border = toString base04; border = toString sc.base04;
in { in {
inherit background text indicator border; inherit background text indicator border;
childBorder = border; childBorder = border;
}; };
unfocused = let unfocused = let
border = toString base03; border = toString sc.base03;
in { in {
inherit background text indicator border; inherit background text indicator border;
childBorder = border; childBorder = border;
}; };
urgent = let urgent = let
border = toString red; border = toString sc.red;
in { in {
inherit background text indicator border; inherit background text indicator border;
childBorder = border; childBorder = border;

44
programs/desktop/swaylock/default.nix
View file

@ -1,7 +1,7 @@
{ {
config, config,
pkgs, pkgs,
accentColour, accentColourName,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -12,7 +12,9 @@
enable = true; enable = true;
package = pkgs.swaylock-effects; package = pkgs.swaylock-effects;
# Settings are specifically for swaylock-effects # Settings are specifically for swaylock-effects
settings = with config.scheme; { settings = let
sc = config.scheme;
in {
indicator-radius = 100; indicator-radius = 100;
indicator-thickness = 10; indicator-thickness = 10;
indicator-caps-lock = true; indicator-caps-lock = true;
@ -22,25 +24,25 @@
effect-vignette = "0.5:0.5"; effect-vignette = "0.5:0.5";
grace = 2; grace = 2;
fade-in = 0.2; fade-in = 0.2;
bs-hl-color = base06; bs-hl-color = sc.base06;
caps-lock-bs-hl-color = base06; caps-lock-bs-hl-color = sc.base06;
caps-lock-key-hl-color = green; caps-lock-key-hl-color = sc.green;
inside-color = "${base00}cc"; inside-color = "${sc.base00}cc";
key-hl-color = green; key-hl-color = sc.green;
layout-bg-color = "${base00}cc"; layout-bg-color = "${sc.base00}cc";
layout-border-color = config.scheme.${accentColour}; layout-border-color = sc.${accentColourName};
layout-text-color = base05; layout-text-color = sc.base05;
ring-color = config.scheme.${accentColour}; ring-color = sc.${accentColourName};
ring-clear-color = base06; ring-clear-color = sc.base06;
ring-caps-lock-color = base09; ring-caps-lock-color = sc.base09;
ring-ver-color = blue; ring-ver-color = sc.blue;
ring-wrong-color = red; ring-wrong-color = sc.red;
separator-color = base01; separator-color = sc.base01;
text-color = base05; text-color = sc.base05;
text-clear-color = base06; text-clear-color = sc.base06;
text-caps-lock-color = base09; text-caps-lock-color = sc.base09;
text-ver-color = blue; text-ver-color = sc.blue;
text-wrong-color = red; text-wrong-color = sc.red;
}; };
}; };
} }

125
programs/desktop/swaync/default.nix
View file

@ -2,11 +2,12 @@
config, config,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
... ...
}: { }: {
home.packages = [pkgs.swaynotificationcenter]; home.packages = [pkgs.swaynotificationcenter];
xdg.configFile."swaync/style.css".text = with config.scheme.withHashtag; let xdg.configFile."swaync/style.css".text = let
sc = config.scheme.withHashtag;
alpha = "0.8"; alpha = "0.8";
alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})"; alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})";
in '' in ''
@ -20,10 +21,10 @@
.floating-notifications.background .notification-row .notification-background { .floating-notifications.background .notification-row .notification-background {
border-radius: 10px; border-radius: 10px;
border: 1px solid ${config.scheme.withHashtag.${accentColour}}; border: 1px solid ${sc.withHashtag.${accentColourName}};
margin: 18px; margin: 18px;
background-color: ${alpha-background}; background-color: ${alpha-background};
color: ${base05}; color: ${sc.base05};
padding: 0; padding: 0;
} }
@ -49,7 +50,7 @@
.notification .notification
.notification-content .notification-content
.summary { .summary {
color: ${base05}; color: ${sc.base05};
} }
.floating-notifications.background .floating-notifications.background
@ -58,7 +59,7 @@
.notification .notification
.notification-content .notification-content
.time { .time {
color: ${base04}; color: ${sc.base04};
} }
.floating-notifications.background .floating-notifications.background
@ -67,7 +68,7 @@
.notification .notification
.notification-content .notification-content
.body { .body {
color: ${base05}; color: ${sc.base05};
} }
.floating-notifications.background .floating-notifications.background
@ -87,8 +88,8 @@
> * > *
.notification-action { .notification-action {
border-radius: 10px; border-radius: 10px;
background-color: ${base01}; background-color: ${sc.base01};
color: ${base05}; color: ${sc.base05};
margin: 7px; margin: 7px;
} }
@ -99,8 +100,8 @@
> *:last-child > *:last-child
> * > *
.notification-action:hover { .notification-action:hover {
background-color: ${base01}; background-color: ${sc.base01};
color: ${base05}; color: ${sc.base05};
} }
.floating-notifications.background .floating-notifications.background
@ -110,8 +111,8 @@
> *:last-child > *:last-child
> * > *
.notification-action:active { .notification-action:active {
background-color: ${blue}; background-color: ${sc.blue};
color: ${base00}; color: ${sc.base00};
} }
.floating-notifications.background .floating-notifications.background
@ -121,61 +122,61 @@
margin: 7px; margin: 7px;
padding: 2px; padding: 2px;
border-radius: 10px; border-radius: 10px;
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.floating-notifications.background .floating-notifications.background
.notification-row .notification-row
.notification-background .notification-background
.close-button:hover { .close-button:hover {
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.floating-notifications.background .floating-notifications.background
.notification-row .notification-row
.notification-background .notification-background
.close-button:active { .close-button:active {
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.control-center { .control-center {
border-radius: 10px; border-radius: 10px;
border: 1px solid ${config.scheme.withHashtag.${accentColour}}; border: 1px solid ${sc.${accentColourName}};
margin: 18px; margin: 18px;
background-color: ${alpha-background}; background-color: ${alpha-background};
color: ${base05}; color: ${sc.base05};
padding: 14px; padding: 14px;
} }
.control-center .widget-title { .control-center .widget-title {
color: ${base05}; color: ${sc.base05};
font-size: 1.3em; font-size: 1.3em;
} }
.control-center .widget-title button { .control-center .widget-title button {
border-radius: 7px; border-radius: 7px;
background-color: ${base01}; background-color: ${sc.base01};
color: ${base05}; color: ${sc.base05};
padding: 8px; padding: 8px;
} }
.control-center .widget-title button:hover { .control-center .widget-title button:hover {
background-color: ${base02}; background-color: ${sc.base02};
color: ${base05}; color: ${sc.base05};
} }
.control-center .widget-title button:active { .control-center .widget-title button:active {
background-color: ${base03}; background-color: ${sc.base03};
color: ${base05}; color: ${sc.base05};
} }
.control-center .notification-row .notification-background { .control-center .notification-row .notification-background {
border-radius: 10px; border-radius: 10px;
background-color: ${base01}; background-color: ${sc.base01};
color: ${base05}; color: ${sc.base05};
margin-top: 14px; margin-top: 14px;
} }
@ -198,7 +199,7 @@
.notification .notification
.notification-content .notification-content
.summary { .summary {
color: ${base05}; color: ${sc.base05};
} }
.control-center .control-center
@ -207,7 +208,7 @@
.notification .notification
.notification-content .notification-content
.time { .time {
color: ${base04}; color: ${sc.base04};
} }
.control-center .control-center
@ -216,7 +217,7 @@
.notification .notification
.notification-content .notification-content
.body { .body {
color: ${base05}; color: ${sc.base05};
} }
.control-center .control-center
@ -236,8 +237,8 @@
> * > *
.notification-action { .notification-action {
border-radius: 7px; border-radius: 7px;
background-color: ${base00}; background-color: ${sc.base00};
color: ${base05}; color: ${sc.base05};
margin: 7px; margin: 7px;
} }
@ -248,8 +249,8 @@
> *:last-child > *:last-child
> * > *
.notification-action:hover { .notification-action:hover {
background-color: ${base01};; background-color: ${sc.base01};;
color: ${base05}; color: ${sc.base05};
} }
.control-center .control-center
@ -259,39 +260,39 @@
> *:last-child > *:last-child
> * > *
.notification-action:active { .notification-action:active {
background-color: ${blue}; background-color: ${sc.blue};
color: ${base05}; color: ${sc.base05};
} }
.control-center .notification-row .notification-background .close-button { .control-center .notification-row .notification-background .close-button {
margin: 7px; margin: 7px;
padding: 2px; padding: 2px;
border-radius: 6.3px; border-radius: 6.3px;
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.control-center .notification-row .notification-background .close-button:hover { .control-center .notification-row .notification-background .close-button:hover {
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.control-center .control-center
.notification-row .notification-row
.notification-background .notification-background
.close-button:active { .close-button:active {
background-color: ${red}; background-color: ${sc.red};
color: ${base00}; color: ${sc.base00};
} }
.control-center .notification-row .notification-background:hover { .control-center .notification-row .notification-background:hover {
background-color: ${base00}; background-color: ${sc.base00};
color: ${base05}; color: ${sc.base05};
} }
.control-center .notification-row .notification-background:active { .control-center .notification-row .notification-background:active {
background-color: ${blue}; background-color: ${sc.blue};
color: ${base05}; color: ${sc.base05};
} }
progressbar, progressbar,
@ -301,35 +302,35 @@
} }
.notification.critical progress { .notification.critical progress {
background-color: ${red}; background-color: ${sc.red};
} }
.notification.low progress, .notification.low progress,
.notification.normal progress { .notification.normal progress {
background-color: ${blue}; background-color: ${sc.blue};
} }
trough { trough {
background-color: ${base00}; background-color: ${sc.base00};
} }
.control-center trough { .control-center trough {
background-color: ${base03}; background-color: ${sc.base03};
} }
.control-center-dnd { .control-center-dnd {
margin-top: 5px; margin-top: 5px;
border-radius: 8px; border-radius: 8px;
background: ${base00}; background: ${sc.base00};
border: 1px solid ${base03}; border: 1px solid ${sc.base03};
} }
.control-center-dnd:checked { .control-center-dnd:checked {
background: ${base00}; background: ${sc.base00};
} }
.control-center-dnd slider { .control-center-dnd slider {
background: ${base03}; background: ${sc.base03};
border-radius: 8px; border-radius: 8px;
} }
@ -341,18 +342,18 @@
.widget-dnd > switch { .widget-dnd > switch {
font-size: initial; font-size: initial;
border-radius: 8px; border-radius: 8px;
background: ${base00}; background: ${sc.base00};
border: 1px solid ${base03}; border: 1px solid ${sc.base03};
} }
.widget-dnd > switch:checked { .widget-dnd > switch:checked {
background: ${base00}; background: ${sc.base00};
} }
.widget-dnd > switch slider { .widget-dnd > switch slider {
background: ${base01}; background: ${sc.base01};
border-radius: 8px; border-radius: 8px;
border: 1px solid ${config.scheme.withHashtag.${accentColour}}; border: 1px solid ${sc.${accentColourName}};
} }
''; '';

40
programs/desktop/waybar/default.nix
View file

@ -2,7 +2,7 @@
config, config,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
... ...
}: { }: {
systemd.user.targets.tray.Unit = { systemd.user.targets.tray.Unit = {
@ -229,8 +229,8 @@
spacing = 5; spacing = 5;
}; };
}; };
style = with config.scheme.withHashtag; let style = let
accent = config.scheme.withHashtag.${accentColour}; sc = config.scheme.withHashtag;
alpha = "0.9"; alpha = "0.9";
in '' in ''
* { * {
@ -245,21 +245,21 @@
} }
window > box { window > box {
color: ${base05}; color: ${sc.base05};
background: alpha(${base00}, ${alpha}); background: alpha(${sc.base00}, ${alpha});
padding: 0px; padding: 0px;
border-top: 1px solid ${base04}; border-top: 1px solid ${sc.base04};
} }
tooltip { tooltip {
background: ${base00}; background: ${sc.base00};
border: 1px solid ${config.scheme.withHashtag.${accentColour}}; border: 1px solid ${sc.${accentColourName}};
border-radius: 10px; border-radius: 10px;
box-shadow: none; box-shadow: none;
} }
tooltip label { tooltip label {
color: ${base05}; color: ${sc.base05};
border: none; border: none;
padding: 5px; padding: 5px;
margin: 0px; margin: 0px;
@ -288,42 +288,42 @@
#backlight, #backlight,
#battery, #battery,
#custom-weather { #custom-weather {
color: ${base05}; color: ${sc.base05};
} }
#workspaces button { #workspaces button {
background: transparent; background: transparent;
color: ${base05}; color: ${sc.base05};
margin: 0px; margin: 0px;
padding: 0px 5px; padding: 0px 5px;
} }
#workspaces button.persistent { #workspaces button.persistent {
color: ${base03}; color: ${sc.base03};
} }
#workspaces button.focused { #workspaces button.focused {
color: ${accent}; color: ${sc.${accentColourName}};
} }
#workspaces button.urgent { #workspaces button.urgent {
color: ${base09}; color: ${sc.base09};
} }
#custom-notification { #custom-notification {
color: ${base08}; color: ${sc.base08};
} }
#pulseaudio { #pulseaudio {
color: ${base09}; color: ${sc.base09};
} }
#network { #network {
color: ${base0A}; color: ${sc.base0A};
} }
#bluetooth { #bluetooth {
color: ${base0B}; color: ${sc.base0B};
} }
#clock.calendar { #clock.calendar {
color: ${base0C}; color: ${sc.base0C};
} }
#clock { #clock {
color: ${base0D}; color: ${sc.base0D};
} }
''; '';
}; };

17
programs/desktop/wlogout/default.nix
View file

@ -1,7 +1,6 @@
{ {
config, config,
fonts, fonts,
accentColour,
... ...
}: { }: {
programs.wlogout = { programs.wlogout = {
@ -26,8 +25,8 @@
keybind = "l"; keybind = "l";
} }
]; ];
style = with config.scheme.withHashtag; let style = let
accent = config.scheme.withHashtag.${accentColour}; sc = config.scheme.withHashtag;
shutdownIcon = ./icons/shutdown.png; shutdownIcon = ./icons/shutdown.png;
rebootIcon = ./icons/reboot.png; rebootIcon = ./icons/reboot.png;
logoutIcon = ./icons/logout.png; logoutIcon = ./icons/logout.png;
@ -43,23 +42,23 @@
} }
button { button {
background-color: ${base00}; background-color: ${sc.base00};
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: 25%; background-size: 25%;
box-shadow: none; box-shadow: none;
margin: 5px; margin: 5px;
color: ${base05}; color: ${sc.base05};
} }
button:hover { button:hover {
background-color: ${base01}; background-color: ${sc.base01};
color: ${base05}; color: ${sc.base05};
} }
button:focus { button:focus {
background-color: ${base02}; background-color: ${sc.base02};
color: ${base05}; color: ${sc.base05};
} }
#shutdown { #shutdown {

44
programs/nyxt/default.nix
View file

@ -2,14 +2,16 @@
config, config,
pkgs, pkgs,
fonts, fonts,
accentColour, accentColourName,
accentColour2, altAccentColourName,
... ...
}: { }: {
home.packages = [pkgs.nyxt]; home.packages = [pkgs.nyxt];
xdg = { xdg = {
configFile = { configFile = {
"nyxt/config.lisp".text = with config.scheme.withHashtag; '' "nyxt/config.lisp".text = let
sc = config.scheme.withHashtag;
in ''
;; Import custom configuration ;; Import custom configuration
(nyxt::load-lisp "${./config.lisp}") (nyxt::load-lisp "${./config.lisp}")
;; Define custom theme ;; Define custom theme
@ -18,24 +20,24 @@
:dark-p t :dark-p t
:font-family "${fonts.sansSerif.name}" :font-family "${fonts.sansSerif.name}"
:monospace-font-family "${fonts.monospace.name}" :monospace-font-family "${fonts.monospace.name}"
:background-color "${base00}" :background-color "${sc.base00}"
:on-background-color "${base05}" :on-background-color "${sc.base05}"
:primary-color "${config.scheme.withHashtag.${accentColour}}" :primary-color "${sc.${accentColourName}}"
:on-primary-color "${base01}" :on-primary-color "${sc.base01}"
:secondary-color "${base03}" :secondary-color "${sc.base03}"
:on-secondary-color "${base05}" :on-secondary-color "${sc.base05}"
:accent-color "${config.scheme.withHashtag.${accentColour2}}" :accent-color "${sc.${altAccentColourName}}"
:on-accent-color "${base01}" :on-accent-color "${sc.base01}"
:action-color "${cyan}" :action-color "${sc.cyan}"
:on-action-color "${base01}" :on-action-color "${sc.base01}"
:success-color "${green}" :success-color "${sc.green}"
:on-success-color "${base01}" :on-success-color "${sc.base01}"
:highlight-color "${magenta}" :highlight-color "${sc.magenta}"
:on-highlight-color "${base01}" :on-highlight-color "${sc.base01}"
:warning-color "${yellow}" :warning-color "${sc.yellow}"
:on-warning-color "${base01}" :on-warning-color "${sc.base01}"
:codeblock-color "${base02}" :codeblock-color "${sc.base02}"
:on-codeblock-color "${base05}")))) :on-codeblock-color "${sc.base05}"))))
''; '';
}; };
# dataFile."nyxt/bookmarks.lisp".source = ./bookmarks.lisp; # dataFile."nyxt/bookmarks.lisp".source = ./bookmarks.lisp;

47
programs/shell/bottom.nix
View file

@ -1,6 +1,6 @@
{ {
config, config,
accentColour, accentColourName,
... ...
}: { }: {
programs.bottom = { programs.bottom = {
@ -13,31 +13,32 @@
enable_gpu = true; enable_gpu = true;
enable_cache_memory = true; enable_cache_memory = true;
}; };
colors = with config.scheme.withHashtag; let colors = let
rainbow = [red yellow green cyan blue magenta]; sc = config.scheme.withHashtag;
rainbow = with sc; [red yellow green cyan blue magenta];
in { in {
table_header_color = base05; table_header_color = sc.base05;
all_cpu_color = base05; all_cpu_color = sc.base05;
avg_cpu_color = base05; avg_cpu_color = sc.base05;
cpu_core_colors = rainbow; cpu_core_colors = rainbow;
ram_color = red; ram_color = sc.red;
cache_color = green; cache_color = sc.green;
swap_color = blue; swap_color = sc.blue;
rx_color = green; rx_color = sc.green;
tx_color = blue; tx_color = sc.blue;
widget_title_color = config.scheme.withHashtag.${accentColour}; widget_title_color = sc.${accentColourName};
border_color = base02; border_color = sc.base02;
highlighted_border_color = config.scheme.withHashtag.${accentColour}; highlighted_border_color = sc.${accentColourName};
text_color = base05; text_color = sc.base05;
graph_color = base04; graph_color = sc.base04;
cursor_color = base02; cursor_color = sc.base02;
selected_text_color = base05; selected_text_color = sc.base05;
selected_bg_color = base01; selected_bg_color = sc.base01;
high_battery_color = green; high_battery_color = sc.green;
medium_battery_color = yellow; medium_battery_color = sc.yellow;
low_battery_color = red; low_battery_color = sc.red;
gpu_core_colors = rainbow; gpu_core_colors = rainbow;
arc_color = cyan; arc_color = sc.cyan;
}; };
}; };
}; };