Remove xorg only settings, update others

This commit is contained in:
Andrew Scott 2023-07-14 19:03:19 -04:00
parent 9ff8e472cc
commit 2d839270ab
Signed by: a
GPG key ID: 7CD5A5977E4931C1

View file

@ -5,14 +5,14 @@
export EDITOR=nvim export EDITOR=nvim
export VISUAL=emacs export VISUAL=emacs
# Ensure XDG env vars are set correctly # Ensure XDG env vars are set
export XDG_CACHE_HOME="$HOME/.cache" export XDG_CACHE_HOME="${HOME}"/.cache
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="${HOME}"/.config
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="${HOME}"/.local/share
export XDG_STATE_HOME="$HOME/.local/state" export XDG_STATE_HOME="${HOME}"/.local/state
# add .local/bin to $PATH # add .local/bin to $PATH
export PATH="$HOME/.local/bin:$PATH" export PATH="${HOME}/.local/bin:${PATH}"
# make Java behave when not using a DE # make Java behave when not using a DE
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
@ -23,56 +23,43 @@ export GPG_TTY=$(tty)
# Mozilla + Wayland # Mozilla + Wayland
export MOZ_ENABLE_WAYLAND=1 export MOZ_ENABLE_WAYLAND=1
# xsecurelock settings
export XSECURELOCK_AUTH=auth_x11
export XSECURELOCK_AUTHPROTO=authproto_pam
export XSECURELOCK_BURNIN_MITIGATION=300
export XSECURELOCK_PASSWORD_PROMPT=time
{{ if eq .chezmoi.hostname "helix" -}} {{ if eq .chezmoi.hostname "helix" -}}
# scale GTK applicatons on hidpi screens # scale GTK applicatons on hidpi screens
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 thunar export GDK_SCALE=2 GDK_DPI_SCALE=0.50
export GDK_SCALE=2 GDK_DPI_SCALE="0.50 Simple-scan"
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 lutris
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 spotify
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 pinta
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Gajim
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Ristretto
export GDK_SCALE=2 GDK_DPI_SCALE=0.50 ghex
{{- end }} {{- end }}
## No littering in $HOME! ## No littering in $HOME!
# bash # bash
export HISTFILE="$XDG_STATE_HOME"/bash_history export HISTFILE="${XDG_STATE_HOME}"/bash_history
# cargo # cargo
export CARGO_HOME="$XDG_DATA_HOME"/cargo export CARGO_HOME="${XDG_DATA_HOME}"/cargo
# go # go
export GOPATH="$XDG_DATA_HOME"/go export GOPATH="${XDG_DATA_HOME}"/go
export GOMODCACHE="$XDG_CACHE_HOME"/go/mod export GOMODCACHE="${XDG_CACHE_HOME}"/go/mod
# gpg # gpg
export GNUPGHOME="$XDG_DATA_HOME"/gnupg export GNUPGHOME="${XDG_DATA_HOME}"/gnupg
# gtk2 # gtk2
export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export GTK2_RC_FILES="${XDG_CONFIG_HOME}"/gtk-2.0/gtkrc
# node # node
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}"/npm/npmrc
# python # python
export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc export PYTHONSTARTUP="${XDG_CONFIG_HOME}"/python/pythonrc
export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME"/python export PYTHONPYCACHEPREFIX="${XDG_CACHE_HOME}"/python
export PYTHONUSERBASE=$XDG_DATA_HOME/python export PYTHONUSERBASE="${XDG_DATA_HOME}"/python
# wine # wine
export WINEPREFIX="$XDG_DATA_HOME"/wine export WINEPREFIX="${XDG_DATA_HOME}"/wine
# Xorg # Xorg
export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc export XINITRC="${XDG_CONFIG_HOME}"/X11/xinitrc
export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority export XAUTHORITY="${XDG_RUNTIME_DIR}"/Xauthority
# Source other dotfiles # Source other dotfiles
[[ -f ~/.profile ]] && . ~/.profile [[ -f ~/.profile ]] && . ~/.profile