From 755eecf8b78a8336c12bb11f57ebf0eccd3b32c8 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 2 Aug 2023 04:07:33 +0200
Subject: [PATCH] Improve w530 bookworm setup.

---
 bookworm/setup_scripts/setup.sh         | 1 -
 bookworm/setup_scripts/setup_desktop.sh | 5 ++---
 bookworm/setup_scripts/setup_home.sh    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/bookworm/setup_scripts/setup.sh b/bookworm/setup_scripts/setup.sh
index 0502de7..0c28d60 100755
--- a/bookworm/setup_scripts/setup.sh
+++ b/bookworm/setup_scripts/setup.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-debian_version="bookworm"
 . ./misc.sh
 
 expect_n_args 2 "(hostname, FQDN)" "$@"
diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 216bf7c..41e500f 100755
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -45,6 +45,5 @@ cd "${setup_scripts_dir}"
 adduser --disabled-password --gecos "" plom
 usermod -a -G sudo plom
 passwd plom
-cp setup_home.sh /home/plom
-cp misc.sh /home/plom
-chown plom:plom /home/plom/*.sh
+cp -a ~/config /home/plom
+chown -R plom:plom /home/plom/config
diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index a2c65da..55707fd 100755
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -1,12 +1,10 @@
 #!/bin/sh
 set -e
-debian_version="bookworm"
-. ./misc.sh
+set -x
 
 expect_n_args 1 "(system name)" "$@"
 get_system_name_arg "$1"
 
-git clone https://plomlompom.com/repos/clone/config
 cd $setup_scripts_dir
 ./copy_dirtree.sh "${config_tree_prefix}/home_files" "${HOME}" minimal user "${system_name}"
 
-- 
2.30.2