pagedmov/shed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More nix-shell kitty theme tweaks

Browse Source
This commit is contained in:
pagedmov
2024-11-24 15:13:17 -05:00
parent 81c9b10810
commit ce6113a7cd
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/home/environment/userpkgs.nix
View File

@@ -11,7 +11,6 @@ let
myScripts.vipkg myScripts.vipkg
myScripts.fetchfromgh myScripts.fetchfromgh
myScripts.garbage-collect myScripts.garbage-collect
myScripts.nsp
myScripts.rebuild myScripts.rebuild
myScripts.chpaper myScripts.chpaper
myScripts.chscheme myScripts.chscheme

4
modules/home/environment/zsh/extraconfig.nix
View File

@@ -21,7 +21,11 @@ in
echo "\$RESULT = $RESULT" echo "\$RESULT = $RESULT"
} }
precmd() { # Reset kitty color scheme precmd() { # Reset kitty color scheme
if [ "$NIX_SHELL" = "false" ]; then # don't run this in a nix-shell
trap 'NIX_SHELL=false kitty_theme' EXIT SIGINT SIGTERM SIGHUP trap 'NIX_SHELL=false kitty_theme' EXIT SIGINT SIGTERM SIGHUP
else # but still apply ssh theme logic in nix-shell
trap 'kitty_theme' EXIT SIGINT SIGTERM SIGHUP
fi
} }
nix-shell() { nix-shell() {
NIX_SHELL=true command nix-shell "$@" --run zsh NIX_SHELL=true command nix-shell "$@" --run zsh

18
modules/home/files.nix
View File

@@ -7,26 +7,26 @@ let
extractSchemeFromYaml = base16_scheme: let extractSchemeFromYaml = base16_scheme: let
scheme_path = "${pkgs.base16-schemes}/share/themes/${base16_scheme}.yaml"; scheme_path = "${pkgs.base16-schemes}/share/themes/${base16_scheme}.yaml";
scheme_string = builtins.readFile scheme_path; scheme_string = builtins.readFile scheme_path;
scheme_list = lib.splitString "\n" scheme_string; scheme_list = lib.splitString "\n" scheme_string; # Split into a list
colors = colors =
lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null) lib.filter (line: builtins.match "^ *base[0-9A-F]{2}: .*" line != null) # Get raw hex values from scheme list
scheme_list; scheme_list;
parsed_scheme = lib.lists.foldl' (acc: line: parsed_scheme = lib.lists.foldl' (acc: line: # Initialize attribute set and begin folding values into it
let let
splitLine = lib.splitString ": " line; splitLine = lib.splitString ": " line; # Split into keys (base00, base01, etc.) and values
key = builtins.elemAt splitLine 0; key = builtins.elemAt splitLine 0;
value = builtins.elemAt splitLine 1; value = builtins.elemAt splitLine 1;
trimmedKey = lib.trim key; trimmedKey = lib.trim key; # Start cleaning values
cleanValue_step1 = lib.splitString " " value; cleanValue_step1 = lib.splitString " " value;
cleanValue_step2 = builtins.elemAt cleanValue_step1 0; cleanValue_step2 = builtins.elemAt cleanValue_step1 0; # Get just the hex value, ignore comments etc.
cleanValue_final = cleanValue_final =
builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2) builtins.substring 1 (builtins.stringLength cleanValue_step2 - 2)
cleanValue_step2; cleanValue_step2;
in acc // { "${trimmedKey}" = cleanValue_final; }) { } colors; in acc // { "${trimmedKey}" = cleanValue_final; }) { } colors; # Accumulate keys/values into attribute set
in parsed_scheme; in parsed_scheme; # Return parsed color scheme
ssh_scheme = extractSchemeFromYaml "atelier-cave" ; ssh_scheme = extractSchemeFromYaml "atelier-cave" ;
nix-shell_scheme = extractSchemeFromYaml "apathy"; nix-shell_scheme = extractSchemeFromYaml "blueish";
def_scheme = config.lib.stylix.colors; def_scheme = config.lib.stylix.colors;