updates, especially for etiona

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index eb51dcbe33fb67d0008357e8bddc203ad6f125f3..16d3359d5d8f8579250d9541e14f37479601089d 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -46,7 +46,6 @@
 ### make ssh interactive shell run better. for when running line interactively line by line
 sudo bash -c '/a/exe/ssh-emacs-setup'
 
-if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
 ##### setup error handling
 interactive=true  # set this to false to force set -x
 [[ $- == *i* ]] || interactive=false
@@ -168,15 +167,26 @@ EOF
 
   pi rsync
 
-  # from /usr/share/doc/dropbear-initramfs/README.initramfs.gz
-  tmp=$(mktemp)
-  while read -r m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
-    sed -nr "s@^/lib/modules/$(uname -r)/kernel/drivers/net(/.*)?/([^/]+)\.ko\$@\2@p" \
-    | sudo dd of=$tmp
-  if ! diff -q /etc/initramfs-tools/modules $tmp &>/dev/null; then
-    sudo dd if=$tmp of=/etc/initramfs-tools/modules
+  ## /usr/share/doc/dropbear-initramfs/README.initramfs.gz
+  ## claims we need to do this. but it works fine without it.
+  # tmp=$(mktemp)
+  # while read -r m _; do /sbin/modinfo -F filename "$m"; done </proc/modules | \
+    #   sed -nr "s@^/lib/modules/$(uname -r)/kernel/drivers/net(/.*)?/([^/]+)\.ko\$@\2@p" \
+    #   | sudo dd of=$tmp
+  # if ! diff -q /etc/initramfs-tools/modules $tmp &>/dev/null; then
+  #   sudo dd if=$tmp of=/etc/initramfs-tools/modules
+  #   sudo /usr/sbin/update-initramfs -u -k all
+  # fi
+  #
+  ## if we were creating an intall for a different machine needing different modules, we could include them all like this:
+  ## find /lib/modules/*/kernel/drivers/net /lib/modules/*/kernel/net -type f -name '*.ko' -printf "%f\n" | sed 's/.ko$//' | sort -u >/etc/initramfs-tools/modules
+
+  # this is here to cleanup the leftover from the comments above. remove it eventually.
+  if [[ -s /etc/initramfs-tools/modules ]]; then
+    sudo truncate -s0 /etc/initramfs-tools/modules
     sudo /usr/sbin/update-initramfs -u -k all
   fi
+
   # initram auth keys get setup with rootsshsync
   $script_dir/rootsshsync
   # then for remote unlock, ssh and do this once per crypt disk:
@@ -516,36 +526,28 @@ if tp || x2 || x3; then
   esac
 fi
 
-if has_x; then
+if has_monitor; then
+
+  # sway not packaged for t9, not bothering to build it yet since
+  # i3 doesnt seem to tear and stutter on video anymore.
+  if [[ $codename == buster ]]; then
+    pi sway xwayland
+  fi
+
+
   ###### install X
   pi i3
-  if isarch; then
-    # xorg-xmessage for displaying error messages.
-    # optional dependency in arch, standard elsewhere.
-    pi xorg-server xorg-xmessage xorg-xsetroot xorg-xinit
-  fi
 
   ##### install xinput
   case $(distro-name) in
     trisquel|ubuntu|debian)
       pi xinput
       ;;
-    arch)
-      pi xorg-xinput
-      ;;
   esac
 
-  #### install redshift
-  case $(distro-name) in
-    trisquel|ubuntu|debian)
-      # recommends gets us geoclue (for darkening automatically at night i assume),
-      # which recommends modemmanager, which is annoying to fix for the model01 keyboard.
-      pi --no-install-recommends gtk-redshift
-      ;;&
-    arch)
-      pi redshift
-      ;;&
-  esac
+  # recommends gets us geoclue (for darkening automatically at night i assume),
+  # which recommends modemmanager, which is annoying to fix for the model01 keyboard.
+  pi --no-install-recommends gtk-redshift
 
   ##### setup X autostart
   # todo, figure this out for arch if we ever try out gnome.
@@ -558,23 +560,19 @@ if has_x; then
 [SeatDefaults]
 session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF
-fi
 
-### install and configure wayland
-if has_wayland; then
-  pi sway xwayland
+
   # originally used xkbcomp, documented in input-setup.sh, this doesnt
   # work under wayland, but its still useful for creating the config,
   # then modifying the system files.
   sudo sed -i.orig '/key *<KPMU> *{/,/}/s/KP_Multiply/underscore/g' /usr/share/X11/xkb/symbols/keypad
-fi
 
-##### basic graphical packages
-if has_monitor; then
+  ##### basic graphical packages
   pi konsole suckless-tools
 fi
 
 
+
 ##### install  emacs
 if $emacs; then
   if isarch; then