megamanmalte/nixos
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[*] Rework colors

Browse source
This commit is contained in:
Malte Tammena 2022-04-17 19:44:06 +02:00
parent 33907d0aec
commit 6c1e8ebb26
16 changed files with 276 additions and 225 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -121,7 +121,6 @@
utils.overlay
(self: super: {
# Add fonts
firaCodeNerd = super.nerdfonts.override {fonts = ["FiraCode"];};
hackNerdLigatures = super.callPackage ./pkgs/hack.nix {};
# Add the emulator
"2a-emulator" =

4
hosts/helix-texta.nix
View file

@ -100,10 +100,10 @@
# Use some fonts
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [firaCodeNerd noto-fonts noto-fonts-cjk joypixels];
fonts = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
fontconfig = {
enable = true;
defaultFonts.monospace = ["FiraCode Nerd Font"];
defaultFonts.monospace = ["Hack NF FC Ligatured"];
};
};

4
hosts/murex-pecten.nix
View file

@ -75,10 +75,10 @@
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [firaCodeNerd noto-fonts noto-fonts-cjk joypixels];
fonts = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
fontconfig = {
enable = true;
defaultFonts.monospace = ["FiraCode Nerd Font"];
defaultFonts.monospace = ["Hack NF FC Ligatured"];
};
};

2
hosts/trochulus-hispidus.nix
View file

@ -83,7 +83,7 @@
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [firaCodeNerd noto-fonts noto-fonts-cjk joypixels];
fonts = with pkgs; [hackNerdLigatures noto-fonts noto-fonts-cjk joypixels];
fontconfig = {enable = true;};
};

28
pkgs/bemenu-configured.nix Normal file
View file

@ -0,0 +1,28 @@
{
pkgs,
config,
cmd ? "bemenu-run",
...
}: let
col = config.colors;
in
pkgs.writeShellApplication {
name = "bemenu-run-configured";
runtimeInputs = [
pkgs.bemenu
pkgs.hackNerdLigatures
];
text = ''
exec ${cmd} -inl80 \
--fn 'Hack NF FC Ligatured 11' \
--tb=${col.warn.hashRgb} \
--tf=${col.bg.hashRgb} \
--fb=${col.bg.hashRgb} \
--ff=${col.fg.hashRgb} \
--nb=${col.bg.hashRgb} \
--nf=${col.fg.hashRgb} \
--hb=${col.primary.hashRgb} \
--hf=${col.bg.hashRgb} \
"$@"
'';
}

16
users/malte/bemenu.nix
View file

@ -1,16 +0,0 @@
{pkgs, ...}:
pkgs.writeScriptBin "bemenu-run-configured" ''
#!${pkgs.stdenv.shell}
exec ${pkgs.bemenu}/bin/bemenu-run -inl80 \
--fn 'FiraCode Nerd Font 11' \
--tb=#282828 \
--tf=#ebdbb2 \
--fb=#282828 \
--ff=#ebdbb2 \
--nb=#282828 \
--nf=#ebdbb2 \
--hb=#ebdbb2 \
--hf=#282828 \
$@
''

4
users/malte/cataclysm-dda.nix
View file

@ -1,6 +1,4 @@
{pkgs, ...}: let
font = "${pkgs.firaCodeNerd}/share/fonts/truetype/NerdFonts/Fira Code Bold Nerd Font Complete Mono.ttf";
# Set SDL_VIDEODRIVER=wayland to run it natively. Currently still needs the patch
# in ../patches/cdda-wayland-sdl-fix.patch.
cataclysm-dda-wayland-sdl = pkgs.symlinkJoin {
@ -12,7 +10,7 @@
paths = [pkgs.cataclysm-dda-git];
};
in {
home.packages = [cataclysm-dda-wayland-sdl pkgs.firaCodeNerd];
home.packages = [cataclysm-dda-wayland-sdl pkgs.hackNerdLigatures];
# Configure the fonts being used
# TODO: Cataclysm replaces this with a file..

55
users/malte/colors.nix
View file

@ -112,18 +112,47 @@ in {
config.colors =
builtins.mapAttrs (name: hexRGB: mkColor hexRGB) config.colorDef;
config.colorDef = {
background = "282828";
background2 = "504945";
foreground = "EBDBB2";
backgroundDimmed = "3C3836";
foregroundDimmed = "D5C4A1";
primary = "689D6A";
secondary = "458588";
warn = "FE8019";
error = "FB4934";
yellow = "FABD2F";
green = "B8BB26";
gray = "A89984";
config.colorDef = rec {
dark0 = "282828";
dark1 = "3C3836";
dark2 = "504945";
gray = "928374";
light0 = "FBF1C7";
light1 = "EBDBB2";
light2 = "D5C4A1";
light4 = "A89984";
brightRed = "FB4934";
brightGreen = "B8BB26";
brightYellow = "FABD2F";
brightBlue = "83A598";
brightPurple = "D3869B";
brightAqua = "8EC07C";
brightOrange = "FE8019";
neutralRed = "CC241D";
neutralGreen = "98971A";
neutralYellow = "D79921";
neutralBlue = "458588";
neutralPurple = "B16286";
neutralAqua = "689D6A";
neutralOrange = "D65D0E";
fadedRed = "9D0006";
fadedGreen = "79740E";
fadedYellow = "B57614";
fadedBlue = "076678";
fadedPurple = "8F3F71";
fadedAqua = "427B58";
fadedOrange = "AF3A03";
bg = dark0;
fg = light1;
primary = neutralAqua;
secondary = neutralBlue;
warn = brightOrange;
error = brightRed;
undef = "FF0000";
};
}

15
users/malte/kakoune.nix
View file

@ -4,6 +4,8 @@
config,
...
}: let
col = config.colors;
# Configuration for kakoune plugins
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
pluginConfigs = with pkgs.kakounePlugins; [
@ -104,17 +106,20 @@
# Additional configuration for kakoune
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
additionalConfig = ''
additionalConfig = let
fg62 = col.fg.rgbWithAlpha 0.62;
bg1 = col.dark1.rgb;
in ''
add-highlighter global/ number-lines -relative
add-highlighter global/ wrap -word -indent
add-highlighter global/ regex '\h*(//|#|;|%)\h*(TODO:|FIXME:)([^\n]*)' 2:black,bright-red+Fb 3:default+b
# Highlighter for headers in the nix config
add-highlighter global/ regex '^\h*#\h*([^\n]+)\n\h*#\h*(‾+)$' 1:bright-yellow+bf 2:yellow+bf
face global PrimarySelection rgba:ebdbb2a0,rgba:8ec07c40
face global SecondarySelection rgba:ebdbb2a0,rgba:83a59840
face global MatchingChar rgb:ebdbb2,rgb:3c3836+bf
face global Reference rgb:3c3836
face global PrimarySelection rgba:${fg62},rgba:8ec07c40
face global SecondarySelection rgba:${fg62},rgba:83a59840
face global MatchingChar rgb:${col.fg.rgb},rgb:${bg1}+bf
face global Reference rgb:${bg1}
# Do something about tabs..
map global insert <tab> ' '

50
users/malte/kitty.nix
View file

@ -1,9 +1,15 @@
{pkgs, ...}: {
{
pkgs,
config,
...
}: let
col = config.colors;
in {
programs.kitty = {
enable = true;
font = {
name = "Hack Nerd Font FC Ligatured";
name = "Hack NF FC Ligatured";
package = pkgs.hackNerdLigatures;
size = 9;
};
@ -16,26 +22,26 @@
allow_remote_control = "yes";
# https://github.com/gruvbox-community/gruvbox-contrib/blob/master/kitty/gruvbox-dark.conf
background = "#282828";
foreground = "#ebdbb2";
cursor = "#ebdbb2";
url_color = "#83a598";
color0 = "#282828";
color8 = "#928374";
color1 = "#cc241d";
color9 = "#fb4934";
color2 = "#98971a";
color10 = "#b8bb26";
color3 = "#d79921";
color11 = "#fabd2f";
color4 = "#458588";
color12 = "#83a598";
color5 = "#b16286";
color13 = "#d3869b";
color6 = "#689d6a";
color14 = "#8ec07c";
color7 = "#a89984";
color15 = "#ebdbb2";
background = col.bg.hashRgb;
foreground = col.fg.hashRgb;
cursor = col.fg.hashRgb;
url_color = col.brightBlue.hashRgb;
color0 = col.bg.hashRgb;
color1 = col.neutralRed.hashRgb;
color2 = col.neutralGreen.hashRgb;
color3 = col.neutralYellow.hashRgb;
color4 = col.neutralBlue.hashRgb;
color5 = col.neutralPurple.hashRgb;
color6 = col.neutralAqua.hashRgb;
color7 = col.light4.hashRgb;
color8 = col.light4.hashRgb;
color9 = col.brightRed.hashRgb;
color10 = col.brightGreen.hashRgb;
color11 = col.brightYellow.hashRgb;
color12 = col.brightBlue.hashRgb;
color13 = col.brightPurple.hashRgb;
color14 = col.brightAqua.hashRgb;
color15 = col.light1.hashRgb;
};
};
}

20
users/malte/mako.nix
View file

@ -9,16 +9,16 @@ in {
enable = true;
anchor = "top-right";
font = "Hack NF FC Ligatured 11";
backgroundColor = col.foreground.hashRgb;
textColor = col.background.hashRgb;
borderColor = col.background.hashRgb;
backgroundColor = col.fg.hashRgb;
textColor = col.bg.hashRgb;
borderColor = col.bg.hashRgb;
borderSize = 1;
borderRadius = 3;
defaultTimeout = 4000;
width = 400;
height = 500;
format = ''
<span color='${col.background2.hashRgb}'><i>%a</i></span>\n<b>%s</b> %b"'';
<span color='${col.dark2.hashRgb}'><i>%a</i></span>\n<b>%s</b> %b"'';
layer = "overlay";
margin = "5";
padding = "6";
@ -28,24 +28,24 @@ in {
[urgency=low]
default-timeout=3000
background-color=${col.gray.hashRgb}
background-color=${col.light4.hashRgb}
[urgency=normal]
background-color=${col.yellow.hashRgb}
background-color=${col.brightYellow.hashRgb}
[urgency=high]
default-timeout=10000
background-color=${col.warn.hashRgb}
[actionable]
format=<span color="${col.background2.hashRgb}"><i>%a</i></span> \n<b>%s</b> %b
format=<span color="${col.dark2.hashRgb}"><i>%a</i></span> \n<b>%s</b> %b
[hidden]
background-color=${col.gray.hashRgb}
background-color=${col.light4.hashRgb}
format=... %h more
[app-name=fish urgency=normal]
background-color=${col.green.hashRgb}
background-color=${col.brightGreen.hashRgb}
format= <b>%s</b>\n%b
[app-name=fish urgency=critical]
@ -74,5 +74,5 @@ in {
Install = {WantedBy = ["graphical-session.target"];};
};
home.packages = [pkgs.firaCodeNerd];
home.packages = [pkgs.hackNerdLigatures];
}

4
users/malte/mpv.nix
View file

@ -9,8 +9,8 @@ in {
enable = true;
package = pkgs.mpv-with-scripts;
config = {
sub-color = (col.yellow.lighter 0.3).hashRgb;
sub-border-color = col.background.hashRgb;
sub-color = (col.brightYellow.lighter 0.3).hashRgb;
sub-border-color = col.bg.hashRgb;
sub-border-size = 1;
sub-font-size = 45;
};

68
users/malte/pass.nix
View file

@ -1,48 +1,46 @@
{pkgs, ...}: let
sed = "${pkgs.gnused}/bin/sed";
pass = "${pkgs.pass}/bin/pass";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
notify-send = "${pkgs.libnotify}/bin/notify-send";
bemenu = ''
${pkgs.bemenu}/bin/bemenu -inl80 \
--fn 'FiraCode Nerd Font 11' \
--tb=#282828 \
--tf=#ebdbb2 \
--fb=#282828 \
--ff=#ebdbb2 \
--nb=#282828 \
--nf=#ebdbb2 \
--hb=#ebdbb2 \
--hf=#282828 \
-p 'Password:'
'';
{
pkgs,
config,
...
}: let
col = config.colors;
passmenu-bemenu = pkgs.writeScriptBin "passmenu-bemenu" ''
#!${pkgs.stdenv.shell}
bemenuConfigured = pkgs.callPackage ../../pkgs/bemenu-configured.nix {
inherit config;
cmd = "bemenu";
};
PREFIX=~/.local/share/password-store/
SUFFIX=.gpg
passmenu-bemenu = pkgs.writeShellApplication {
name = "passmenu-bemenu";
runtimeInputs = [
bemenuConfigured
pkgs.fd
pkgs.gnused
pkgs.libnotify
pkgs.pass
pkgs.wl-clipboard
];
text = ''
PREFIX=~/.local/share/password-store/
SUFFIX=.gpg
set -o pipefail
set -o pipefail
selection=$( ${pkgs.fd}/bin/fd '.gpg' "$PREFIX" \
| ${sed} "s|$PREFIX||" \
| ${sed} "s|$SUFFIX||" \
| ${bemenu} )
selection=$( fd '.gpg' "$PREFIX" \
| sed "s|$PREFIX||" \
| sed "s|$SUFFIX||" \
| bemenu-run-configured -p 'Password:' )
if [[ $? -ne 0 ]]; then
exit 1
fi
PASSWORD_STORE_DIR="$PREFIX" pass show "$selection" | wl-copy -o || exit 2
PASSWORD_STORE_DIR="$PREFIX" ${pass} show "$selection" | ${wl-copy} -o || exit 2
${notify-send} -u low -a Pass "$selection" "Copied to clipboard"
'';
notify-send -u low -a Pass "$selection" "Copied to clipboard"
'';
};
in {
programs.password-store = {
enable = true;
settings = {PASSWORD_STORE_KEY = "BCE9E4BF632E7CED";};
};
home.packages = [passmenu-bemenu pkgs.firaCodeNerd];
home.packages = [passmenu-bemenu pkgs.hackNerdLigatures];
}

83
users/malte/sway.nix
View file

@ -14,11 +14,11 @@
sha256 = "d28r/s+m32hqzF/S/ebyBCd5XLKJTFSaQXmMdHFUH64=";
};
bemenu = (import ./bemenu.nix) pkgs;
bemenu = pkgs.callPackage ../../pkgs/bemenu-configured.nix {inherit config;};
grim = "${pkgs.grim}/bin/grim";
wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
wf-recorder = "${pkgs.wf-recorder}/bin/wf-recorder";
slurp = "${pkgs.slurp}/bin/slurp -db '#000000AA' -c '#EBDBB2' -w1";
slurp = "${pkgs.slurp}/bin/slurp -db '#000000AA' -c '${col.light1.hashRgb}' -w1";
fuser = "${pkgs.psmisc}/bin/fuser";
alsa_rec = "alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink.monitor";
@ -42,37 +42,37 @@
effect-pixelate=50
fade-in=0.5
font=FiraCode Nerd Font
font=Hack NF FC Ligatured
font-size=70
indicator-radius=120
indicator-thickness=3
key-hl-color=#fbf1c7
bs-hl-color=#d65d0e
key-hl-color=${col.light0.hashRgb}
bs-hl-color=${col.neutralOrange.hashRgb}
inside-color=#282828cc
line-color=#282828
ring-color=#d5c5a1
text-color=#ebdbb2
inside-color=${col.bg.hashRgbWithAlpha 0.8}
line-color=${col.bg.hashRgb}
ring-color=${col.light2.hashRgb}
text-color=${col.fg.hashRgb}
inside-clear-color=#282828cc
line-clear-color=#282828
ring-clear-color=#d5c5a1
text-clear-color=#ebdbb2
inside-clear-color=${col.bg.hashRgbWithAlpha 0.8}
line-clear-color=${col.bg.hashRgb}
ring-clear-color=${col.light2.hashRgb}
text-clear-color=${col.fg.hashRgb}
inside-ver-color=#282828cc
line-ver-color=#282828
ring-ver-color=#d5c5a1
text-ver-color=#ebdbb2
inside-ver-color=${col.bg.hashRgbWithAlpha 0.8}
line-ver-color=${col.bg.hashRgb}
ring-ver-color=${col.light2.hashRgb}
text-ver-color=${col.fg.hashRgb}
inside-wrong-color=#282828cc
line-wrong-color=#282828
ring-wrong-color=#cc241d
text-wrong-color=#ebdbb2
inside-wrong-color=${col.bg.hashRgbWithAlpha 0.8}
line-wrong-color=${col.bg.hashRgb}
ring-wrong-color=${col.error.hashRgb}
text-wrong-color=${col.fg.hashRgb}
inside-caps-lock-color=#282828cc
line-caps-lock-color=#282828
ring-caps-lock-color=#d65d0e
text-caps-lock-color=#ebdbb2
inside-caps-lock-color=${col.bg.hashRgbWithAlpha 0.8}
line-caps-lock-color=${col.bg.hashRgb}
ring-caps-lock-color=${col.warn.hashRgb}
text-caps-lock-color=${col.fg.hashRgb}
'';
cfg = config.settings.sway;
@ -87,7 +87,6 @@ in {
config = lib.mkIf cfg.enable {
home.packages = [
pkgs.firaCodeNerd
pkgs.grim
pkgs.libappindicator
pkgs.libappindicator-gtk3
@ -257,7 +256,7 @@ in {
};
fonts = {
names = ["FiraCode Nerd Font"];
names = ["Hack NF FC Ligatured"];
size = 8.0;
};
@ -333,12 +332,10 @@ in {
colors = let
primary = col.primary.hashRgb;
secondary = col.secondary.hashRgb;
secondaryDark = "#324748";
#primaryDimmed = (col.primary.darker 0.6).hashRgb;
background = col.background.hashRgb;
foregroundDimm = col.foregroundDimmed.hashRgb;
border0 = (col.background.lighter 0.3).hashRgb;
border1 = (col.background.lighter 0.8).hashRgb;
background = col.bg.hashRgb;
light2 = col.light2.hashRgb;
border0 = (col.bg.lighter 0.3).hashRgb;
border1 = (col.bg.lighter 0.8).hashRgb;
in {
focused = {
background = primary;
@ -349,24 +346,24 @@ in {
};
focusedInactive = {
inherit background;
border = secondaryDark;
childBorder = secondaryDark;
indicator = secondaryDark;
text = "#FF0000";
border = background;
childBorder = background;
indicator = background;
text = col.undef.hashRgb;
};
unfocused = {
inherit background;
border = border0;
childBorder = border0;
indicator = border0;
text = foregroundDimm;
text = light2;
};
urgent = {
background = "#FF0000";
border = "#FF0000";
childBorder = "#FF0000";
indicator = "#FF0000";
text = "#FF0000";
background = col.undef.hashRgb;
border = col.undef.hashRgb;
childBorder = col.undef.hashRgb;
indicator = col.undef.hashRgb;
text = col.undef.hashRgb;
};
};
};

79
users/malte/waybar.nix
View file

@ -84,7 +84,7 @@
fi
'';
in {
home.packages = [pkgs.firaCodeNerd task-activity];
home.packages = [pkgs.hackNerdLigatures task-activity];
programs.waybar = {
enable = true;
@ -104,7 +104,7 @@ in {
all-outputs = true;
};
"sway/mode" = {
format = "<span foreground='${col.background.hashRgb}'>{}</span>";
format = "<span foreground='${col.bg.hashRgb}'>{}</span>";
};
"sway/window" = {tooltip = false;};
@ -155,10 +155,10 @@ in {
tooltip = false;
};
"network" = {
format-wifi = "{essid} ({signalStrength}%) ";
format-ethernet = "{ifname}: {ipaddr}/{cidr} ";
format-linked = "{ifname} (No IP) ";
format-disconnected = "睊 ";
format-wifi = " <b>{essid}</b> ({signalStrength}%)";
format-ethernet = "酪 <b>{ifname}<b> {ipaddr}/{cidr}";
format-linked = "酪 <b>{ifname}<b>";
format-disconnected = " ";
tooltip = false;
interval = 5;
};
@ -170,15 +170,15 @@ in {
* {
border: none;
border-radius: 0;
font-family: FiraCode Nerd Font;
font-family: Hack NF FC Ligatured;
font-size: 11px;
min-height: 20px;
}
window#waybar {
background-color: ${col.background.hashRgb};
background-color: ${col.bg.hashRgb};
border-bottom: 3px solid ${
(col.background.darker darkenBorder).hashRgb
(col.bg.darker darkenBorder).hashRgb
};
color: ${col.primary.hashRgb};
}
@ -190,7 +190,7 @@ in {
tooltip {
margin: 0;
padding: 0;
background-color: ${col.background.hashRgb};
background-color: ${col.bg.hashRgb};
color: ${col.primary.hashRgb};
border: 1px solid ${(col.primary.darker darkenBorder).hashRgb}
}
@ -205,47 +205,48 @@ in {
#workspaces button {
padding: 0 5px;
background-color: transparent;
color: #3c3836;
color: ${col.dark1.hashRgb};
font-weight: bolder;
min-width: 20px;
border-bottom: 3px solid ${
(col.background.darker darkenBorder).hashRgb
(col.bg.darker darkenBorder).hashRgb
};
}
#workspaces button.urgent {
background-color: #fb4934;
background-color: ${col.warn.hashRgb};
color: ${col.bg.hashRgb};
}
#workspaces button.current_output {
color: #928374;
color: ${col.gray.hashRgb};
}
#workspaces button.visible {
color: ${col.background.hashRgb};
background-color: ${col.backgroundDimmed.hashRgb};
color: ${col.bg.hashRgb};
background-color: ${col.dark1.hashRgb};
}
#workspaces button.current_output.visible {
color: #282828;
background-color: #928374;
color: ${col.bg.hashRgb};
background-color: ${col.gray.hashRgb};
}
#workspaces button.current_output.focused {
background-color: ${col.primary.hashRgb};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${(col.primary.darker darkenBorder).hashRgb};
}
#mode {
background-color: ${col.warn.hashRgb};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${(col.warn.darker darkenBorder).hashRgb};
}
#workspaces button:hover {
background-color: ${col.primary.hashRgb};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${(col.primary.darker darkenBorder).hashRgb};
}
@ -257,7 +258,7 @@ in {
#custom-new-mail
#custom-check-system {
padding: 0 10px;
color: ${col.foregroundDimmed.hashRgb};
color: ${col.light2.hashRgb};
}
#custom-taskwarrior,
@ -265,9 +266,9 @@ in {
padding: 0px 10px 0px 13px;
margin-right: 10px;
font-weight: bolder;
background-color: ${col.yellow.hashRgb};
color: ${col.background.hashRgb};
border-bottom: 3px solid ${(col.yellow.darker darkenBorder).hashRgb};
background-color: ${col.brightYellow.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${(col.brightYellow.darker darkenBorder).hashRgb};
}
#custom-check-system {
@ -279,17 +280,17 @@ in {
#network {
margin-right: 10px;
background-color: ${col.foregroundDimmed.hashRgb};
color: ${col.background.hashRgb};
background-color: ${col.light4.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${
(col.foregroundDimmed.darker darkenBorder).hashRgb
(col.light2.darker darkenBorder).hashRgb
};
}
#network.disconnected {
padding: 0px 10px 0px 13px;
background-color: ${col.warn.hashRgb};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${(col.warn.darker darkenBorder).hashRgb};
}
@ -297,10 +298,10 @@ in {
padding: 0px 10px 0px 13px;
margin-right: 10px;
font-weight: bolder;
background-color: ${col.foregroundDimmed.hashRgb};
color: ${col.background.hashRgb};
background-color: ${col.light2.hashRgb};
color: ${col.bg.hashRgb};
border-bottom: 3px solid ${
(col.foregroundDimmed.darker darkenBorder).hashRgb
(col.light2.darker darkenBorder).hashRgb
};
}
@ -310,7 +311,7 @@ in {
}
#clock {
color: ${col.foreground.hashRgb};
color: ${col.fg.hashRgb};
border-bottom: 3px solid transparent;
}
@ -343,11 +344,11 @@ in {
}
#battery {
background-color: ${col.foregroundDimmed.hashRgb};
background-color: ${col.light4.hashRgb};
border-bottom: 3px solid ${
(col.foregroundDimmed.darker darkenBorder).hashRgb
(col.light2.darker darkenBorder).hashRgb
};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
}
#battery.warning:not(.charging) {
@ -369,7 +370,7 @@ in {
}
#tray menu {
background-color: ${col.background.hashRgb};
background-color: ${col.bg.hashRgb};
color: ${col.primary.hashRgb};
border: 1px solid ${col.primary.hashRgb};
padding: 0;
@ -378,7 +379,7 @@ in {
}
#tray menu menuitem {
border-bottom: 1px solid #3c3836;
border-bottom: 1px solid ${col.dark1.hashRgb};
}
#tray menu menuitem:last-child {
@ -387,7 +388,7 @@ in {
#tray menu menuitem:hover {
background-color: ${col.primary.hashRgb};
color: ${col.background.hashRgb};
color: ${col.bg.hashRgb};
}
'';
};

68
users/malte/zathura.nix
View file

@ -1,49 +1,55 @@
{pkgs, ...}: {
home.packages = [pkgs.firaCodeNerd];
{
pkgs,
config,
...
}: let
col = config.colors;
in {
home.packages = [pkgs.hackNerdLigatures];
programs.zathura = {
enable = true;
options = {
selection-clipboard = "clipboard";
font = "Fira Code Nerd Font 8";
font = "Hack NF FC Ligatured 9";
# Gruvbox (based on: https://github.com/eastack/zathura-gruvbox)
notification-error-bg = "#282828";
notification-error-fg = "#fb4934";
notification-warning-bg = "#282828";
notification-warning-fg = "#fabd2f";
notification-bg = "#282828";
notification-fg = "#b8bb26";
notification-error-bg = col.bg.hashRgb;
notification-error-fg = col.error.hashRgb;
notification-warning-bg = col.bg.hashRgb;
notification-warning-fg = col.warn.hashRgb;
notification-bg = col.bg.hashRgb;
notification-fg = col.brightGreen.hashRgb;
completion-bg = "#3c3836";
completion-fg = "#d5c4a1";
completion-group-bg = "#282828";
completion-group-fg = "#928374";
completion-highlight-bg = "#689d6a";
completion-highlight-fg = "#282828";
completion-bg = col.dark1.hashRgb;
completion-fg = col.light2.hashRgb;
completion-group-bg = col.bg.hashRgb;
completion-group-fg = col.gray.hashRgb;
completion-highlight-bg = col.primary.hashRgb;
completion-highlight-fg = col.bg.hashRgb;
index-bg = "#282828";
index-fg = "#d5c4a1";
index-active-bg = "#689d6a";
index-active-fg = "#282828";
index-bg = col.bg.hashRgb;
index-fg = col.light2.hashRgb;
index-active-bg = col.primary.hashRgb;
index-active-fg = col.bg.hashRgb;
inputbar-bg = "#282828";
inputbar-fg = "#d5c4a1";
inputbar-bg = col.bg.hashRgb;
inputbar-fg = col.light2.hashRgb;
statusbar-bg = "#282828";
statusbar-fg = "#a89984";
statusbar-bg = col.bg.hashRgb;
statusbar-fg = col.light4.hashRgb;
highlight-color = "#fabd2f";
highlight-active-color = "#fe8019";
highlight-color = col.brightYellow.hashRgb;
highlight-active-color = col.brightOrange.hashRgb;
default-bg = "#282828";
default-fg = "#d5c4a1";
default-bg = col.bg.hashRgb;
default-fg = col.light2.hashRgb;
render-loading = "true";
render-loading-bg = "#282828";
render-loading-fg = "#d5c4a1";
render-loading-bg = col.bg.hashRgb;
render-loading-fg = col.light2.hashRgb;
recolor-lightcolor = "#282828";
recolor-darkcolor = "#d5c4a1";
recolor-lightcolor = col.bg.hashRgb;
recolor-darkcolor = col.light2.hashRgb;
recolor = "true";
recolor-keephue = "true";
};