X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/9867e4bbee2bcfe7050b0c9d98cbf72653f658ac..81b33a828705837b380db3147fbff3e313da4e27:/.xinitrc?ds=sidebyside

diff --git a/.xinitrc b/.xinitrc
old mode 100644
new mode 100755
index 26dd0d0..ffb1aa0
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,32 +1,9 @@
-[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources
+# -*- mode: sh; sh-shell: sh -*-
 
-export VISUAL=emacsclient
-export EDITOR="$VISUAL"
-
-if [ -x "$(command -v xinput)" ]; then
-    xinput set-prop 'TPPS/2 IBM TrackPoint' 'libinput Accel Speed' -0.4
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Natural Scrolling Enabled' 1
-    xinput set-prop 'DLL07BE:01 06CB:7A13 Touchpad' 'libinput Click Method Enabled' 0 1
+if [ -f "$HOME/.local/bin/startup-progs" ]; then
+   . "$HOME/.local/bin/startup-progs"
 fi
 
-# setxkbmap \
-#     -layout us,ir \
-#     -option ctrl:nocaps \
-#     -option grp:shifts_toggle
-
-setxkbmap \
-    -layout us,ir \
-    -option ctrl:swap_rwin_rctl \
-    -option grp:shifts_toggle
-
-xmodmap -e "keysym Menu = Super_R"
-
-xsetroot -cursor_name left_ptr
-xset r rate 200 45
-xset b off
-
-[ -x "$(command -v pasystray)" ] && pasystray -a &
-[ -x "$(command -v nm-applet)" ] && nm-applet &
-[ -x "$(command -v picom)" ] && picom &
-[ -x "$(command -v dunst)" ] && dunst &
-exec dbus-launch --exit-with-session -- emacs -ib 0
+# launch with dbus in part so that pinentry-gnome3 -- seemingly the
+# pinentry du jour -- doesn't fall back to curses and screw us.
+[ -x "$(command -v emacs)" ] && dbus-run-session ssh-agent emacs -ib 0