From b925022a9ef13e06202dab5a1a631233461b7df5 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 31 Mar 2024 22:49:39 +0200 Subject: [PATCH] home-profile: fix zsh config, fix type of wezterm option --- configurations/profile/home/shell/zsh.nix | 36 +++++++++---------- .../profile/home/terminal/wezterm.nix | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configurations/profile/home/shell/zsh.nix b/configurations/profile/home/shell/zsh.nix index cc543f5..5f05409 100644 --- a/configurations/profile/home/shell/zsh.nix +++ b/configurations/profile/home/shell/zsh.nix @@ -87,24 +87,24 @@ in initExtraFirst = '' ${makeIfVar "__MATERUS_HM_ZSH_PROMPT" "p10k" '' - 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 - if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then - __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else - __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; - fi - if [[ -f "${extraPlugins.powerlevel10k.fullPath}" ]]; then - source "${extraPlugins.powerlevel10k.fullPath}" - fi - if [[ -f "${extraPlugins.sudo.fullPath}" ]]; then - source "${extraPlugins.sudo.fullPath}" - fi - if [[ -f "${extraPlugins.extract.fullPath}" ]]; then - source "${extraPlugins.extract.fullPath}" - fi - '' - }''; + 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'' + } + if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then + __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-1}"; else + __MATERUS_HM_ZSH_256COLORS="''${__MATERUS_HM_ZSH_256COLORS:-0}"; + fi + if [[ -f "${extraPlugins.powerlevel10k.fullPath}" ]]; then + source "${extraPlugins.powerlevel10k.fullPath}" + fi + if [[ -f "${extraPlugins.sudo.fullPath}" ]]; then + source "${extraPlugins.sudo.fullPath}" + fi + if [[ -f "${extraPlugins.extract.fullPath}" ]]; then + source "${extraPlugins.extract.fullPath}" + fi + ''; diff --git a/configurations/profile/home/terminal/wezterm.nix b/configurations/profile/home/terminal/wezterm.nix index 540df42..6701e95 100644 --- a/configurations/profile/home/terminal/wezterm.nix +++ b/configurations/profile/home/terminal/wezterm.nix @@ -8,7 +8,7 @@ in options.materus.profile.wezterm.extraConfig = lib.mkOption { default = ""; description = "Config for wezterm"; - type = lib.types.string; + type = lib.types.lines; }; config = lib.mkIf cfg.enable { programs.wezterm.enable = true;