From 8581e6bcbab9eb18eb8dadb1cb42a5a0af7fb62d Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 13 Dec 2021 20:36:53 +0000
Subject: [PATCH] Merge branch 'master' into HEAD
---
zsh/.zshrc | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 816c466..1e07b24 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,6 +1,22 @@
+# 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
+
# Enable colors and change prompt
-autoload -U colors && colors # Load colors
-PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%1~%{$fg[red]%}]%(?:%{$fg[white]%}$:%{$fs_bold[red]%}<%?>$)%{$reset_color%}%b "
+#autoload -U colors && colors # Load colors
+#PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%1~%{$fg[red]%}]%(?:%{$fg[white]%}$:%{$fs_bold[red]%}<%?>$)%{$reset_color%}%b "
+
+# Git prompt
+autoload -Uz vcs_info
+precmd_vcs_info() { vcs_info }
+precmd_functions+=( precmd_vcs_info )
+setopt prompt_subst
+RPROMPT=\$vcs_info_msg_0_
+zstyle ':vcs_info:git:*' formats "%F{240}git:(%b)"
+zstyle ':vcs_info:*' enable git
# History files
HISTFILE=~/.zsh_history
@@ -14,6 +30,8 @@
# common shell options
source ~/.commonshell
+
+# Command not found. Works with pkgfile in Arch
[ -f /usr/share/doc/pkgfile/command-not-found.zsh ] && source /usr/share/doc/pkgfile/command-not-found.zsh
# Make the delete key work normally
@@ -42,16 +60,20 @@
autoload -Uz compinit
compinit
-# Syntax highlighing
-if [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]]; then
- source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# Plugins with antigen
+if [ -f ~/.zsh/antigen/bin/antigen.zsh ]; then
+ ADOTDIR=~/.zsh
+ _ANTIGEN_INSTALL_DIR=~/.zsh/antigen
+ # ANTIGEN_LOG=~/log
+ source ~/.zsh/antigen/bin/antigen.zsh
+
+ antigen bundle zsh-users/zsh-syntax-highlighting
+ antigen bundle zsh-users/zsh-autosuggestions
+ antigen bundle zsh-users/zsh-completions
+ antigen theme romkatv/powerlevel10k
+
+ antigen apply
fi
-# Git prompt
-autoload -Uz vcs_info
-precmd_vcs_info() { vcs_info }
-precmd_functions+=( precmd_vcs_info )
-setopt prompt_subst
-RPROMPT=\$vcs_info_msg_0_
-zstyle ':vcs_info:git:*' formats "%F{240}git:(%b)" #'%F{240}(%b)%r%f'
-zstyle ':vcs_info:*' enable git
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.zsh/p10k.zsh ]] || source ~/.zsh/p10k.zsh
--
Gitblit v1.9.3