From a9c6d62d07f63513502ecdc8650cde5e1037f69d Mon Sep 17 00:00:00 2001
From: k1574 <k1574@yandex.ru>
Date: Mon, 23 Nov 2020 19:54:03 +0500
Subject: [PATCH] Fixes in xinitrc. "e" function to call editor in profile.
 Xonotic changes.

---
 dot/file/xonotic/data/config.cfg | 8 ++++----
 profile                          | 4 ++++
 xinitrc                          | 7 +++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dot/file/xonotic/data/config.cfg b/dot/file/xonotic/data/config.cfg
index 61b6ae9..5c1953a 100644
--- a/dot/file/xonotic/data/config.cfg
+++ b/dot/file/xonotic/data/config.cfg
@@ -96,7 +96,7 @@ bind JOY11 "// not bound"
 bind JOY12 "+con_chat_maximize"
 "_cl_color" "18"
 "_cl_name" "k1574"
-seta "_hud_panelorder" "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18 19 20 21 22 23 24 "
+seta "_hud_panelorder" "17 15 12 9 5 10 6 14 0 7 4 11 2 1 3 8 13 16 18 19 20 21 22 23 24 25 "
 "bgmvolume" "0"
 seta "cl_allow_uid2name" "1"
 seta "cl_autoswitch" "0"
@@ -118,20 +118,20 @@ seta "cl_damagetext_velocity_screen" "0 0 0"
 seta "cl_damagetext_velocity_world" "0 0 20"
 seta "cl_eventchase_death" "0"
 "cl_forwardspeed" "360"
-seta "cl_matchcount" "375"
+seta "cl_matchcount" "384"
 "cl_movement_track_canjump" "1"
 "cl_particles_quality" "0.4"
 "cl_sidespeed" "360"
 "cl_smoothviewheight" "0"
 seta "cl_spawn_point_particles" "0"
-seta "cl_startcount" "76"
+seta "cl_startcount" "77"
 "cl_upspeed" "360"
 seta "cl_zoomsensitivity" "1"
 seta "cl_zoomspeed" "-1"
 "con_chat" "10"
 "con_chatrect" "1"
 "con_chatrect_x" "0.012812"
-"con_chatrect_y" "0.808333"
+"con_chatrect_y" "0.705000"
 "con_chatwidth" "0.454377"
 "fov" "130"
 seta "fraglimit_override" "0"
diff --git a/profile b/profile
index e17b307..2112f5f 100644
--- a/profile
+++ b/profile
@@ -134,6 +134,10 @@ fn p {
 	plumb $*
 }
 
+fn e {
+	$editor $*
+}
+
 # Setting enviroment.
 if(test -r $setenv){
 	. $setenv
diff --git a/xinitrc b/xinitrc
index 68df11e..af65178 100644
--- a/xinitrc
+++ b/xinitrc
@@ -1 +1,8 @@
+xconf=/etc/X11/xinit/xinitrc.d
+if test -d $xconf ; then
+	for f in $xconf/?*.sh ; do
+		test -r $f && . "$f"
+	done
+fi
 exec $@
+