Use Rosé Pine

work
mat ess 2022-11-20 17:25:59 -05:00
parent e1fb9b36fd
commit 65e48c07c9
4 changed files with 35 additions and 10 deletions

View File

@ -38,6 +38,8 @@
dark-mode-notify-src.flake = false;
kitty-icon.url = "github:DinkDonk/kitty-icon";
kitty-icon.flake = false;
kitty-rose-pine.url = "github:rose-pine/kitty";
kitty-rose-pine.flake = false;
fisher-src.url = "github:jorgebucaran/fisher";
fisher-src.flake = false;
};
@ -256,7 +258,7 @@
};
patched = _final: prev: optionalAttrs prev.stdenv.isDarwin {
inherit (inputs) kitty-icon fisher-src;
inherit (inputs) kitty-icon kitty-rose-pine fisher-src;
lib = prev.lib // { homebrew-enabled = inputs.homebrew-enabled.value; };
};
};

View File

@ -72,9 +72,14 @@ in
# }}}
# Colors config ------------------------------------------------------------------------------ {{{
programs.kitty.extras.colors.enable = true;
programs.kitty.extras.colors.dark = colorsToKitty pkgs.lib.colors.tokyonight.dark;
programs.kitty.extras.colors.light = colorsToKitty pkgs.lib.colors.tokyonight.light;
programs.kitty.extras.colors = {
enable = true;
dark = colorsToKitty pkgs.lib.colors.tokyonight.dark;
light = colorsToKitty pkgs.lib.colors.tokyonight.light;
color-pkg = pkgs.kitty-rose-pine;
dark-name = "dist/rose-pine";
light-name = "dist/rose-pine-dawn";
};
programs.fish.functions.set-term-colors = {
body = ''

View File

@ -19,7 +19,7 @@ in
style = "auto";
};
};
# See `./shells.nix` for more on how this is used.
# See `./fish.nix` for more on how this is used.
fish = {
functions = {
set-bat-colors = {
@ -49,7 +49,7 @@ in
enable = true;
package = pkgs.helix-flake;
settings = {
theme = "base16_transparent";
theme = "rose_pine";
editor.indent-guides.render = true;
};
};

View File

@ -23,18 +23,18 @@ let
# Shell scripts for changing Kitty colors
term-background = pkgs.writeShellScriptBin "term-background" ''
# Accepts arguments "light" or "dark".
# Accepts the name of a theme file in color-pkg
# If shell is running in a Kitty window set the colors.
if [ -n "$KITTY_WINDOW_ID" ]; then
kitty @ --to $KITTY_LISTEN_ON set-colors --all --configured \
${kitty-colors}/"$1".conf &
${cfg.colors.color-pkg}/"$1".conf &
fi
'';
term-light = pkgs.writeShellScriptBin "term-light" ''
${term-background}/bin/term-background light
${term-background}/bin/term-background ${cfg.colors.light-name}
'';
term-dark = pkgs.writeShellScriptBin "term-dark" ''
${term-background}/bin/term-background dark
${term-background}/bin/term-background ${cfg.colors.dark-name}
'';
in
{
@ -67,6 +67,24 @@ in
Kitty color settings for light background colorscheme.
'';
};
color-pkg = mkOption {
type = types.package;
default = kitty-colors;
description = "Package from which to load kitty colors.";
};
light-name = mkOption {
type = types.str;
default = "light";
description = "The name to use for the light colorscheme.";
};
dark-name = mkOption {
type = types.str;
default = "dark";
description = "The name to use for the dark colorscheme.";
};
};
useSymbolsFromNerdFont = mkOption {