X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=bookworm%2Fsetup_scripts%2Fsetup_desktop.sh;h=9675df81987ac29ebfc3198ea6aa122f603121f6;hb=05af7e748a62b71f20597bb559106c8692c34ef4;hp=4b5a554f183f2f1c072f3061fdcf2b6720666994;hpb=3538e07ef2278bb9e810345561a5d3d8e22e7183;p=config

diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 4b5a554..9675df8 100755
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -1,38 +1,22 @@
 #!/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}"
 
+# 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)
+    make modules -j$(nproc)
     make modules_install
     cd
     driver_version=535.86.05
@@ -41,3 +25,12 @@ if [ "$system_name" = "w530" ]; then
     chmod u+x ${runscript} 
     ./${runscript} --no-kernel-modules
 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 setup_home.sh /home/plom
+chown plom:plom /home/plom/setup_home.sh