Merged from github.

Pascal J. Bourguignon [2018-05-06 09:45]
Merged from github.
Filename
gdirs
workspace
diff --git a/gdirs b/gdirs
index 5b35601..1cd25eb 100644
--- a/gdirs
+++ b/gdirs
@@ -1,7 +1,8 @@
 # -*- mode:shell-script -*-

-gsets=(pjb gsharp)
+# default gsets…

+gsets=(pjb gsharp)

 pjb=(
     "$HOME"/rc
diff --git a/workspace b/workspace
index 79e4993..74c4363 100755
--- a/workspace
+++ b/workspace
@@ -1,13 +1,37 @@
 #!/bin/bash
+
 xset -dpms
-if type -p setxkbmap ; then
+xsetroot -solid '#137'
+
+if type -p xkbset >/dev/null 2>&1 ; then
+    xkbset nullify lock
+fi
+# xdotool key  Caps_Lock
+# xte "key Caps_Lock"
+
+if type -p setxkbmap >/dev/null 2>&1 ; then
     setxkbmap -layout us \
+              -option ctrl:ac_ctrl
               -option ctrl:nocaps \
               -option caps:none \
               -option shift:breaks_caps \
               -option compose:lctrl
 fi
-( sleep  1 ; pjb-xterm green -e screen & disown ) &
-# (sleep 10 ; emacsen ) & disown
-( sleep  5 ; emacs & disown ) &
-( sleep 10 ; firefox >/tmp/firefox-${UID}-$$.log & disown ) &
+
+case "$(hostname)" in
+(minint|*span)
+    xrandr --size 1680x1050
+    gsettings set org.freedesktop.ibus.general.hotkey triggers []
+    ( sleep  1 ; xterm -fg green -bg black -fn terminus-32  -e screen & disown ) &
+    ( sleep  5 ; emacs                                                & disown ) &
+    ( sleep  7 ; thunderbird >/tmp/thunderbird-${UID}-$$.log          & disown ) &
+    ( sleep 10 ; firefox     >/tmp/firefox-${UID}-$$.log              & disown ) &
+    ;;
+
+(*)
+    ( sleep  1 ; pjb-xterm green -e screen & disown ) &
+    # (sleep 10 ; emacsen ) & disown
+    ( sleep  5 ; emacs & disown ) &
+    ( sleep 10 ; firefox >/tmp/firefox-${UID}-$$.log & disown ) &
+    ;;
+esac
ViewGit