diff --git a/home/programs/desktop/fonts.nix b/home/programs/desktop/fonts.nix index 48aa14b..9660c47 100644 --- a/home/programs/desktop/fonts.nix +++ b/home/programs/desktop/fonts.nix @@ -1,9 +1,5 @@ { pkgs, lib, ... }: { - xdg.dataFile."fonts" = { - source = ./fonts; - recursive = true; - }; home.packages = [ (import ../../../../pkgs/fonts/kose.nix { inherit pkgs lib; diff --git a/home/programs/documents/zathura.nix b/home/programs/documents/zathura.nix index 33e1ce9..a569ebb 100644 --- a/home/programs/documents/zathura.nix +++ b/home/programs/documents/zathura.nix @@ -4,44 +4,44 @@ ... }: { - xdg.configFile."zathura/stylix".text = '' - set default-fg "#${config.lib.stylix.colors.base05}" - set default-bg "#${config.lib.stylix.colors.base00}" + xdg.configFile."zathura/stylix".text = with config.lib.stylix.colors.withHashtag; '' + set default-fg "${base05}" + set default-bg "${base00}" - set completion-bg "#${config.lib.stylix.colors.base02}" - set completion-fg "#${config.lib.stylix.colors.base05}" - set completion-highlight-bg "#${config.lib.stylix.colors.base01}" - set completion-highlight-fg "#${config.lib.stylix.colors.base05}" - set completion-group-bg "#${config.lib.stylix.colors.base02}" - set completion-group-fg "#${config.lib.stylix.colors.base0D}" + set completion-bg "${base02}" + set completion-fg "${base05}" + set completion-highlight-bg "${base01}" + set completion-highlight-fg "${base05}" + set completion-group-bg "${base02}" + set completion-group-fg "${base0D}" - set statusbar-fg "#${config.lib.stylix.colors.base05}" - set statusbar-bg "#${config.lib.stylix.colors.base02}" + set statusbar-fg "${base05}" + set statusbar-bg "${base02}" - set notification-bg "#${config.lib.stylix.colors.base02}" - set notification-fg "#${config.lib.stylix.colors.base05}" - set notification-error-bg "#${config.lib.stylix.colors.base02}" - set notification-error-fg "#${config.lib.stylix.colors.base08}" - set notification-warning-bg "#${config.lib.stylix.colors.base02}" - set notification-warning-fg "#${config.lib.stylix.colors.base0A}" + set notification-bg "${base02}" + set notification-fg "${base05}" + set notification-error-bg "${base02}" + set notification-error-fg "${base08}" + set notification-warning-bg "${base02}" + set notification-warning-fg "${base0A}" - set inputbar-fg "#${config.lib.stylix.colors.base05}" - set inputbar-bg "#${config.lib.stylix.colors.base02}" + set inputbar-fg "${base05}" + set inputbar-bg "${base02}" - set recolor-lightcolor "#${config.lib.stylix.colors.base00}" - set recolor-darkcolor "#${config.lib.stylix.colors.base05}" + set recolor-lightcolor "${base00}" + set recolor-darkcolor "${base05}" - set index-fg "#${config.lib.stylix.colors.base05}" - set index-bg "#${config.lib.stylix.colors.base00}" - set index-active-fg "#${config.lib.stylix.colors.base05}" - set index-active-bg "#${config.lib.stylix.colors.base02}" + set index-fg "${base05}" + set index-bg "${base00}" + set index-active-fg "${base05}" + set index-active-bg "${base02}" - set render-loading-bg "#${config.lib.stylix.colors.base00}" - set render-loading-fg "#${config.lib.stylix.colors.base05}" + set render-loading-bg "${base00}" + set render-loading-fg "${base05}" - set highlight-color "#${config.lib.stylix.colors.base01}" - set highlight-fg "#${config.lib.stylix.colors.base0E}" - set highlight-active-color "#${config.lib.stylix.colors.base0E}" + set highlight-color "${base01}" + set highlight-fg "${base0E}" + set highlight-active-color "${base0E}" ''; programs.zathura = { enable = true; @@ -53,7 +53,7 @@ set recolor true - set font 'Comic Code' + set font '${config.stylix.fonts.monospace.name}' ''; }; }