lots o fixes, beets, shellcheck stuff

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index d0b03f62b341097fc12f394bb890b1410f1ba567..c3c0c3dae3f0de3ac515f542ffb88402ce5201a1 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -100,7 +100,7 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
-for f in kd x2 x3 frodo tp li bk je demohost kw sy bo; do
+for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo; do
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
@@ -394,7 +394,7 @@ if bitfolk; then
   sudo sed -ri "/^127\./n;/[[:space:]]$HOSTNAME\$/d" /etc/hosts
 fi
 
-if isdeb && [[ $(debian-codename) == nabia ]]; then
+if isdeb && [[ $(debian-codename) == aramo ]]; then
   sudo dd of=/etc/apt/preferences.d/aramo-jammy-missing <<'EOF'
 Package: linux-libc-dev libmysqlclient21
 Pin: release n=jammy,o=Ubuntu
@@ -493,7 +493,7 @@ case $(debian-codename-compat) in
     file=/etc/modprobe.d/evbug.conf
     line="blacklist evbug"
     if [[ $(cat $file) != "$line" ]]; then
-      sudo dd of=$file 2>/dev/null <<<"$line"
+      sudo dd of=$file status=none <<<"$line"
       sudo depmod -a
       sudo update-initramfs -u
     fi
@@ -623,7 +623,7 @@ if has_btrfs; then
 
     first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
     tu /etc/fstab <<EOF
-$first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( ((`nproc` > 2)) && echo ,compress=zstd )  0 0
+$first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( (( $(nproc) > 2)) && echo ,compress=zstd )  0 0
 EOF
     sudo mkdir -p $dir
     sudo chown $USER:$USER $dir
@@ -637,6 +637,7 @@ case $HOSTNAME in
   kd)
     tu /etc/fstab <<'EOF'
 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7  /d  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d  0 0
+/i /d/m none  bind,compress=zstd  0 0
 EOF
     if ! mountpoint /d &>/dev/null; then
       sudo mkdir -p /d
@@ -645,6 +646,17 @@ EOF
       fi
     fi
     ;;
+  frodo)
+    tu /etc/fstab <<'EOF'
+/dev/mapper/crypt_dev_ata-ata-Hitachi_HDS722020ALA330_JK1121YAG7SXWS-part1  /i  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvol=i  0 0
+EOF
+    if ! mountpoint /i &>/dev/null; then
+      sudo mkdir -p /i
+      if [[ -d /mnt/i/i ]]; then
+        sudo mount /i
+      fi
+    fi
+    ;;
 esac
 
 if bitfolk; then
@@ -705,20 +717,17 @@ if has_monitor; then
   dir=/etc/X11/xinit/xinitrc.d/
   sudo mkdir -p $dir
   sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir
-  s teeu /etc/systemd/logind.conf <<'EOF'
-HandleLidSwitch=
-EOF
 
-  # this works on
-  dir=/etc/gdm3
-  sudo mkdir -p $dir/PostLogin
-  sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
+  ## disabled since i'm not using gdm atm
+  # dir=/etc/gdm3
+  # sudo mkdir -p $dir/PostLogin
+  # sudo cp /a/bin/distro-setup/desktop-20-autostart.sh $dir/PostLogin/Default
   sudo mkdir -p /etc/lightdm/lightdm.conf.d
   # etiona lightdm.log:
   # [SeatDefaults] is now called [Seat:*], please update this configuration
   sudo dd of=/etc/lightdm/lightdm.conf.d/12-iank.conf <<'EOF'
 [Seat:*]
-display-setup-script=/a/bin/ds/lightdm-start
+# display-setup-script=/a/bin/ds/lightdm-start
 session-setup-script=/a/bin/distro-setup/desktop-20-autostart.sh
 EOF