From: Christian Heller <c.heller@plomlompom.de>
Date: Wed, 2 Aug 2023 02:56:11 +0000 (+0200)
Subject: Enhance w530 bookworm setup.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/foo.html?a=commitdiff_plain;h=da85846e77b0a4ae122e5ac55e54c4bdc693594e;p=config

Enhance w530 bookworm setup.
---

diff --git a/bookworm/apt-mark/thinkpad b/bookworm/apt-mark/thinkpad
new file mode 100644
index 0000000..9e9f2e3
--- /dev/null
+++ b/bookworm/apt-mark/thinkpad
@@ -0,0 +1,7 @@
+# for wifi
+firmware-iwlwifi
+# for tlp
+tlp
+tp-smapi-dkms
+#
+
diff --git a/bookworm/apt-mark/user b/bookworm/apt-mark/user
index a7e4e1f..6e79229 100644
--- a/bookworm/apt-mark/user
+++ b/bookworm/apt-mark/user
@@ -4,7 +4,6 @@ lvm2
 # for wifi
 network-manager
 wpasupplicant
-firmware-iwlwifi
 # this provides setupcon which reads /etc/default/console-setup
 console-setup
 # for X to start at all
diff --git a/bookworm/setup_scripts/setup_desktop.sh b/bookworm/setup_scripts/setup_desktop.sh
index 41e500f..b64d39d 100755
--- a/bookworm/setup_scripts/setup_desktop.sh
+++ b/bookworm/setup_scripts/setup_desktop.sh
@@ -35,7 +35,7 @@ if [ "$system_name" = "w530" ]; then
     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 --no-questions
     depmod
 fi
 
diff --git a/bookworm/setup_scripts/setup_home.sh b/bookworm/setup_scripts/setup_home.sh
index 55707fd..ab9f1b5 100755
--- a/bookworm/setup_scripts/setup_home.sh
+++ b/bookworm/setup_scripts/setup_home.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 set -x
+. ./misc.sh
 
 expect_n_args 1 "(system name)" "$@"
 get_system_name_arg "$1"
@@ -56,6 +57,9 @@ cat "${repos_list_file}" | while read line; do
     fi
 done
 
+# Remove redundant config repo copy.
+rm -rf ~/config
+
 # # Set up native messenger for tridactyl.
 # version='ef9f02d0da258f68d7faf8898707f6d83d90d07a'
 # curl -fsSl "https://raw.githubusercontent.com/tridactyl/tridactyl/${version}/native/install.sh" | bash