From 786dc619baa61b1e24f6bbd36634ca3002cfb209 Mon Sep 17 00:00:00 2001
From: 0scar <qgt268@alumni.ku.dk>
Date: Wed, 8 Dec 2021 09:35:08 +0100
Subject: Update X-setup

---
 .config/x/authority |  1 +
 .config/x/defaults  |  1 +
 .config/x/xinitrc   | 23 +++++++++++++++++++++++
 .xinitrc            | 22 ----------------------
 .zprofile           |  6 ++++--
 5 files changed, 29 insertions(+), 24 deletions(-)
 create mode 120000 .config/x/authority
 create mode 100644 .config/x/defaults
 create mode 100644 .config/x/xinitrc
 delete mode 100644 .xinitrc

diff --git a/.config/x/authority b/.config/x/authority
new file mode 120000
index 0000000..f9883c5
--- /dev/null
+++ b/.config/x/authority
@@ -0,0 +1 @@
+/run/user/1000/Xauthority
\ No newline at end of file
diff --git a/.config/x/defaults b/.config/x/defaults
new file mode 100644
index 0000000..134f3f1
--- /dev/null
+++ b/.config/x/defaults
@@ -0,0 +1 @@
+*.font: "DejaVuSansMono Nerd Font Mono:pixelsize=16:antialias=true:autohint=true:style=book"
diff --git a/.config/x/xinitrc b/.config/x/xinitrc
new file mode 100644
index 0000000..38dfe9a
--- /dev/null
+++ b/.config/x/xinitrc
@@ -0,0 +1,23 @@
+# For automatic lock on suspend/hibernation
+systemctl --user import-environment DISPLAY
+# Notification daemon
+dunst &
+# Composite manager, for blur and other neat effects
+picom --blur-method dual_kawase --blur-strength 2 --experimental-backends --backend glx &
+
+# Disable mouse acceleration
+xset m 0 0 &
+xset r rate 300 50 &
+
+xmodmap -e "clear lock"
+xmodmap -e "keysym Multi_key = Multi_key Caps_Lock"
+xmodmap -e "keycode 9 = Multi_key"
+xmodmap -e "keycode 108 = Multi_key"
+xmodmap -e "keycode 66 = Escape"
+
+autorandr -c
+
+feh --no-fehbg --bg-scale ~/pictures/background.png
+dwmblocks &
+xrdb $XDEFAULTS
+exec /usr/local/bin/dwm
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644
index ee29992..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,22 +0,0 @@
-# For automatic lock on suspend/hibernation
-systemctl --user import-environment DISPLAY
-# Notification daemon
-dunst &
-# Composite manager, for blur and other neat effects
-picom --blur-method dual_kawase --blur-strength 2 --experimental-backends --backend glx &
-
-# Disable mouse acceleration
-xset m 0 0 &
-xset r rate 300 50 &
-
-xmodmap -e "clear lock"
-xmodmap -e "keysym Multi_key = Multi_key Caps_Lock"
-xmodmap -e "keycode 9 = Multi_key"
-xmodmap -e "keycode 108 = Multi_key"
-xmodmap -e "keycode 66 = Escape"
-
-autorandr -c
-
-feh --no-fehbg --bg-scale ~/pictures/background.png
-dwmblocks &
-exec /usr/local/bin/dwm
diff --git a/.zprofile b/.zprofile
index 3a06424..109d568 100644
--- a/.zprofile
+++ b/.zprofile
@@ -27,11 +27,12 @@ export XRESOURCES="$HOME/.config/x/resources"
 # More utils / Preferences
 export GNUPGHOME="${XDG_CONFIG_HOME:-$HOME/.config}/gnupg"
 export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
-export LESS='-F -R --use-color -Dd+r$Du+b'
+export LESS="-F -R"
 export LESSHISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/lesshist"
 export MANWIDTH=${MANWIDTH:-80}
 export PASSWORD_STORE_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/passwordstore"
 export SCREENRC="${XDG_CONFIG_HOME:-$HOME/.config}/screenrc"
+
 # Vim stuffs
 export MYVIMRC="${XDG_CONFIG_HOME:-$HOME/.config}/vim/vimrc"
 export VIMINIT="source $MYVIMRC"
@@ -56,7 +57,8 @@ export IPYTHONDIR="${XDG_CACHE_HOME:-$HOME/.cache}/ipython"
 export GEM_PATH="${XDG_CACHE_HOME:-$HOME/.cache}/gem"
 
 # Rust
+export CARGO_HOME="${XDG_CACHE_HOME:-$HOME/.cache}/cargo"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 export RUSTUP_HOME="${XDG_CACHE_HOME:-$HOME/.cache}/rustup"
 
-[ "$(tty)" = "/dev/tty1" ] && ! pidof Xorg >/dev/null 2>&1 && exec startx
+[ "$(tty)" = "/dev/tty1" ] && ! pidof Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
-- 
cgit v1.3