mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-22 00:03:55 +01:00
treewide(stylix): Use withHashtag where possible
This commit is contained in:
parent
24e1e92ece
commit
d963032159
@ -3,7 +3,7 @@
|
||||
let
|
||||
inherit (config.home) homeDirectory;
|
||||
inherit (config.xdg.userDirs) download documents music pictures videos;
|
||||
inherit (config.lib.stylix.colors) base00 base05;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base00 base05;
|
||||
inherit (pkgs) eww;
|
||||
|
||||
fluent-icons = pkgs.callPackage ../packages/fluent-icons.nix { };
|
||||
@ -53,9 +53,9 @@ in
|
||||
|
||||
.overlay {
|
||||
background: transparent;
|
||||
color: #${base05};
|
||||
color: ${base05};
|
||||
font-weight: bold;
|
||||
text-shadow: 0 0 0.075em #${base00};
|
||||
text-shadow: 0 0 0.075em ${base00};
|
||||
font-size: 32px;
|
||||
opacity: 0.4;
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ config, ... }:
|
||||
|
||||
let
|
||||
inherit (config.lib.stylix.colors) base01 base02 base05;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base01 base02 base05;
|
||||
|
||||
font = "Noto Sans CJK JP 16";
|
||||
themeName = "base16";
|
||||
@ -16,10 +16,10 @@ in
|
||||
|
||||
[InputPanel]
|
||||
Font=${font}
|
||||
NormalColor=#${base05}
|
||||
HighlightCandidateColor=#${base05}
|
||||
HighlightColor=#${base05}
|
||||
HighlightBackgroundColor=#${base01}
|
||||
NormalColor=${base05}
|
||||
HighlightCandidateColor=${base05}
|
||||
HighlightColor=${base05}
|
||||
HighlightBackgroundColor=${base01}
|
||||
Spacing=6
|
||||
|
||||
[InputPanel/TextMargin]
|
||||
@ -41,10 +41,10 @@ in
|
||||
Bottom=2
|
||||
|
||||
[InputPanel/Background]
|
||||
Color=#${base01}
|
||||
Color=${base01}
|
||||
|
||||
[InputPanel/Highlight]
|
||||
Color=#${base02}
|
||||
Color=${base02}
|
||||
|
||||
[InputPanel/Highlight/Margin]
|
||||
Left=5
|
||||
@ -53,16 +53,16 @@ in
|
||||
Bottom=5
|
||||
|
||||
[Menu]
|
||||
NormalColor=#${base01}
|
||||
NormalColor=${base01}
|
||||
|
||||
[Menu/Background]
|
||||
Color=#${base01}
|
||||
Color=${base01}
|
||||
|
||||
[Menu/Highlight]
|
||||
Color=#${base02}
|
||||
Color=${base02}
|
||||
|
||||
[Menu/Separator]
|
||||
Color=#${base02}
|
||||
Color=${base02}
|
||||
|
||||
[Menu/Background/Margin]
|
||||
Left=2
|
||||
@ -185,8 +185,8 @@ in
|
||||
Font="${font}"
|
||||
MenuFont="${font}"
|
||||
TrayFont="${font}"
|
||||
TrayOutlineColor=#${base02}
|
||||
TrayTextColor=#${base05}
|
||||
TrayOutlineColor=${base02}
|
||||
TrayTextColor=${base05}
|
||||
PreferTextIcon=False
|
||||
ShowLayoutNameInIcon=True
|
||||
UseInputMethodLangaugeToDisplayText=True
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
inherit (lib) singleton;
|
||||
inherit (config.lib.stylix.colors) base00 base01 base04 base05 base0D;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base00 base01 base04 base05 base0D;
|
||||
inherit (pkgs) ironbar inotify-tools;
|
||||
inherit (builtins) toJSON;
|
||||
|
||||
@ -73,25 +73,25 @@ in
|
||||
* {
|
||||
font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid";
|
||||
font-size: 16px;
|
||||
text-shadow: 2px 2px #${base00};
|
||||
text-shadow: 2px 2px ${base00};
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
outline: none;
|
||||
font-weight: 500;
|
||||
background: none;
|
||||
color: #${base05};
|
||||
color: ${base05};
|
||||
}
|
||||
|
||||
.background {
|
||||
background: alpha(#${base00}, 0.925);
|
||||
background: alpha(${base00}, 0.925);
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: #${base01};
|
||||
background: ${base01};
|
||||
}
|
||||
|
||||
#bar {
|
||||
border-top: 1px solid #${base01};
|
||||
border-top: 1px solid ${base01};
|
||||
}
|
||||
|
||||
.label, .script, .tray {
|
||||
@ -115,7 +115,7 @@ in
|
||||
}
|
||||
|
||||
.popup {
|
||||
border: 1px solid #${base01};
|
||||
border: 1px solid ${base01};
|
||||
padding: 1em;
|
||||
}
|
||||
|
||||
@ -131,7 +131,7 @@ in
|
||||
|
||||
.popup-clock .calendar .header {
|
||||
padding-top: 1em;
|
||||
border-top: 1px solid #${base01};
|
||||
border-top: 1px solid ${base01};
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
@ -140,7 +140,7 @@ in
|
||||
}
|
||||
|
||||
.popup-clock .calendar:selected {
|
||||
color: #${base0D};
|
||||
color: ${base0D};
|
||||
}
|
||||
|
||||
.launcher .item {
|
||||
@ -150,16 +150,16 @@ in
|
||||
}
|
||||
|
||||
button:active {
|
||||
background: #${base04};
|
||||
background: ${base04};
|
||||
}
|
||||
|
||||
.launcher .open {
|
||||
box-shadow: inset 0 -2px #${base04};
|
||||
box-shadow: inset 0 -2px ${base04};
|
||||
}
|
||||
|
||||
.launcher .focused {
|
||||
box-shadow: inset 0 -2px #${base0D};
|
||||
background: #${base01};
|
||||
box-shadow: inset 0 -2px ${base0D};
|
||||
background: ${base01};
|
||||
}
|
||||
|
||||
.popup-launcher {
|
||||
@ -167,7 +167,7 @@ in
|
||||
}
|
||||
|
||||
.popup-launcher .popup-item:not(:first-child) {
|
||||
border-top: 1px solid #${base01};
|
||||
border-top: 1px solid ${base01};
|
||||
}
|
||||
|
||||
#startMenu {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ config, ... }:
|
||||
|
||||
let
|
||||
inherit (config.lib.stylix.colors) base00;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base00;
|
||||
in
|
||||
{
|
||||
programs.kitty = {
|
||||
@ -26,8 +26,8 @@ in
|
||||
};
|
||||
|
||||
extraConfig = ''
|
||||
tab_bar_background #${base00}
|
||||
inactive_tab_background #${base00}
|
||||
tab_bar_background ${base00}
|
||||
inactive_tab_background ${base00}
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -4,7 +4,7 @@ let
|
||||
inherit (pkgs) rofi-wayland;
|
||||
inherit (lib) mkForce;
|
||||
inherit (config.lib.formats.rasi) mkLiteral;
|
||||
inherit (config.lib.stylix.colors) base00 base05;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base00 base05;
|
||||
in
|
||||
{
|
||||
programs.rofi = {
|
||||
@ -37,8 +37,8 @@ in
|
||||
"*" = {
|
||||
font = "Noto Sans CJK JP Bold 12";
|
||||
background-color = mkLiteral "transparent";
|
||||
foreground = mkLiteral "#${base05}";
|
||||
text-color = mkLiteral "#${base05}";
|
||||
foreground = mkLiteral "${base05}";
|
||||
text-color = mkLiteral "${base05}";
|
||||
padding = mkLiteral "0px";
|
||||
margin = mkLiteral "0px";
|
||||
};
|
||||
@ -46,7 +46,7 @@ in
|
||||
window = {
|
||||
fullscreen = true;
|
||||
padding = mkLiteral "1em";
|
||||
background-color = mkLiteral "#${base00}dd";
|
||||
background-color = mkLiteral "${base00}dd";
|
||||
};
|
||||
|
||||
mainbox = {
|
||||
@ -54,7 +54,7 @@ in
|
||||
};
|
||||
|
||||
inputbar = {
|
||||
background-color = mkLiteral "#${base05}20";
|
||||
background-color = mkLiteral "${base05}20";
|
||||
|
||||
margin = mkLiteral "0px calc( 50% - 230px )";
|
||||
padding = mkLiteral "4px 8px";
|
||||
@ -62,7 +62,7 @@ in
|
||||
|
||||
border = mkLiteral "1px";
|
||||
border-radius = mkLiteral "2px";
|
||||
border-color = mkLiteral "#${base05}40";
|
||||
border-color = mkLiteral "${base05}40";
|
||||
|
||||
children = map mkLiteral [ "icon-search" "entry" ];
|
||||
};
|
||||
@ -79,7 +79,7 @@ in
|
||||
|
||||
entry = {
|
||||
placeholder = "Search";
|
||||
placeholder-color = mkLiteral "#${base05}20";
|
||||
placeholder-color = mkLiteral "${base05}20";
|
||||
};
|
||||
|
||||
listview = {
|
||||
@ -103,7 +103,7 @@ in
|
||||
};
|
||||
|
||||
"element selected" = {
|
||||
background-color = mkLiteral "#${base05}33";
|
||||
background-color = mkLiteral "${base05}33";
|
||||
};
|
||||
|
||||
element-icon = {
|
||||
|
@ -4,7 +4,7 @@ let
|
||||
inherit (lib) mkEnableOption mkIf mkMerge mkOption;
|
||||
inherit (lib.types) float int;
|
||||
inherit (config.modules.system) username;
|
||||
inherit (config.lib.stylix.colors) base00;
|
||||
inherit (config.lib.stylix.colors.withHashtag) base00;
|
||||
inherit (cfg) bloat gnome plasma container opacity fontSize graphical;
|
||||
inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
|
||||
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji stdenvNoCC imagemagick;
|
||||
@ -22,7 +22,7 @@ let
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out
|
||||
magick -size 1x1 xc:#${base00} $out/wallpaper.png
|
||||
magick -size 1x1 xc:${base00} $out/wallpaper.png
|
||||
'';
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user