diff --git a/config/zsh/p10k.zsh b/config/zsh/p10k.zsh index 9493bd9f..4098b2c8 100644 --- a/config/zsh/p10k.zsh +++ b/config/zsh/p10k.zsh @@ -1671,4 +1671,3 @@ typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} (( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -' diff --git a/config/zsh/zshrc.zsh b/config/zsh/zshrc.zsh index 03e87de4..e69de29b 100644 --- a/config/zsh/zshrc.zsh +++ b/config/zsh/zshrc.zsh @@ -1,9 +0,0 @@ -# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. -# Initialization code that may require console input (password prompts, [y/n] -# confirmations, etc.) must go above this block; everything else may go below. -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 - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/modules/shell/zsh/default.nix b/modules/shell/zsh/default.nix index 19b06034..d784a34a 100644 --- a/modules/shell/zsh/default.nix +++ b/modules/shell/zsh/default.nix @@ -19,14 +19,6 @@ in home-manager.users.sako = { pkgs, ...}: { home.file = { - ".zshrc" = { - enable = true; - source = ../../../config/zsh/zshrc.zsh; - }; - ".p10k.zsh" = { - enable = true; - source = ../../../config/zsh/p10k.zsh; - }; }; programs.zsh = { enable = true; @@ -38,10 +30,20 @@ in src = pkgs.fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "v0.7.0"; - sha256 = "oQpYKBt0gmOSBgay2HgbXiDoZo5FoUKwyHSlUrOAP5E="; + rev = "v0.5.0"; + sha256 = "0za4aiwwrlawnia4f29msk822rj9bgcygw6a8a6iikiwzjjz0g91"; }; - } + } + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "powerlevel10k-config"; + src = ../../../config/zsh; + file = "p10k.zsh"; + } ]; }; };