From b801064f842cae91da2b841f15e82852bc9e86e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Mon, 10 Jun 2024 18:32:51 +0200 Subject: [PATCH] feat: language injections --- modules/home-manager/programs/default.nix | 15 ++++++++------- modules/home-manager/programs/git.nix | 5 ++--- modules/home-manager/theme/md3-evo.nix | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/home-manager/programs/default.nix b/modules/home-manager/programs/default.nix index a081dfc..6000c70 100644 --- a/modules/home-manager/programs/default.nix +++ b/modules/home-manager/programs/default.nix @@ -32,13 +32,14 @@ src = zsh-nix-shell; } ]; - initExtraFirst = '' - if [[ -r "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then - source "''${XDG_CACHE_HOME:-''$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" - fi - [[ ! -f ${./.p10k.zsh} ]] || source ${./.p10k.zsh} - source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme - ''; + 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" + fi + [[ ! -f ${./.p10k.zsh} ]] || source ${./.p10k.zsh} + source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme + ''; }; direnv = { enable = true; diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix index f6632d9..db66dbf 100644 --- a/modules/home-manager/programs/git.nix +++ b/modules/home-manager/programs/git.nix @@ -14,9 +14,8 @@ conflictstyle = "diff3"; }; mergetool.nvim-mergetool = { - cmd = '' - nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE" - ''; + cmd = # sh + ''nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"''; trustExitCode = true; }; mergetool.prompt = false; diff --git a/modules/home-manager/theme/md3-evo.nix b/modules/home-manager/theme/md3-evo.nix index 06b5639..a7acf58 100644 --- a/modules/home-manager/theme/md3-evo.nix +++ b/modules/home-manager/theme/md3-evo.nix @@ -263,8 +263,10 @@ in }; gtk = { - gtk3.extraCss = "@import './theme.css';"; - gtk4.extraCss = "@import './theme.css';"; + gtk3.extraCss = # css + "@import './theme.css';"; + gtk4.extraCss = # css + "@import './theme.css';"; }; wayland.windowManager.hyprland = {