From b75e692b601496c938b442d1c42a9aa60efd220b Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 10 Aug 2024 16:04:30 +0200
Subject: [PATCH] Fix env-paths and add XDG_STATE_HOME

---
 .bashrc                | 2 +-
 .config/aliasrc        | 1 +
 .config/env.d/10-paths | 2 +-
 .config/environment    | 9 +++++++++
 .config/user-dirs.dirs | 1 +
 .config/zsh/.zshrc     | 2 +-
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.bashrc b/.bashrc
index 10673b4..83f9df5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -88,7 +88,7 @@ source "$OSH/oh-my-bash.sh"
 HISTCONTROL=ignoreboth
 export SAVEHIST=1000000
 export HISTSIZE=1000000
-export HISTFILE="$HOME/.cache/bash_history"
+export HISTFILE="$XDG_STATE_HOME/bash_history"
 shopt -s histappend
 shopt -s checkwinsize
 
diff --git a/.config/aliasrc b/.config/aliasrc
index 9e35c32..1635efa 100644
--- a/.config/aliasrc
+++ b/.config/aliasrc
@@ -68,6 +68,7 @@ alias watch='watch -c'
 alias wget='wget -c'
 
 alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
+alias xo='xdg-open'
 
 ### conditionals
 
diff --git a/.config/env.d/10-paths b/.config/env.d/10-paths
index 3bd608c..ab8cb73 100755
--- a/.config/env.d/10-paths
+++ b/.config/env.d/10-paths
@@ -12,4 +12,4 @@ export PATH="$GOPATH/bin:$HOME/.cargo/bin:$PATH"
 # add tool paths
 export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
 # add nix paths
-export PATH="/home/serguzim/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+export PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
diff --git a/.config/environment b/.config/environment
index 4ec46ad..a1160dc 100644
--- a/.config/environment
+++ b/.config/environment
@@ -7,11 +7,13 @@ set -a
 
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_CACHE_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
 
 . "$XDG_CONFIG_HOME/locale.conf"
 set +a
 
 export AUTOSTART_DISPLAY=''
+export ANSIBLE_HOME="$XDG_DATA_HOME/ansible"
 
 export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash-completion"
 export BEMENU_OPTS="--tb '#6272a4'\
@@ -31,9 +33,12 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --no-overlap\
  -P '>' -p ''"
 
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+
 export DFT_DISPLAY="side-by-side-show-both"
 export DMENU="bemenu"
 export DOCKER_BUILDKIT=1
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 
 export EDITOR="$(which vim)"
 
@@ -49,6 +54,10 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
 export PASSWORD_STORE_ENABLE_EXTENSIONS=true
+export PSQL_HISTORY="$XDG_STATE_HOME/psql_history"
+export PYTHON_HISTORY="$XDG_STATE_HOME/python_history"
+
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 
 export STCONFDIR="$XDG_CONFIG_HOME/syncthing"
 export STDATADIR="$XDG_DATA_HOME/syncthing"
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 26096b2..6083bd7 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -10,3 +10,4 @@ XDG_CONFIG_HOME="$HOME/.config"
 XDG_CONFIG_DIR="$HOME/.config"
 XDG_CACHE_DIR="$HOME/.cache"
 XDG_DATA_HOME="$HOME/.local/share"
+XDG_STATE_HOME="$HOME/.local/state"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 156dfee..3157314 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -120,7 +120,7 @@ export MARKPATH="$HOME/.config/zsh/jump_marks"
 setopt HIST_IGNORE_DUPS
 export SAVEHIST=1000000
 export HISTSIZE=1000000
-export HISTFILE="$HOME/.cache/zsh_history"
+export HISTFILE="$XDG_STATE_HOME/zsh_history"
 
 source "$plugin_path/zsh-syntax-highlighting.sh"