extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-06-20 09:47:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

treewide(stylix): Use withHashtag where possible

Browse Source
This commit is contained in:
Donovan Glover 2024-08-03 13:28:03 -04:00
parent 24e1e92ece
commit d963032159
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
6 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home/eww.nix
View File

@ -3,7 +3,7 @@
let let
inherit (config.home) homeDirectory; inherit (config.home) homeDirectory;
inherit (config.xdg.userDirs) download documents music pictures videos; 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; inherit (pkgs) eww;
fluent-icons = pkgs.callPackage ../packages/fluent-icons.nix { }; fluent-icons = pkgs.callPackage ../packages/fluent-icons.nix { };
@ -53,9 +53,9 @@ in
.overlay { .overlay {
background: transparent; background: transparent;
color: #${base05}; color: ${base05};
font-weight: bold; font-weight: bold;
text-shadow: 0 0 0.075em #${base00}; text-shadow: 0 0 0.075em ${base00};
font-size: 32px; font-size: 32px;
opacity: 0.4; opacity: 0.4;
} }

26
home/fcitx.nix
View File

@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
let let
inherit (config.lib.stylix.colors) base01 base02 base05; inherit (config.lib.stylix.colors.withHashtag) base01 base02 base05;
font = "Noto Sans CJK JP 16"; font = "Noto Sans CJK JP 16";
themeName = "base16"; themeName = "base16";
@ -16,10 +16,10 @@ in
[InputPanel] [InputPanel]
Font=${font} Font=${font}
NormalColor=#${base05} NormalColor=${base05}
HighlightCandidateColor=#${base05} HighlightCandidateColor=${base05}
HighlightColor=#${base05} HighlightColor=${base05}
HighlightBackgroundColor=#${base01} HighlightBackgroundColor=${base01}
Spacing=6 Spacing=6
[InputPanel/TextMargin] [InputPanel/TextMargin]
@ -41,10 +41,10 @@ in
Bottom=2 Bottom=2
[InputPanel/Background] [InputPanel/Background]
Color=#${base01} Color=${base01}
[InputPanel/Highlight] [InputPanel/Highlight]
Color=#${base02} Color=${base02}
[InputPanel/Highlight/Margin] [InputPanel/Highlight/Margin]
Left=5 Left=5
@ -53,16 +53,16 @@ in
Bottom=5 Bottom=5
[Menu] [Menu]
NormalColor=#${base01} NormalColor=${base01}
[Menu/Background] [Menu/Background]
Color=#${base01} Color=${base01}
[Menu/Highlight] [Menu/Highlight]
Color=#${base02} Color=${base02}
[Menu/Separator] [Menu/Separator]
Color=#${base02} Color=${base02}
[Menu/Background/Margin] [Menu/Background/Margin]
Left=2 Left=2
@ -185,8 +185,8 @@ in
Font="${font}" Font="${font}"
MenuFont="${font}" MenuFont="${font}"
TrayFont="${font}" TrayFont="${font}"
TrayOutlineColor=#${base02} TrayOutlineColor=${base02}
TrayTextColor=#${base05} TrayTextColor=${base05}
PreferTextIcon=False PreferTextIcon=False
ShowLayoutNameInIcon=True ShowLayoutNameInIcon=True
UseInputMethodLangaugeToDisplayText=True UseInputMethodLangaugeToDisplayText=True

28
home/ironbar.nix
View File

@ -2,7 +2,7 @@
let let
inherit (lib) singleton; 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 (pkgs) ironbar inotify-tools;
inherit (builtins) toJSON; inherit (builtins) toJSON;
@ -73,25 +73,25 @@ in
* { * {
font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid"; font-family: "Noto Sans CJK JP", "Font Awesome 6 Free Solid";
font-size: 16px; font-size: 16px;
text-shadow: 2px 2px #${base00}; text-shadow: 2px 2px ${base00};
border: none; border: none;
border-radius: 0; border-radius: 0;
outline: none; outline: none;
font-weight: 500; font-weight: 500;
background: none; background: none;
color: #${base05}; color: ${base05};
} }
.background { .background {
background: alpha(#${base00}, 0.925); background: alpha(${base00}, 0.925);
} }
button:hover { button:hover {
background: #${base01}; background: ${base01};
} }
#bar { #bar {
border-top: 1px solid #${base01}; border-top: 1px solid ${base01};
} }
.label, .script, .tray { .label, .script, .tray {
@ -115,7 +115,7 @@ in
} }
.popup { .popup {
border: 1px solid #${base01}; border: 1px solid ${base01};
padding: 1em; padding: 1em;
} }
@ -131,7 +131,7 @@ in
.popup-clock .calendar .header { .popup-clock .calendar .header {
padding-top: 1em; padding-top: 1em;
border-top: 1px solid #${base01}; border-top: 1px solid ${base01};
font-size: 1.5em; font-size: 1.5em;
} }
@ -140,7 +140,7 @@ in
} }
.popup-clock .calendar:selected { .popup-clock .calendar:selected {
color: #${base0D}; color: ${base0D};
} }
.launcher .item { .launcher .item {
@ -150,16 +150,16 @@ in
} }
button:active { button:active {
background: #${base04}; background: ${base04};
} }
.launcher .open { .launcher .open {
box-shadow: inset 0 -2px #${base04}; box-shadow: inset 0 -2px ${base04};
} }
.launcher .focused { .launcher .focused {
box-shadow: inset 0 -2px #${base0D}; box-shadow: inset 0 -2px ${base0D};
background: #${base01}; background: ${base01};
} }
.popup-launcher { .popup-launcher {
@ -167,7 +167,7 @@ in
} }
.popup-launcher .popup-item:not(:first-child) { .popup-launcher .popup-item:not(:first-child) {
border-top: 1px solid #${base01}; border-top: 1px solid ${base01};
} }
#startMenu { #startMenu {

6
home/kitty.nix
View File

@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
let let
inherit (config.lib.stylix.colors) base00; inherit (config.lib.stylix.colors.withHashtag) base00;
in in
{ {
programs.kitty = { programs.kitty = {
@ -26,8 +26,8 @@ in
}; };
extraConfig = '' extraConfig = ''
tab_bar_background #${base00} tab_bar_background ${base00}
inactive_tab_background #${base00} inactive_tab_background ${base00}
''; '';
}; };

16
home/rofi.nix
View File

@ -4,7 +4,7 @@ let
inherit (pkgs) rofi-wayland; inherit (pkgs) rofi-wayland;
inherit (lib) mkForce; inherit (lib) mkForce;
inherit (config.lib.formats.rasi) mkLiteral; inherit (config.lib.formats.rasi) mkLiteral;
inherit (config.lib.stylix.colors) base00 base05; inherit (config.lib.stylix.colors.withHashtag) base00 base05;
in in
{ {
programs.rofi = { programs.rofi = {
@ -37,8 +37,8 @@ in
"*" = { "*" = {
font = "Noto Sans CJK JP Bold 12"; font = "Noto Sans CJK JP Bold 12";
background-color = mkLiteral "transparent"; background-color = mkLiteral "transparent";
foreground = mkLiteral "#${base05}"; foreground = mkLiteral "${base05}";
text-color = mkLiteral "#${base05}"; text-color = mkLiteral "${base05}";
padding = mkLiteral "0px"; padding = mkLiteral "0px";
margin = mkLiteral "0px"; margin = mkLiteral "0px";
}; };
@ -46,7 +46,7 @@ in
window = { window = {
fullscreen = true; fullscreen = true;
padding = mkLiteral "1em"; padding = mkLiteral "1em";
background-color = mkLiteral "#${base00}dd"; background-color = mkLiteral "${base00}dd";
}; };
mainbox = { mainbox = {
@ -54,7 +54,7 @@ in
}; };
inputbar = { inputbar = {
background-color = mkLiteral "#${base05}20"; background-color = mkLiteral "${base05}20";
margin = mkLiteral "0px calc( 50% - 230px )"; margin = mkLiteral "0px calc( 50% - 230px )";
padding = mkLiteral "4px 8px"; padding = mkLiteral "4px 8px";
@ -62,7 +62,7 @@ in
border = mkLiteral "1px"; border = mkLiteral "1px";
border-radius = mkLiteral "2px"; border-radius = mkLiteral "2px";
border-color = mkLiteral "#${base05}40"; border-color = mkLiteral "${base05}40";
children = map mkLiteral [ "icon-search" "entry" ]; children = map mkLiteral [ "icon-search" "entry" ];
}; };
@ -79,7 +79,7 @@ in
entry = { entry = {
placeholder = "Search"; placeholder = "Search";
placeholder-color = mkLiteral "#${base05}20"; placeholder-color = mkLiteral "${base05}20";
}; };
listview = { listview = {
@ -103,7 +103,7 @@ in
}; };
"element selected" = { "element selected" = {
background-color = mkLiteral "#${base05}33"; background-color = mkLiteral "${base05}33";
}; };
element-icon = { element-icon = {

4
modules/desktop.nix
View File

@ -4,7 +4,7 @@ let
inherit (lib) mkEnableOption mkIf mkMerge mkOption; inherit (lib) mkEnableOption mkIf mkMerge mkOption;
inherit (lib.types) float int; inherit (lib.types) float int;
inherit (config.modules.system) username; 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 (cfg) bloat gnome plasma container opacity fontSize graphical;
inherit (nix-config.packages.${pkgs.system}) aleo-fonts; inherit (nix-config.packages.${pkgs.system}) aleo-fonts;
inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji stdenvNoCC imagemagick; inherit (pkgs) phinger-cursors noto-fonts-cjk-sans maple-mono noto-fonts-emoji stdenvNoCC imagemagick;
@ -22,7 +22,7 @@ let
postInstall = '' postInstall = ''
mkdir -p $out mkdir -p $out
magick -size 1x1 xc:#${base00} $out/wallpaper.png magick -size 1x1 xc:${base00} $out/wallpaper.png
''; '';
}; };