c3f7885549a3b6778f8c540352f01d488b9091b9

Author
Pavle Portic <git@theedgeofrage.com>
Committer
Pavle Portic <git@theedgeofrage.com>
Date

Message

Split zshrc env vars into zprofile

Diff

 1diff --git a/dot_zprofile.tmpl b/dot_zprofile.tmpl
 2new file mode 100644
 3index 0000000000000000000000000000000000000000..c9f509e4f8630e1d80782d78e8d12da93ce6e87b
 4--- /dev/null
 5+++ b/dot_zprofile.tmpl
 6@@ -0,0 +1,34 @@
 7+export DEFAULT_USER="pavle"
 8+export EDITOR="nvim"
 9+export GPG_TTY=$(tty)
10+export LANG="en_US.UTF-8"
11+export LC_ALL="en_DK.UTF-8"
12+export MAKEFLAGS="-j $(nproc --all)"
13+export MOZ_WEBRENDER="1"
14+export MOZ_USE_XINPUT2="1"
15+export GOPRIVATE="github.com/duneanalytics/*"
16+export GOPATH="$HOME/dev/go"
17+export PATH="$HOME/.local/bin:$PATH:$GOPATH/bin"
18+export QT_QPA_PLATFORMTHEME="qt5ct"
19+export QT_STYLE_OVERRIDE="kvantum"
20+export GTK_THEME="Breeze-Dark"
21+export VISUAL="nvim"
22+export XDG_CONFIG_HOME="$HOME/.config"
23+export VIRTUAL_ENV_DISABLE_PROMPT="true"
24+{{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}="{{ $env.value }}"
25+{{end}}
26+# Valve shader compiler
27+export RADV_PERFTEST="aco"
28+
29+# fzf config
30+export FZF_CTRL_T_COMMAND="fd -tf -td -tl"
31+export FZF_DEFAULT_COMMAND='rg --files --hidden --follow -g "!{.git}/*" 2> /dev/null'
32+export FZF_DEFAULT_OPTS='
33+	--color fg:#928374,bg:#282828,hl:#fb4934
34+	--color fg+:#b8bb26,bg+:#3c3836,hl+:#fb4934
35+	--color info:#fe8019,prompt:#83a598,header:#83a598
36+	--color pointer:#fb4934,marker:#fb4934,spinner:#ffff60
37+'
38+
39+# jq color config
40+export JQ_COLORS="1;31:0;35:0;35:0;39:0;32:1;39:1;39"
41diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
42index e22c45e6f632aafb64bb2490cc1babb23d83e3c9..067683056ee2224c6ae980b9c6c0aa03aff96706 100644
43--- a/dot_zshrc.tmpl
44+++ b/dot_zshrc.tmpl
45@@ -42,29 +42,6 @@ source ${CUSTOM}/completions/*.zsh
46 source ~/.aliases
47 source ~/.config/zsh/kc.zsh
48 
49-# Variable exports
50-export DEFAULT_USER="pavle"
51-export EDITOR="nvim"
52-export GPG_TTY=$(tty)
53-export LANG="en_US.UTF-8"
54-export LC_ALL="en_DK.UTF-8"
55-export MAKEFLAGS="-j $(nproc --all)"
56-export MOZ_WEBRENDER="1"
57-export MOZ_USE_XINPUT2="1"
58-export GOPRIVATE="github.com/duneanalytics/*"
59-export GOPATH="$HOME/dev/go"
60-export PATH="$HOME/.local/bin:$PATH:$GOPATH/bin"
61-export QT_QPA_PLATFORMTHEME="qt5ct"
62-export QT_STYLE_OVERRIDE="kvantum"
63-export GTK_THEME="Breeze-Dark"
64-export VISUAL="nvim"
65-export XDG_CONFIG_HOME="$HOME/.config"
66-export VIRTUAL_ENV_DISABLE_PROMPT="true"
67-{{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}="{{ $env.value }}"
68-{{end}}
69-# Valve shader compiler
70-export RADV_PERFTEST="aco"
71-
72 # Bind home and end
73 bindkey "\033[H" beginning-of-line
74 bindkey "\033[F" end-of-line
75@@ -77,17 +54,6 @@ TRAPWINCH() {
76 # Load fzf
77 [[ $- == *i* ]] && source "/usr/share/fzf/completion.zsh" NO
78 source "/usr/share/fzf/key-bindings.zsh" NO
79-export FZF_CTRL_T_COMMAND="fd -tf -td -tl"
80-export FZF_DEFAULT_COMMAND='rg --files --hidden --follow -g "!{.git}/*" 2> /dev/null'
81-export FZF_DEFAULT_OPTS='
82-	--color fg:#928374,bg:#282828,hl:#fb4934
83-	--color fg+:#b8bb26,bg+:#3c3836,hl+:#fb4934
84-	--color info:#fe8019,prompt:#83a598,header:#83a598
85-	--color pointer:#fb4934,marker:#fb4934,spinner:#ffff60
86-'
87-
88-# jq color config
89-export JQ_COLORS="1;31:0;35:0;35:0;39:0;32:1;39:1;39"
90 
91 # Pyenv settings
92 if which pyenv &> /dev/null; then