X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=bookworm%2Fsetup_scripts%2Fsetup_desktop.sh;h=a617e0e1d9f99f78215690e060adc390dd7c7e6e;hb=95a3dd4ea9de431aff34a316ca049c5f01685082;hp=4b5a554f183f2f1c072f3061fdcf2b6720666994;hpb=3538e07ef2278bb9e810345561a5d3d8e22e7183;p=config

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 4b5a554..a617e0e 100755
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -1,43 +1,55 @@
 #!/bin/sh
 set -e
-set -x
-debian_version="bookworm"
-legal_system_names="x220 w530"
+. ./misc.sh
 
-if [ "$#" -ne 1 ]; then
-    echo 'Need exactly one argument (system name).'
-    false
-fi
-found=0
-for system_name_i in $legal_system_names; do
-    if [ "$1" = "$system_name_i" ]; then
-        found=1
-        system_name="${system_name_i}"
-        continue	
-    fi
-done
-if [ "$found" = 0 ]; then
-    echo "Need legal system name."
-    false
-fi
+expect_n_args 1 "(system name)" "$@"
+get_system_name_arg "$1"
 
 # Set up system without user environment.
-config_tree_prefix="${HOME}/config/${debian_version}"
-setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
-./setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
+if [ "$system_name" = "w530" || "$system_name" = "x220"]; then
+    ./_setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
+else
+    ./_setup.sh "${system_name}" "" user desktop "${system_name}"
+fi
 
+# # Set up printer.
+# ppd_deb="hll2350dwpdrv-4.0.0-1.i386.deb"
+# wget "https://download.brother.com/welcome/dlf103566/${ppd_deb}"
+# dpkg --add-architecture i386
+# apt update
+# apt install -y "./${ppd_deb}"
+# service cups restart
+# # lpadmin -p 'Brother_HLL2350DW' -m 'brother-HLL2350DW-cups-en.ppd'
+# rm "./${ppd_deb}"
+# # TODO explore potential lpadmin options like -o 'OutputMode=NormalGray'
+
+# Set up NVIDIA eGPU config.
 if [ "$system_name" = "w530" ]; then
     cd
     git clone https://github.com/NVIDIA/open-gpu-kernel-modules
     cd open-gpu-kernel-modules
     git checkout 337e28e
-    make modules -j($nproc)
+    # git checkout 4c29105335610933e744f4ab2524ea63fc39edaf
+    make modules -j$(nproc)
     make modules_install
     cd
     driver_version=535.86.05
+    # driver_version=545.29.06
     runscript=NVIDIA-Linux-x86_64-${driver_version}.run
     wget https://us.download.nvidia.com/XFree86/Linux-x86_64/${driver_version}/${runscript}
+    rmmod nouveau
     chmod u+x ${runscript} 
-    ./${runscript} --no-kernel-modules
+    ./${runscript} --no-kernel-modules --silent
+    depmod
+    # TODO I suspect that the GPU falling of the bus may be mildened by running nvidia-persistenced, check https://github.com/NVIDIA/nvidia-persistenced/tree/main/init  
 fi
+
+# Set up user environments.
+cd "${setup_scripts_dir}"
+./copy_dirtree.sh "${config_tree_prefix}/home_files" "/root" minimal root
+adduser --disabled-password --gecos "" plom
+usermod -a -G sudo plom
+passwd plom
+cp -a ~/config /home/plom
+chown -R plom:plom /home/plom/config