4 files changed, 88 insertions, 52 deletions

diff --git a/x/.xinitrc b/x/.xinitrc
deleted file mode 100644
index 641c449..0000000
--- a/x/.xinitrc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f ~/.xprofile ] && . ~/.xprofile
-
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-while xsetroot -name "`wpctl get-volume @DEFAULT_AUDIO_SINK@` | Battery: `cat /sys/class/power_supply/BAT0/capacity`% | `date '+%d.%m.%Y (%a) %T'`"
-do
-  sleep 5
-done &
-
-dbus-update-activation-environment --all
-xsetroot -name " " &
-ssh-agent dwm
diff --git a/x/xinitrc b/x/xinitrc
new file mode 100644
index 0000000..5743c5b
--- /dev/null
+++ b/x/xinitrc
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+XDG_X_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/x"
+
+export SHELL=/usr/bin/bash
+
+userresources="$XDG_X_DIR/xresources"
+usermodmap="$XDG_X_DIR/xmodmap"
+sysresources="/etc/X11/xinit/.Xresources"
+sysmodmap="/etc/X11/xinit/.Xmodmap"
+
+[ -f /etc/xprofile ] && . /etc/xprofile
+[ -f "$XDG_X_DIR/xprofile" ] && . "$XDG_X_DIR/xprofile"
+[ -f "$sysresources" ] && xrdb -merge "$sysresources"
+[ -f "$sysmodmap" ] && xmodmap "$sysmodmap"
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+  for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
+    [ -x "$f" ] && . "$f"
+  done
+  unset f
+fi
+
+while
+  mem_used=$(free -h | awk '/^Mem:/ {print $3}')
+  cpu_load=$(top -bn1 | grep "Cpu(s)" | awk '{print $2 + $4"%"}')
+  
+  xsetroot -name "`wpctl get-volume @DEFAULT_AUDIO_SINK@` | btr `cat /sys/class/power_supply/BAT0/capacity`% | ram $mem_used | cpu $cpu_load | `date '+%d.%m.%Y (%a) %T'`"
+do
+  sleep 5
+done &
+
+dbus-update-activation-environment --all
+eval $(gpg-agent --daemon)
+export GPG_TTY=$(tty)
+xsetroot -name " " &
+ssh-add ~/.ssh/id_ed25519 </dev/null
+dbus-launch ssh-agent dwm
diff --git a/x/.xprofile b/x/xprofile
index f08c8fc..19fca5d 100644
--- a/x/.xprofile
+++ b/x/xprofile
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-autostart="lxqt-policykit-agent mpd"
+export vblank_mode=0
+export __GL_SYNC_TO_VBLANK=0
+export SDL_HINT_RENDER_VSYNC=0
+export SDL_VIDEO_X11_DGAMOUSE=1
+
+autostart="mpd"
 
 for program in $autostart; do
         pidof -sx "$program" || "$program" &
@@ -9,8 +14,8 @@ done >/dev/null 2>&1
 xrandr --dpi 96
 xbacklight -set 2
 setxkbmap pl
+devmon &
 pipewire &
-~/.fehbg &
-picom -b &
+~/.config/fehbg &
 
 [ -n "$xrdbpid" ] && wait "$xrdbpid"
diff --git a/x/.Xresources b/x/xresources
index 610199a..7f77480 100644
--- a/x/.Xresources
+++ b/x/xresources
@@ -1,19 +1,22 @@
+
 st.alpha: 0.6
-st.font: FiraCode-12;
-dmenu.font: FiraCode-11;
-st.termname: st-256color
+st.font: monospace-11;
+XTerm.vt1000.faceName: monospace:size=10:antialias=false;
+dmenu.font: monospace-11;
+dwm.font: monospace-11;
+
+st.termname: xterm-256color
 st.borderpx: 0
 dwm.borderpx: 0
 dwm.showbar: 0
-dwm.font: FiraCode-12;
-
 
-#define base00 #000c18
+#define base00 #100c08
 #define base01 #2e2f30
 #define base02 #515253
 #define base03 #737475
 #define base04 #959697
-#define base05 #b7b8b9
+! #define base05 #b7b8b9
+#define base05 #fefefa
 #define base06 #dadbdc
 #define base07 #fcfdfe
 #define base08 #9966b8
@@ -38,7 +41,6 @@ dwm.font: FiraCode-12;
 *.error: base09
 *.accent: base08
 
-
 background:   base00
 warning: base 0F
 secondary: base08
@@ -66,3 +68,33 @@ accent: base08
 *.color13:      base0E
 *.color14:      base0C
 *.color15:      base07
+
+xterm*Title: XTerm
+xterm*faceName: Monospace Regular
+xterm*faceSize: 11
+xterm*boldMode: false
+xterm*foreground: rgb:a8/a8/a8
+xterm*background: rgb:00/00/00
+xterm*color0: rgb:00/00/00
+xterm*color1: rgb:a8/00/00
+xterm*color2: rgb:00/a8/00
+xterm*color3: rgb:a8/54/00
+xterm*color4: rgb:00/00/a8
+xterm*color5: rgb:a8/00/a8
+xterm*color6: rgb:00/a8/a8
+xterm*color7: rgb:a8/a8/a8
+xterm*color8: rgb:54/54/54
+xterm*color9: rgb:fc/54/54
+xterm*color10: rgb:54/fc/54
+xterm*color11: rgb:fc/fc/54
+xterm*color12: rgb:54/54/fc
+xterm*color13: rgb:fc/54/fc
+xterm*color14: rgb:54/fc/fc
+xterm*color15: rgb:fc/fc/fc
+xterm*saveLines: 10000
+xterm*scrollBar: false
+xterm*scrollLines: 1
+XTerm.vt100.selectToClipboard: true
+XTerm.vt100.backarrowKey: false 
+XTerm.ttyModes: erase ^?
+