feat: language injections

This commit is contained in:
2024-06-10 18:32:51 +02:00
parent 552e85b6b6
commit b801064f84
3 changed files with 14 additions and 12 deletions

View File

@@ -32,13 +32,14 @@
src = zsh-nix-shell; src = zsh-nix-shell;
} }
]; ];
initExtraFirst = '' initExtraFirst = # sh
if [[ -r "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then ''
source "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" if [[ -r "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
fi source "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
[[ ! -f ${./.p10k.zsh} ]] || source ${./.p10k.zsh} fi
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme [[ ! -f ${./.p10k.zsh} ]] || source ${./.p10k.zsh}
''; source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
'';
}; };
direnv = { direnv = {
enable = true; enable = true;

View File

@@ -14,9 +14,8 @@
conflictstyle = "diff3"; conflictstyle = "diff3";
}; };
mergetool.nvim-mergetool = { mergetool.nvim-mergetool = {
cmd = '' cmd = # sh
nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE" ''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'';
'';
trustExitCode = true; trustExitCode = true;
}; };
mergetool.prompt = false; mergetool.prompt = false;

View File

@@ -263,8 +263,10 @@ in
}; };
gtk = { gtk = {
gtk3.extraCss = "@import './theme.css';"; gtk3.extraCss = # css
gtk4.extraCss = "@import './theme.css';"; "@import './theme.css';";
gtk4.extraCss = # css
"@import './theme.css';";
}; };
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {