fix p10k

1 files changed, 30 insertions, 13 deletions

diff --git a/zsh/zshrc b/zsh/zshrc
index 0a175cb..9f50418 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -10,22 +10,26 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+source ~/.config/zsh/powerlevel10k/powerlevel10k.zsh-theme
+source ~/.config/zsh/p10k.zsh
+
 antigen bundle zsh-users/zsh-syntax-highlighting
 antigen bundle zsh-users/zsh-history-substring-search
 antigen bundle zsh-users/zsh-autosuggestions
 antigen bundle zsh-users/zsh-completions
+antigen bundle ael-code/zsh-colored-man-pages
 
 antigen apply
 
 # Exports
 
-export PATH=$HOME/.local/bin:/usr/local/bin:$HOME/go/bin:$PATH
 # export GOROOT=$HOME/work/go
 export GOPATH=$HOME/go
 export GOPROXY=https://proxy.neonxp.ru
 export EDITOR="nvim"
 #export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
-
+export PATH=$PATH:$GOPATH/bin
+export GPG_TTY=$(tty)
 export LS_OPTIONS='--color=auto'
 eval "$(dircolors -b)"
 
@@ -46,7 +50,6 @@ alias cp="cp -i"                          # confirm before overwriting something
 alias df="df -h"                          # human-readable sizes
 alias free="free -m"                      # show sizes in MB
 alias np="nano -w PKGBUILD"
-alias more=less
 alias gitu='git add . && git commit && git push'
 alias g=git
 
@@ -114,16 +117,6 @@ source ~/.config/zsh/conf.d/*.zsh
 
 colors
 
-# Color man pages
-export LESS_TERMCAP_mb=$"\E[01;32m"
-export LESS_TERMCAP_md=$"\E[01;32m"
-export LESS_TERMCAP_me=$"\E[0m"
-export LESS_TERMCAP_se=$"\E[0m"
-export LESS_TERMCAP_so=$"\E[01;47;34m"
-export LESS_TERMCAP_ue=$"\E[0m"
-export LESS_TERMCAP_us=$"\E[01;36m"
-export LESS=-R
-
 
 ## Plugins section: Enable fish style features
 # Use syntax highlighting
@@ -166,6 +159,30 @@ bindkey "^[[Z" undo                                             # Shift+tab undo
 # ctrl + space accept suggestion
 bindkey "^ " autosuggest-accept
 
+dotenv() {
+    if [ $# -eq 0 ]; then
+        [ -f .env.gpg ] && set -- .env.gpg "$@"
+        [ -f .env     ] && set -- .env     "$@"
+    fi
+
+    set -a
+    while [ $# -gt 0 ]; do
+        echo "dotenv: Loading $1"
+        case "$1" in
+        *.gpg)
+            eval "$(gpg --quiet --decrypt --yes "$1")"
+            ;;
+        */*)
+            . "$1"
+            ;;
+        *)
+            . "./$1"
+        esac
+        shift
+    done
+    set +a
+}
+
 # Set terminal window and tab/icon title
 #
 # usage: title short_tab_title [long_window_title]