22bde1aab7a8f86b37290d9792181ad1b2671a2f

Author
TheEdgeOfRage <git@theedgeofrage.com>
Committer
TheEdgeOfRage <git@theedgeofrage.com>
Date

Message

Fix zshrc env var loading order

Diff

 1diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
 2index ce5cd19b85b173e6abccba54dbda977e5d1268d0..b0c5a4d294d3a39b67cb4fd17d2b9a8ffd8384cf 100644
 3--- a/dot_zshrc.tmpl
 4+++ b/dot_zshrc.tmpl
 5@@ -6,16 +6,6 @@ SAVEHIST=40000
 6 HIST_STAMPS="yyyy-mm-dd"
 7 setopt HIST_IGNORE_DUPS
 8 
 9-# Common config
10-export DEFAULT_USER="pavle"
11-export EDITOR="nvim"
12-export VISUAL="nvim"
13-export LANG="en_US.UTF-8"
14-export LC_ALL="en_DK.UTF-8"
15-export PATH="$HOME/.local/bin:$PATH:$GOBIN:$HOME/.cargo/bin"
16-export XDG_CONFIG_HOME="$HOME/.config"
17-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
18-
19 # CLI tools
20 export MAKEFLAGS="-j $(nproc --all)"
21 export LESS="-SRF --mouse"
22@@ -34,6 +24,16 @@ export FZF_DEFAULT_OPTS='
23 '
24 export JQ_COLORS="1;31:0;35:0;35:0;39:0;32:1;39:1;39"
25 
26+# Common config
27+export DEFAULT_USER="pavle"
28+export EDITOR="nvim"
29+export VISUAL="nvim"
30+export LANG="en_US.UTF-8"
31+export LC_ALL="en_DK.UTF-8"
32+export PATH="$HOME/.local/bin:$PATH:$GOBIN:$HOME/.cargo/bin"
33+export XDG_CONFIG_HOME="$HOME/.config"
34+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
35+
36 # Additional env vars
37 {{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}="{{ $env.value }}"
38 {{ end }}