Merge remote-tracking branch 'origin/main'

X/.Xresources

@@ -0,0 +1,47 @@
+*background: #002b36
+*foreground: #657b83
+!!*fading: 40
+*fadeColor: #002b36
+*cursorColor: #93a1a1
+*pointerColorBackground: #586e75
+*pointerColorForeground: #93a1a1
+ 
+!! black dark/light
+*color0: #073642
+*color8: #002b36
+ 
+!! red dark/light
+*color1: #dc322f
+*color9: #cb4b16
+ 
+!! green dark/light
+*color2: #859900
+*color10: #586e75
+ 
+!! yellow dark/light
+*color3: #b58900
+*color11: #657b83
+ 
+!! blue dark/light
+*color4: #268bd2
+*color12: #839496
+ 
+!! magenta dark/light
+*color5: #d33682
+*color13: #6c71c4
+ 
+!! cyan dark/light
+*color6: #2aa198
+*color14: #93a1a1
+ 
+!! white dark/light
+*color7: #eee8d5
+*color15: #fdf6e3
+
+!! HiDPI
+Xft.autohint: 0
+Xft.lcdfilter:  lcddefault
+Xft.hintstyle:  hintfull
+Xft.hinting: 1
+Xft.antialias: 1
+Xft.rgba: rgb

git/.gitconfig

@@ -14,7 +14,7 @@
     decorate = true
     abbrevCommit = true
 [gpg]
-	program = .local/bin/git-gpg
+	program = qubes-gpg-client-wrapper
 [init]
     defaultBranch = main
 [remote "origin"]

qubes/.config/qubes/appvm/rw/config/gpg-split-domain

@@ -0,0 +1 @@
+vault

qubes/.config/qubes/appvm/rw/config/qubes-bind-dirs.d/50_user.conf

@@ -0,0 +1,2 @@
+binds+=('/var/lib/docker')
+binds+=('/var/lib/containerd')

qubes/.config/qubes/dom0/etc/qubes-rpc/policy/qubes.Gpg

@@ -0,0 +1 @@
+@anyvm @anyvm ask default_target=vault

qubes/.config/qubes/dom0/etc/qubes-rpc/policy/qubes.SshAgent

@@ -0,0 +1 @@
+@anyvm @anyvm ask default_target=vault

zsh/.zshenv

@@ -7,18 +7,12 @@ export LC_CTYPE="en_US.UTF-8"
 
 # Apply QubesOS specific configuration
 if command -v qubesdb-read &> /dev/null; then
-	export QUBES_GPG_DOMAIN="vault";
 	export SSH_AUTH_SOCK="/home/${USER}/.SSH_AGENT_${QUBES_GPG_DOMAIN}";
-	git config --global gpg.program qubes-gpg-client-wrapper;
-else
-	# Always use gpg2
-	[[ -f /usr/bin/gpg2 ]] && alias gpg="/usr/bin/gpg2"
 fi
 
 alias vi="nvim"
 alias vim="nvim"
 
-path=("$PYENV_ROOT/bin" $path)
 path=("$HOME/.local/bin" $path)
 path=($^path(N)) # remove paths that don't exist