Switch to module-based rice
This commit is contained in:
parent
a8ee39aaa3
commit
61329e5f96
19 changed files with 505 additions and 547 deletions
|
|
@ -4,9 +4,9 @@
|
|||
, lib
|
||||
, ...
|
||||
}:
|
||||
with nixosConfig.nix-rice.lib;
|
||||
let
|
||||
inherit (pkgs.rice) colorPalette opacity;
|
||||
inherit (pkgs.lib) nix-rice;
|
||||
inherit (nixosConfig.nix-rice.rice) colorPalette opacity;
|
||||
alpha = 255 * opacity;
|
||||
grep = "${pkgs.gnugrep}/bin/grep";
|
||||
cut = "${pkgs.coreutils}/bin/cut";
|
||||
|
|
@ -62,27 +62,27 @@ let
|
|||
}"
|
||||
zsh -c 'rofi -show menu -modi "menu:rofi-power-menu --choices=shutdown/reboot/hibernate/logout"'
|
||||
'';
|
||||
colors = nix-rice.palette.toARGBHex rec {
|
||||
colors = palette.toARGBHex rec {
|
||||
normal = {
|
||||
foreground = nix-rice.color.darken 10 colorPalette.foreground;
|
||||
background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
|
||||
foreground = color.darken 10 colorPalette.foreground;
|
||||
background = color.setAlphaRgba alpha colorPalette.background;
|
||||
underline = colorPalette.normal.blue;
|
||||
};
|
||||
|
||||
active = {
|
||||
inherit (colorPalette) foreground;
|
||||
background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
|
||||
background = color.setAlphaRgba alpha colorPalette.background;
|
||||
underline = colorPalette.normal.yellow;
|
||||
};
|
||||
|
||||
selected = {
|
||||
inherit (colorPalette) foreground;
|
||||
background = nix-rice.color.setAlphaRgba alpha colorPalette.background;
|
||||
background = color.setAlphaRgba alpha colorPalette.background;
|
||||
underline = colorPalette.bright.red;
|
||||
};
|
||||
|
||||
inherit (colorPalette.normal) green red yellow;
|
||||
inherit (nix-rice.color) transparent;
|
||||
inherit (color) transparent;
|
||||
orange = colorPalette.bright.red;
|
||||
alert = orange;
|
||||
};
|
||||
|
|
@ -110,29 +110,22 @@ let
|
|||
bottom.size = 0;
|
||||
};
|
||||
font = [
|
||||
"${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2"
|
||||
"${rice.font.monospace.name}:size=${toString rice.font.monospace.size};2"
|
||||
# "Font Awesome 6 Free:size=14;0"
|
||||
# "Noto Color Emoji:size=2;2"
|
||||
"Noto Sans Symbols2:size=${toString pkgs.rice.font.monospace.size};2"
|
||||
"Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
|
||||
# "EmojiOne Color:size=${toString pkgs.rice.font.monospace.size};0"
|
||||
"Noto Sans CJK JP:size=${toString pkgs.rice.font.monospace.size};0"
|
||||
"Noto Sans CJK KR:size=${toString pkgs.rice.font.monospace.size};0"
|
||||
"Noto Sans CJK CN:size=${toString pkgs.rice.font.monospace.size};0"
|
||||
"Noto Sans CJK HK:size=${toString pkgs.rice.font.monospace.size};0"
|
||||
"Noto Sans Symbols2:size=${toString rice.font.monospace.size};2"
|
||||
"Material Design Icons:size=${toString rice.font.monospace.size};2"
|
||||
# "EmojiOne Color:size=${toString rice.font.monospace.size};0"
|
||||
"Noto Sans CJK JP:size=${toString rice.font.monospace.size};0"
|
||||
"Noto Sans CJK KR:size=${toString rice.font.monospace.size};0"
|
||||
"Noto Sans CJK CN:size=${toString rice.font.monospace.size};0"
|
||||
"Noto Sans CJK HK:size=${toString rice.font.monospace.size};0"
|
||||
];
|
||||
enable-ipc = true;
|
||||
wm-restack = "bspwm";
|
||||
};
|
||||
|
||||
ramp = [
|
||||
"▂"
|
||||
"▃"
|
||||
"▄"
|
||||
"▅"
|
||||
"▆"
|
||||
"▇"
|
||||
];
|
||||
ramp = [ "▂" "▃" "▄" "▅" "▆" "▇" ];
|
||||
in
|
||||
{
|
||||
home.packages = builtins.attrValues {
|
||||
|
|
@ -140,7 +133,7 @@ in
|
|||
# emojione
|
||||
# noto-fonts-emoji
|
||||
# font-awesome
|
||||
inherit (pkgs.rice.font.monospace) package;
|
||||
inherit (rice.font.monospace) package;
|
||||
};
|
||||
services.polybar = {
|
||||
enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue