From db6cdfca82595229307f8a801d7f7941bdcb2d4c Mon Sep 17 00:00:00 2001
From: "committer@t470p" <committer0@t470p.com>
Date: Sun, 17 Nov 2024 06:49:42 -0500
Subject: [PATCH] / move display setup to startup.sh

---
 dots/bash/.bashrc   | 26 --------------------------
 dots/bin/startup.sh | 37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc
index 2421efc..e7d7402 100644
--- a/dots/bash/.bashrc
+++ b/dots/bash/.bashrc
@@ -130,32 +130,6 @@ rshift() {
     redshift -P -O ${temperature}
 }
 
-# display setup
-ds-t470p-11() {
-    info="1 laptop + 1 monitor for t470p"
-    if [[ $1 == "info" ]] ; then
-        echo "${info}"
-    else
-        echo "${info}"
-        xrandr --output eDP-1 --mode 1920x1080 --pos 0x1080 --rotate normal --output DP-1 --off --output HDMI-1 --primary --mode 3840x2160 --pos 1920x0 --rotate normal --output DP-2 --off --output HDMI-2 --off --output DP-3 --off --output HDMI-3 --off > /dev/null 2>&1
-        nr > /dev/null 2>&1
-        xrdb ~/.Xresources
-    fi
-}
-ds-tuxwarrior-11() {
-    info="1 laptop + 1 monitor for tuxwarrior"
-    if [[ $1 == "info" ]] ; then
-        echo "${info}"
-    else
-        echo "${info}"
-        xrandr --output DP-0 --off --output DP-1 --off --output HDMI-0 --primary --mode 3840x2160 --pos 3840x0 --rotate normal --output DP-2 --mode 3840x2160 --pos 0x0 --rotate normal --output DP-3 --off --output DP-4 --off --output DP-5 --off --output DP-6 --off > /dev/null 2>&1
-        nr > /dev/null 2>&1
-        xrdb ~/.Xresources
-        i3-msg "rename workspace 1 to 10"
-        i3-msg "rename workspace 2 to 1"
-    fi
-}
-
 # # Change the window title of X terminals
 # case ${TERM} in
 # 	xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
diff --git a/dots/bin/startup.sh b/dots/bin/startup.sh
index e7cb22f..31a5ae2 100755
--- a/dots/bin/startup.sh
+++ b/dots/bin/startup.sh
@@ -1,8 +1,28 @@
 #!/usr/bin/env bash
 
-# klevstul
+# : klevstul : start miscellanous application : 24.11.17->
+
+
+# display setup functions
+
+ds-t470p-11() {
+    info="1 laptop + 1 monitor for t470p"
+    echo "${info}"
+    xrandr --output eDP-1 --mode 1920x1080 --pos 0x1080 --rotate normal --output DP-1 --off --output HDMI-1 --primary --mode 3840x2160 --pos 1920x0 --rotate normal --output DP-2 --off --output HDMI-2 --off --output DP-3 --off --output HDMI-3 --off > /dev/null 2>&1
+    nr > /dev/null 2>&1
+    xrdb ~/.Xresources
+}
+
+ds-tuxwarrior-11() {
+    info="1 laptop + 1 monitor for tuxwarrior"
+    echo "${info}"
+    xrandr --output DP-0 --off --output DP-1 --off --output HDMI-0 --primary --mode 3840x2160 --pos 3840x0 --rotate normal --output DP-2 --mode 3840x2160 --pos 0x0 --rotate normal --output DP-3 --off --output DP-4 --off --output DP-5 --off --output DP-6 --off > /dev/null 2>&1
+    nr > /dev/null 2>&1
+    xrdb ~/.Xresources
+    i3-msg "rename workspace 1 to 10"
+    i3-msg "rename workspace 2 to 1"
+}
 
-# start miscellaneous applications
 
 if [[ "${XWM}" == "hyprland" ]]; then
 
@@ -15,10 +35,21 @@ if [[ "${XWM}" == "hyprland" ]]; then
 elif [[ "${XWM}" == "i3" ]]; then
 
 	echo "<< i3wm >>"
+
+	# display setup
+
+
+
 	#/home/poq/syncDir/secrets/keyring/add_keyring_secrets.sh
 	#sleep .5
 	display_setup=ds-${HOSTNAME}-11
-	${!display_setup}	# display setup
+	${display_setup}
+
+#        eval "${display_setup}" 
+#        ${display_setup}
+#        bash -c ${display_setup}
+
+#	bash -c ${display_setup}	# display setup
 	#nextcloud &			# nextcloud file sync
 	#pcloud &			# pcloud service
 	#protonvpn-app &		# vpn