Merge remote-tracking branch 'origin/master'

6 files changed, 65 insertions, 24 deletions

diff --git a/doc/note/burncdrom/burncdrom.txt b/doc/note/burncdrom/burncdrom.txt
index 0760142..92de002 100644
--- a/doc/note/burncdrom/burncdrom.txt
+++ b/doc/note/burncdrom/burncdrom.txt
@@ -18,7 +18,7 @@ WARN: Do NOT dump windoof ISO to USB! It won't work. See further down.
 
 ## "Burn" to USB from ISO (NOT disc)
 
-  dd bs=4M if=path/to/my.iso of=/dev/sdX status=progress oflag=sync
+  $SUDO dd bs=4M if=path/to/my.iso of=/dev/sdX status=progress oflag=sync
 
 
 ## Get checksum of disc (NOT usb)
diff --git a/doc/note/mount/fstab.txt b/doc/note/mount/fstab.txt
index de642ce..e25adc8 100644
--- a/doc/note/mount/fstab.txt
+++ b/doc/note/mount/fstab.txt
@@ -2,6 +2,7 @@
 fstab
 =====
 
+
 ## Moving firefox cache to RAM
 
 Effect: Faster at runtime, slower at startup.
diff --git a/doc/note/mount/mount.txt b/doc/note/mount/mount.txt
index 99e1521..45c5637 100644
--- a/doc/note/mount/mount.txt
+++ b/doc/note/mount/mount.txt
@@ -1,4 +1,21 @@
 
+
+## Mount options
+
+/src  /dst  ext4  options,go=here  0  0
+                  ^^^^^^^^^^^^^^^-- example in "fstab"
+
+mount  -o options,go=here  /src  /dst
+         ^^^^^^^^^^^^^^^----------- example in mount command
+
+  password=            SMB/nfs passwords (plaintext!)
+  uid=1000,gid=1000    What user/grp NTFS files shall have
+  user                 noroot is allowed to mount this fstab entry.
+  vers=3.0             Which SMB version to use
+  nofail               Boot anyway, if fstab entry fails.
+  errors=remount-ro    mount readonly if errors occur.
+
+
 ## tmpfs / ramfs
 
 TODO: it seems as 'size' has no effect, and system may run OOM instead.
diff --git a/doc/note/qemu/qemu.txt b/doc/note/qemu/qemu.txt
index 728e97e..f3fbc69 100644
--- a/doc/note/qemu/qemu.txt
+++ b/doc/note/qemu/qemu.txt
@@ -2,13 +2,6 @@
 Qemu
 ================
 
-## TODO move this to the NFS section
-
-Example fstab entries:
-
-//10.0.2.2/sharename  /mnt/cee-misc-lib  nfs  user,noauto,forceuid,uid=1000,vers=3.0  0  0
-
-
 ## Qemu Setup
 
   apt install qemu-system-aarch64 qemu-efi-aarch64
@@ -121,7 +114,7 @@ true \
 (see also "../../../doc/note/rasbpi/rasbpi.txt")
 
 # Example Raspi
-qemu-system-aarch64
+qemu-system-aarch64 \
     -nodefaults -accel tcg,thread=multi `# TODO confirm thread=multi works ` \
     -machine type=raspi3b -cpu cortex-a53 -smp 4 -m 1G \
     -kernel kernel8.img -dtb bcm2710-rpi-3-b.dtb -sd "$(dirname "$(realpath "$0")")/sd.qcow2" \
@@ -137,14 +130,14 @@ qemu-system-aarch64
   && hostpath=/path/to/host/dir \
   && sharename=work \
   && apt install --no-install-recommends -y samba \
-  && printf '[%s]\npath = %s\npublic = no\nwriteable = yes\nguest ok = yes\nforce user = andreas\n' "${sharename:?}" "${hostpath:?}" | $SUDO tee -a /etc/samba/smb.conf >/dev/null \
+  && printf '[%s]\npath = %s\npublic = no\nallow hosts = 127.0.0.1\nwriteable = yes\nguest ok = yes\nforce user = andreas\n' "${sharename:?}" "${hostpath:?}" | $SUDO tee -a /etc/samba/smb.conf >/dev/null \
   && $SUDO /etc/init.d/smbd restart \
   && true
 
 TODO: SMB server windoof
 DoesNotWork: "https://serverfault.com/questions/442664/virtualization-linux-kvm-qemu-host-windows-vm-guest-how-to-access-data-drive#comment479177_442678"
 
-true `# SMB client debian` \
+  && `# SMB client debian` \
   && hostUsername=yourHostUser \
   && smbServer=10.0.2.2 \
   && sharename=work \
@@ -154,24 +147,23 @@ true `# SMB client debian` \
   && true \
   && $SUDO mkdir -p "${mountpoint:?}" \
   && $SUDO apt install --no-install-recommends -y cifs-utils psmisc \
-  && $SUDO mount -t cifs -o username=${hostUsername:?},uid=${guestUid:?},gid=${guestGid:?} "//${smbServer:?}/${sharename:?}" "${mountpoint:?}" \
-  && true
 
 
 ## Example smb config for smb server (TODO verify)
 
 [vm-share]
    path = /path/to/vm-share
+   allow hosts = 127.0.0.1, 169.254.42.42
    browseable = yes
    read only = no
    guest ok = yes
    force user = usernameFromHost
 
 
-### Add those in "/etc/fstab" to setup mount automatically at boot:
-### HINT:  mkdir /home/user/build
-  //10.0.2.2/sharename  /mnt/sharename  cifs  password=,uid=1000,gid=1000,user,vers=3.0  0  0
-  /home/user/build  /mnt/sharename/build  none  bind  0  0
+## Example fstab entries  (HINT: mkdir /mnt/sharename)
+
+//10.0.2.2/sharename  /mnt/sharename  nfs  nofail,user,noauto,forceuid,uid=1000,vers=3.0  0  0
+//10.0.2.2/sharename  /mnt/sharename  cifs  nofail,password=,uid=1000,gid=1000,user,vers=3.0  0  0
 
 List smb shares (eg debugging)
   smbclient -NL //10.0.2.2
@@ -221,11 +213,6 @@ In GUEST to access it do:
   && printf 'user:12345\n' | chpasswd \
   && /etc/init.d/sshd restart \
 
-  && `# host auto-mount helper script ` \
-  && mkdir ~/.local ~/.local/bin \
-  && echo H4sIAAUQ5GYAA0WOsQ7CMAxE93yFCUgFiTbQEaliYWArA8wRFJNkaFI1CR2Af8cpSJ1sv/P5PJ+Jm7HCa+YxQI7s2R6dDxePfXWuD7XsYpCaiIyEpMYemY+nYRJVRFJ754Lsht9CNPeKL5bmDnlccaamUdGIjXbAF690Zv/h8AYfIfkhbyBrXbTUBWjMw0PuIOXaa4tVRp7pO3Jm6xSUMNXdCNQfqD8ALsR2U2yKsijF+LLX1x7TPU5aa8OPjqmdMzbwjH0BleXnHxQBAAA= |base64 -d|gzip -d > ~/.local/bin/setup \
-  && printf '\n  TODO: Resolve the todos in %s\n\n' ~/.local/bin/setup \
-
 
 ## Debian PostInstall
 
diff --git a/doc/note/setup/setup-debian.txt b/doc/note/setup/setup-debian.txt
index c0992dc..582764e 100644
--- a/doc/note/setup/setup-debian.txt
+++ b/doc/note/setup/setup-debian.txt
@@ -84,7 +84,7 @@ UUID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx  /mnt/nameOfHdd  ext4  noatime  0  2
 
   && $SUDO apt install -y --no-install-recommends xorg openbox mate-terminal lightdm light-locker feh scrot lxpanel qalculate-gtk gmrun gnome-system-monitor \
   && mkdir ~/.config ~/.config/openbox || true \
-  && update-alternatives  \
+  && update-alternatives `# TODO needs args` \
 
 Populate "/etc/environment" as described by "./etc-environment".
 
@@ -96,10 +96,12 @@ Populate "/etc/environment" as described by "./etc-environment".
        vim htop pv openssh-client iptables iptables-persistent xxd zip unzip xz-utils p7zip-full \
        file trash-cli ncat curl \
        `# basic UI (vim-gtk required for system clipboard)` \
-       vim-gtk3 firefox-esr file-roller thunderbird chromium okular \
+       vim-gtk3 firefox-esr pcmanfm file-roller thunderbird chromium okular \
        `# software devel` \
        git sqlite3 manpages-dev gdb qemu-utils qemu-system-x86 qemu-system-arm wireshark samba \
        tigervnc-viewer jq universal-ctags \
+       `# network config` \
+       iwgtk \
        `# server` \
        nginx-light avahi-daemon  \
        `# mDNS client & tools` \
diff --git a/doc/note/xorg/xrandr.txt b/doc/note/xorg/xrandr.txt
new file mode 100644
index 0000000..109cb67
--- /dev/null
+++ b/doc/note/xorg/xrandr.txt
@@ -0,0 +1,34 @@
+
+## Tuxbook reset to solo screen
+
+xrandr --dpi 142 --fb 1920x1080 \
+    --output HDMI-1 --off \
+    --output eDP-1 \
+        --mode 1920x1080 --rate 60.01 \
+        --pos 0x0 \
+        --scale 1x1 \
+	--primary \
+
+
+## Tuxbook home 4k 40" dual-mon setup
+
+# TODO could fb be smaller?
+xrandr --dpi 157 --fb 9600x3600 \
+    --output HDMI-1 \
+        --mode 3840x2160 --rate 25 \
+        --pos 0x0 \
+        --scale 0.5x0.5 \
+        --primary \
+    --output eDP-1 \
+        --mode 1920x1080 --rate 60.01 \
+        --pos 1920x540 \
+        --scale 0.5x0.5 \
+
+
+## Try fix annoying app scaling issues
+
+  GDK_DPI_SCALE=1
+  GDK_SCALE=1
+  QT_AUTO_SCREEN_SCALE_FACTOR=1
+  QT_SCALE_FACTOR=0.6
+