input-setup dependency to git

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 222eb5ceca2ece5b8b9cccacce59bac8368b051e..39972179d4fb223a12d1aa33ff3e98afdeef6324 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -22,13 +22,11 @@
 
 # for bootstrapping a new machine
 
-# to make ssh run better, first run this:
+# to make ssh interactive shell run better, first run this:
 sudo bash -c 'source /a/c/repos/bash/.bashrc && source /a/exe/ssh-emacs-setup'
 
 
-# see t.org for OS installer notes
-
-# usage: $0 [OPTIONS] HOSTNAME
+# usage: $0 [-r] HOSTNAME
 
 # tips:
 # run any sudo command first so your pass is cached
@@ -137,15 +135,14 @@ fi
 install-myqueue
 
 if iank-dev; then
-    desktop=$(ssh root@iankelling.org grep desktop /etc/hosts | grep -o "^.* ")
+    desktop=DESKTOP_DOMAIN # TODO, broken. rethink this next time it's used
     if $bootstrapfs; then
-        # for bootstrapping at a new job:
+        # TODO: broken. need to copy files in this directory too, probably rethink this.
         cp="scp $desktop:"
         # for moving to a new hd, change $cp to move between filesystems
         mkdir -p /a/bin
         chown -R ian:ian /a # probably needs to be removed
         $cp/a/c /a
-        $cp/a/c/bin/{bash-programs-by-ian,distro-begin,distro-functions,input-setup.sh} /a/bin
         echo -e \\n\\n\\n | ssh-keygen -t rsa
     fi
 fi
@@ -371,7 +368,12 @@ case $(distro-name) in
         ;;&
     ubuntu|debian)
         if has_x; then
-            pi xmacro gtk-redshift xinput
+            if isdebian-stable; then
+                pi xmacro
+            else
+                pi xmacro/unstable # has no unstable deps
+            fi
+            pi gtk-redshift xinput
         fi
         ;;&
     fedora)
@@ -731,11 +733,11 @@ if has_x; then
             dir=/etc/gdm
         fi
         s mkdir -p $dir/PostLogin
-        s command cp /a/bin/desktop-20-autostart.sh $dir/PostLogin/Default
+        s command cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
         s mkdir /etc/lightdm/lightdm.conf.d
         s dd of=/etc/lightdm/lightdm.conf.d/12-ian.conf <<'EOF'
 [SeatDefaults]
-session-setup-script=/a/bin/desktop-20-autostart.sh
+session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF
     fi
 
@@ -762,7 +764,11 @@ EOF
         for homedir in /home/*; do
             cp /etc/X11/xinit/xinitrc $homedir/.xinitrc
             sed -ri '/^ *twm\b/,$d' $homedir/.xinitrc
-            echo "source /a/bin/xinitrc" | tee -a $homedir/.xinitrc
+            tee -a $homedir/.xinitrc <<'EOF'
+/a/bin/desktop-20-autostart.sh
+xsetroot -cursor_name left_ptr
+exec xmonad
+EOF
         done
     else
         pi suckless-tools