Diff
1diff --git a/dot_zprofile.tmpl b/dot_zprofile.tmpl
2deleted file mode 100644
3index 890fd477fe94f3303727351b1ba2ddc5df1d4b1e..0000000000000000000000000000000000000000
4--- a/dot_zprofile.tmpl
5+++ /dev/null
6@@ -1,43 +0,0 @@
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 LESS="-SRF --mouse"
13-export MAKEFLAGS="-j $(nproc --all)"
14-export MOZ_WEBRENDER="1"
15-export MOZ_USE_XINPUT2="1"
16-# export WLR_NO_HARDWARE_CURSORS="1"
17-export GOPRIVATE="github.com/duneanalytics/*"
18-export GOPATH="$HOME/dev/go"
19-export GOBIN="$HOME/dev/go/bin"
20-export PATH="$HOME/.local/bin:$PATH:$GOBIN:$HOME/.cargo/bin"
21-export QT_QPA_PLATFORMTHEME="qt6ct"
22-export QT_WAYLAND_FORCE_DPI="physical"
23-export GTK_THEME="Breeze-Dark"
24-export VISUAL="nvim"
25-export XDG_CONFIG_HOME="$HOME/.config"
26-export VIRTUAL_ENV_DISABLE_PROMPT="true"
27-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
28-{{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}="{{ $env.value }}"
29-{{ end }}
30-# Wayland env vars
31-export MOZ_ENABLE_WAYLAND="1"
32-export XDG_SESSION_TYPE=wayland
33-export SDL_VIDEODRIVER=wayland
34-
35-# Valve shader compiler
36-export RADV_PERFTEST="aco"
37-
38-# fzf config
39-export FZF_CTRL_T_COMMAND="fd -tf -td -tl"
40-export FZF_DEFAULT_COMMAND='rg --files --hidden --follow -g "!{.git}/*" 2> /dev/null'
41-export FZF_DEFAULT_OPTS='
42- --color fg:#928374,bg:#282828,hl:#fb4934
43- --color fg+:#b8bb26,bg+:#3c3836,hl+:#fb4934
44- --color info:#fe8019,prompt:#83a598,header:#83a598
45- --color pointer:#fb4934,marker:#fb4934,spinner:#ffff60
46-'
47-
48-# jq color config
49-export JQ_COLORS="1;31:0;35:0;35:0;39:0;32:1;39:1;39"
50diff --git a/dot_zshrc b/dot_zshrc.tmpl
51rename from dot_zshrc
52rename to dot_zshrc.tmpl
53index 16b1f30e99245a1c37e12a05ce55609c169127f5..450c566d5830a01b22241ffb5803741fdbab1b31 100644
54--- a/dot_zshrc
55+++ b/dot_zshrc.tmpl
56@@ -6,6 +6,38 @@ SAVEHIST=40000
57 HIST_STAMPS="yyyy-mm-dd"
58 setopt HIST_IGNORE_DUPS
59
60+# Common config
61+export DEFAULT_USER="pavle"
62+export EDITOR="nvim"
63+export VISUAL="nvim"
64+export LANG="en_US.UTF-8"
65+export LC_ALL="en_DK.UTF-8"
66+export PATH="$HOME/.local/bin:$PATH:$GOBIN:$HOME/.cargo/bin"
67+export XDG_CONFIG_HOME="$HOME/.config"
68+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
69+
70+# CLI tools
71+export MAKEFLAGS="-j $(nproc --all)"
72+export LESS="-SRF --mouse"
73+export GPG_TTY=$(tty)
74+export GOPRIVATE="github.com/duneanalytics/*"
75+export GOPATH="$HOME/dev/go"
76+export GOBIN="$HOME/dev/go/bin"
77+export VIRTUAL_ENV_DISABLE_PROMPT="true"
78+export FZF_CTRL_T_COMMAND="fd -tf -td -tl"
79+export FZF_DEFAULT_COMMAND='rg --files --hidden --follow -g "!{.git}/*" 2> /dev/null'
80+export FZF_DEFAULT_OPTS='
81+ --color fg:#928374,bg:#282828,hl:#fb4934
82+ --color fg+:#b8bb26,bg+:#3c3836,hl+:#fb4934
83+ --color info:#fe8019,prompt:#83a598,header:#83a598
84+ --color pointer:#fb4934,marker:#fb4934,spinner:#ffff60
85+'
86+export JQ_COLORS="1;31:0;35:0;35:0;39:0;32:1;39:1;39"
87+
88+# Additional env vars
89+{{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}="{{ $env.value }}"
90+{{ end }}
91+
92 # oh-my-zsh
93 export ZSH="$HOME/.config/zsh/oh-my-zsh"
94 CUSTOM="$HOME/.config/zsh"
95@@ -70,11 +102,11 @@ fi
96 eval "$(zoxide init zsh)"
97
98 if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]]; then
99- # sway on tty1
100+ # hyprland on tty1
101+ exec uwsm start hyprland.desktop
102+elif [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ] && [[ $(tty) = /dev/tty1 ]] && uwsm check may-start; then
103+ # sway on tty2
104 exec sway
105-elif [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty2 ]]; then
106- # startx on tty2
107- exec startx -- vt1
108 elif [[ $(tty) =~ "/dev/tty[0-9]" ]]; then
109 # Enable unicode characters in the tty
110 unicode_start