merge: work

.config/zsh/.zsh_aliases

@@ -9,7 +9,7 @@ alias vi='$EDITOR'
 alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias viconf='(cd $XDG_CONFIG_HOME/nvim && $EDITOR .)'
 alias wconf='(cd $HOME/.config/sway && $EDITOR .)'
-alias zshconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)'
+alias zconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)'
 
 # dev
 alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'

.config/zsh/.zshrc

@@ -8,7 +8,8 @@ export ZSH="$ZDOTDIR/ohmyzsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="simpletheme"
+ZSH_THEME="powerlevel10k/powerlevel10k"
+#ZSH_THEME="mytheme"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -94,3 +95,6 @@ plugins=(vi-mode colored-man-pages git gitignore)
 . "$ZDOTDIR"/.docker_aliases
 . "$ZDOTDIR"/.kubectl_aliases
 . "$ZDOTDIR"/.zsh_aliases
+
+# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
+! [ -f "$ZDOTDIR/.p10k.zsh" ] || . "$ZDOTDIR/.p10k.zsh"

.config/zsh/custom/themes/mytheme.zsh-theme

@@ -0,0 +1,6 @@
+PROMPT='%(?::%{$fg_bold[red]%}%? )%{$fg_bold[cyan]%}%~%{$reset_color%} $(git_prompt_info)'
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

.config/zsh/custom/themes/powerlevel10k

@@ -0,0 +1 @@
+Subproject commit 7f2950f9cc6d7ae805b4e9f365cc3340afc955a6

.config/zsh/custom/themes/simpletheme.zsh-theme

@@ -1,41 +0,0 @@
-KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
-KUBE_PS1_KUBECONFIGMD5=
-KUBE_PS1_CTX=
-KUBE_PS1_NS=
-
-_update_KUBE_PS1() {
-    local md5="$(md5sum $KUBE_PS1_KUBECONFIG)"
-
-    [[ "$md5" == "$KUBE_PS1_KUBECONFIGMD5" ]] && return
-
-    KUBE_PS1_KUBECONFIGMD5="$md5"
-    KUBE_PS1_CTX="$(kubectl config current-context)"
-    KUBE_PS1_NS="$(kubectl config view --minify -o jsonpath='{..namespace}')"
-}
-
-kube_ps1() {
-    _update_KUBE_PS1
-
-    local ctx="$KUBE_PS1_CTX"
-    local ns="$KUBE_PS1_NS"
-    local symbol='\u2388 '
-    local sep='/'
-    local bg='\e[44m'
-    local reset='\e[0m'
-   #local end=" $reset\e[34m\ue0b4" # 
-   #local end=" $reset\e[34m\ue0bc" # 
-    local end=" $reset\e[34m\ue0b0" # 
-
-    echo "$bg$symbol$ctx$sep$ns$end$reset"
-}
-
-precmd() {
-    #kube_ps1
-}
-
-PROMPT='%(?::%{$fg_bold[red]%}%? )%{$fg_bold[cyan]%}%~%{$reset_color%} $(git_prompt_info)'
-
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"

.gitmodules

@@ -31,3 +31,6 @@
 [submodule ".config/zsh/ohmyzsh"]
 	path = .config/zsh/ohmyzsh
 	url = https://github.com/ohmyzsh/ohmyzsh.git
+[submodule ".config/zsh/custom/themes/powerlevel10k"]
+	path = .config/zsh/custom/themes/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k.git

.zshenv

@@ -1,21 +1,19 @@
 path=("$HOME/bin" "$HOME/.local/bin" $path)
 
-export XDG_CACHE_HOME="$HOME"/.cache
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_STATE_HOME="$HOME"/.local/state
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_CONFIG_DIRS=/etc/xdg
-export XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
+export XDG_DATA_DIRS='/usr/local/share:/usr/share'
 
-export ZDOTDIR="$HOME"/.config/zsh
+export ZDOTDIR="$HOME/.config/zsh"
 export ZSH_CUSTOM="$ZDOTDIR/custom"
-export HISTFILE="$XDG_STATE_HOME"/zsh/history
+export HISTFILE="$XDG_STATE_HOME/zsh/history"
 export ZLE_RPROMPT_INDENT=0
 
 export LESSHISTFILE='-'
 
 export MOZ_ENABLE_WAYLAND=1
-# fix Java Windows
-export _JAVA_AWT_WM_NONREPARENTING=1
 
 export EDITOR='nvim'