From a4ba5a2a2ef50e183643ed597c3f9aaeca74638c Mon Sep 17 00:00:00 2001
From: Tomas Mirchev <contact@tomastm.com>
Date: Wed, 25 Feb 2026 15:35:26 +0200
Subject: [PATCH] new dotfiles

---
 .../git/{.gitconfig => .config/git/config}    |  5 ++---
 .../{.gitignore => .config/git/ignore}        |  0
 .../{.tmux.conf => .config/tmux/tmux.conf}    |  3 +--
 _shared/zsh/{ => .config/zsh}/.zshrc          | 20 +++++++++++--------
 _shared/zsh/.zshenv                           |  6 ++++++
 5 files changed, 21 insertions(+), 13 deletions(-)
 rename _shared/git/{.gitconfig => .config/git/config} (85%)
 rename _shared/gitignore/{.gitignore => .config/git/ignore} (100%)
 rename _shared/tmux/{.tmux.conf => .config/tmux/tmux.conf} (96%)
 rename _shared/zsh/{ => .config/zsh}/.zshrc (84%)
 create mode 100644 _shared/zsh/.zshenv

diff --git a/_shared/git/.gitconfig b/_shared/git/.config/git/config
similarity index 85%
rename from _shared/git/.gitconfig
rename to _shared/git/.config/git/config
index 8b31831..7b0b2f6 100644
--- a/_shared/git/.gitconfig
+++ b/_shared/git/.config/git/config
@@ -3,7 +3,7 @@
   email = contact@tomastm.com
 [core]
   editor = nvim
-  excludesfile = ~/.gitignore
+  excludesfile = ~/.config/git/ignore
 [init]
   defaultBranch = main
 [pull]
@@ -17,8 +17,7 @@
 	amend = commit --amend --no-edit
 	rename = branch -m
   st = status
-  unstage = reset HEAD 
+  unstage = reset HEAD
   last = log -1 HEAD
   tags = tag -l
   undo = reset --mixed HEAD~1
-
diff --git a/_shared/gitignore/.gitignore b/_shared/gitignore/.config/git/ignore
similarity index 100%
rename from _shared/gitignore/.gitignore
rename to _shared/gitignore/.config/git/ignore
diff --git a/_shared/tmux/.tmux.conf b/_shared/tmux/.config/tmux/tmux.conf
similarity index 96%
rename from _shared/tmux/.tmux.conf
rename to _shared/tmux/.config/tmux/tmux.conf
index 0757671..bbaa1fa 100644
--- a/_shared/tmux/.tmux.conf
+++ b/_shared/tmux/.config/tmux/tmux.conf
@@ -67,10 +67,9 @@ bind n new-window
 bind c confirm-before -p "kill-pane \#P? (y/n)" kill-pane
 
 ##### Misc #####
-bind r source-file ~/.tmux.conf \; display "Reloaded!"
+bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded!"
 
 unbind d
 bind e detach
 
 bind d command-prompt -I "flow " 'run-shell "~/.bin/dev-tmux-wrapper %1 --from #{session_name}"'
-
diff --git a/_shared/zsh/.zshrc b/_shared/zsh/.config/zsh/.zshrc
similarity index 84%
rename from _shared/zsh/.zshrc
rename to _shared/zsh/.config/zsh/.zshrc
index 5e41e79..0042f70 100644
--- a/_shared/zsh/.zshrc
+++ b/_shared/zsh/.config/zsh/.zshrc
@@ -6,7 +6,9 @@ export LC_COLLATE=C
 # eval "$(dircolors)"; echo "$LS_COLORS"
 export LS_COLORS='rs=0:di=01;34:ln=01;33:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=00:tw=30;42:ow=34;42:st=37;44:ex=01;32'
 
-HISTFILE=$HOME/.zsh_history
+mkdir -p "$XDG_CACHE_HOME/zsh" "$XDG_STATE_HOME/zsh"
+
+HISTFILE="$XDG_STATE_HOME/zsh/history"
 HISTSIZE=10000
 SAVEHIST=10000
 
@@ -14,28 +16,31 @@ setopt auto_cd interactive_comments prompt_subst share_history
 setopt append_history hist_ignore_dups hist_ignore_all_dups hist_reduce_blanks
 
 autoload -Uz compinit
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'  # Case-insensitive
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
 zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
-compinit
+zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
+compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
 
 git_prompt_info() {
     if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-        local branch=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD)
+        local branch
+        branch=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD)
         echo " %F{green}($branch)%f"
     fi
 }
+
 abbrev_path() {
     local pwd="${PWD/#$HOME/~}"
     local parts=("${(@s:/:)pwd}")
     local len=${#parts}
-    
+
     if (( len <= 1 )); then
         echo "$pwd"
         return
     fi
-    
+
     local result=""
+    local i
     for (( i=1; i<len; i++ )); do
         result+="${parts[i]:0:1}/"
     done
@@ -44,7 +49,6 @@ abbrev_path() {
 }
 
 PROMPT='%n@%m%f %F{blue}$(abbrev_path)%f$(git_prompt_info) $ '
-# PROMPT='%n@%m%f %F{blue}%~%f$(git_prompt_info) $ '
 
 autoload -U up-line-or-beginning-search down-line-or-beginning-search
 zle -N up-line-or-beginning-search
diff --git a/_shared/zsh/.zshenv b/_shared/zsh/.zshenv
new file mode 100644
index 0000000..b546e15
--- /dev/null
+++ b/_shared/zsh/.zshenv
@@ -0,0 +1,6 @@
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
+export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
+
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"