update and relocate config

Amolith created 3 years ago

Change summary

dot_config/doom/config.org.tmpl                     |  0 
dot_config/doom/extra/encrypted_mu4e-config.org.asc |  0 
dot_config/doom/init.el                             |  0 
dot_config/doom/packages.el                         |  0 
dot_config/zsh/private_dot_zimrc                    |  0 
dot_config/zsh/private_dot_zshrc.tmpl               | 52 ++++++++++++--
6 files changed, 42 insertions(+), 10 deletions(-)

Detailed changes

dot_doom.d/config.org.tmpl → dot_config/doom/config.org.tmpl

dot_doom.d/extra/encrypted_mu4e-config.org.asc → dot_config/doom/extra/encrypted_mu4e-config.org.asc

dot_doom.d/init.el → dot_config/doom/init.el

dot_doom.d/packages.el → dot_config/doom/packages.el

private_dot_zimrc → dot_config/zsh/private_dot_zimrc

private_dot_zshrc.tmpl → dot_config/zsh/private_dot_zshrc.tmpl

@@ -27,7 +27,33 @@ ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 #typeset -A ZSH_HIGHLIGHT_STYLES
 #ZSH_HIGHLIGHT_STYLES[comment]='fg=242'
 
-export ZIM_HOME="$HOME/.zim"
+# XDG variables
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+# Moving dotfiles around
+zstyle ':completion:*' cache-path "$XDG_CACHE_HOME"/zsh/zcompcache
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+export ZDOTDIR="$HOME"/.config/zsh
+export WINEPREFIX="$XDG_DATA_HOME"/wine
+export WORKON_HOME="$XDG_DATA_HOME/virtualenvs"
+export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME"/bundle
+export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
+export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME"/bundle
+export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
+export DVDCSS_CACHE="$XDG_DATA_HOME"/dvdcss
+export KDEHOME="$XDG_CONFIG_HOME"/kde
+export GOPATH="$XDG_DATA_HOME"/go
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export ZIM_HOME="$XDG_CONFIG_HOME"/.zim
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+
+eval "$(antidot init)"
 
 # ------------------
 # Initialize modules
@@ -77,7 +103,7 @@ export ANDROID_HOME="$HOME/SDKs/Android"
 export PATH="$PATH:$ANDROID_HOME/cmdline-tools/tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator"
 export PATH="$PATH:$HOME/.gem/ruby/2.7.0/bin"
 export PATH="$PATH:$HOME/.gem/ruby/3.0.0/bin"
-export PATH="$PATH:$HOME/.go/bin"
+export PATH="$PATH:$GOPATH/bin"
 export PATH="{{ .chezmoi.homeDir }}/perl5/bin${PATH:+:${PATH}}"; export PATH;
 export PERL5LIB="{{ .chezmoi.homeDir }}/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
 export PERL_LOCAL_LIB_ROOT="{{ .chezmoi.homeDir }}/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
@@ -94,14 +120,6 @@ export COLUMNS=80
 export MANWIDTH=80
 export GOPATH="$HOME/.go"
 
-# XDG variables
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_STATE_HOME="$HOME/.local/state"
-export XDG_CACHE_HOME="$HOME/.cache"
-
-eval "$(antidot init)"
-
 CASE_SENSITIVE="false"
 
 # Disable dumb Python keyring integration
@@ -168,3 +186,17 @@ export SSH_AUTH_SOCK="/run/user/1000/gnupg/S.gpg-agent.ssh"
 gpgconf --launch gpg-agent
 
 eval "$(starship init zsh)"
+
+# The following lines were added by compinstall
+
+zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
+zstyle ':completion:*' menu select=1
+zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle :compinstall filename '/home/amolith/.config/zsh/.zshrc'
+
+autoload -Uz compinit
+compinit
+# End of lines added by compinstall