From 5ef2aed3f3961b72699d9881ed09560f4d01371a Mon Sep 17 00:00:00 2001
From: Cullum Smith <cullum@sacredheartsc.com>
Date: Fri, 18 Oct 2024 16:44:57 -0400
Subject: Tons of desktop fixes

---
 scripts/hostclass/laptop            | 65 -------------------------------------
 scripts/hostclass/laptop/10-desktop |  1 +
 scripts/hostclass/laptop/20-laptop  | 65 +++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 65 deletions(-)
 delete mode 100644 scripts/hostclass/laptop
 create mode 120000 scripts/hostclass/laptop/10-desktop
 create mode 100644 scripts/hostclass/laptop/20-laptop

(limited to 'scripts/hostclass/laptop')

diff --git a/scripts/hostclass/laptop b/scripts/hostclass/laptop
deleted file mode 100644
index dba2c5f..0000000
--- a/scripts/hostclass/laptop
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# Enable thinkpad hardware features.
-load_kernel_module acpi_ibm
-set_loader_conf acpi_ibm_load=YES
-
-# Set USB power savings
-usbconfig | awk -F: '{ print $1 }' | xargs -rtn1 -I% usbconfig -d % power_save ||:
-install_file /etc/rc.local
-
-# Create devd rule for lid close.
-install_file -m 0555 /usr/local/libexec/lid-close
-install_file -m 0644 /etc/devd/lid-close.conf
-service devd restart
-
-# Enable kernel module for Android USB tethering.
-load_kernel_module if_urndis
-set_loader_conf if_urndis_load=YES
-sysrc -v ifconfig_ue0='DHCP'
-
-# Install laptop packages.
-pkg install -y networkmgr
-
-# Misc power saving stuff.
-set_loader_conf \
-  vfs.zfs.txg.timeout=10 \
-
-if [ "$graphics_type" = intel ]; then
-  set_loader_conf \
-    compat.linuxkpi.i915_disable_power_well=1 \
-    compat.linuxkpi.i915_enable_dc=2
-fi
-
-case ${wireless_type:-} in
-  iwm*)
-    set_loader_conf \
-      if_iwm_load=YES \
-      "${wireless_type}fw_load=YES"
-
-    load_kernel_module \
-      if_iwm \
-      "${wireless_type}fw"
-
-    sysrc -v wlans_iwm0='wlan0'
-    ;;
-esac
-
-# Enable power saving for sound card.
-set_sysctl hw.snd.latency=7
-
-# Configure wireless card.
-sysrc -v \
-  create_args_wlan0='country US regdomain FCC' \
-  ifconfig_wlan0="WPA DHCP powersave"
-
-# Hardware-specific fixes.
-case ${laptop_type:-} in
-  thinkpad)
-    # Set brightness using function keys.
-    set_sysctl dev.acpi_ibm.0.handlerevents='0x10 0x11'
-    install_file -m 0555 /usr/local/libexec/thinkpad-brightness
-    install_file -m 0644 /etc/devd/thinkpad-brightness.conf
-    service devd restart
-    ;;
-esac
diff --git a/scripts/hostclass/laptop/10-desktop b/scripts/hostclass/laptop/10-desktop
new file mode 120000
index 0000000..2c7c348
--- /dev/null
+++ b/scripts/hostclass/laptop/10-desktop
@@ -0,0 +1 @@
+../desktop
\ No newline at end of file
diff --git a/scripts/hostclass/laptop/20-laptop b/scripts/hostclass/laptop/20-laptop
new file mode 100644
index 0000000..dba2c5f
--- /dev/null
+++ b/scripts/hostclass/laptop/20-laptop
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Enable thinkpad hardware features.
+load_kernel_module acpi_ibm
+set_loader_conf acpi_ibm_load=YES
+
+# Set USB power savings
+usbconfig | awk -F: '{ print $1 }' | xargs -rtn1 -I% usbconfig -d % power_save ||:
+install_file /etc/rc.local
+
+# Create devd rule for lid close.
+install_file -m 0555 /usr/local/libexec/lid-close
+install_file -m 0644 /etc/devd/lid-close.conf
+service devd restart
+
+# Enable kernel module for Android USB tethering.
+load_kernel_module if_urndis
+set_loader_conf if_urndis_load=YES
+sysrc -v ifconfig_ue0='DHCP'
+
+# Install laptop packages.
+pkg install -y networkmgr
+
+# Misc power saving stuff.
+set_loader_conf \
+  vfs.zfs.txg.timeout=10 \
+
+if [ "$graphics_type" = intel ]; then
+  set_loader_conf \
+    compat.linuxkpi.i915_disable_power_well=1 \
+    compat.linuxkpi.i915_enable_dc=2
+fi
+
+case ${wireless_type:-} in
+  iwm*)
+    set_loader_conf \
+      if_iwm_load=YES \
+      "${wireless_type}fw_load=YES"
+
+    load_kernel_module \
+      if_iwm \
+      "${wireless_type}fw"
+
+    sysrc -v wlans_iwm0='wlan0'
+    ;;
+esac
+
+# Enable power saving for sound card.
+set_sysctl hw.snd.latency=7
+
+# Configure wireless card.
+sysrc -v \
+  create_args_wlan0='country US regdomain FCC' \
+  ifconfig_wlan0="WPA DHCP powersave"
+
+# Hardware-specific fixes.
+case ${laptop_type:-} in
+  thinkpad)
+    # Set brightness using function keys.
+    set_sysctl dev.acpi_ibm.0.handlerevents='0x10 0x11'
+    install_file -m 0555 /usr/local/libexec/thinkpad-brightness
+    install_file -m 0644 /etc/devd/thinkpad-brightness.conf
+    service devd restart
+    ;;
+esac
-- 
cgit v1.2.3