Cleanup Framework laptop config

7 files changed, 4 insertions, 54 deletions

diff --git a/.linux/etc/modprobe.d/framework-laptop.conf b/.linux/etc/modprobe.d/framework-laptop.conf
index bb33a52..210904b 100644
--- a/.linux/etc/modprobe.d/framework-laptop.conf
+++ b/.linux/etc/modprobe.d/framework-laptop.conf
@@ -13,4 +13,4 @@ options i915 enable_psr=0
 # This is a Framework EC firmware bug
 #
 # Reference: https://community.frame.work/t/20605/55
-blacklist hid-sensor-hub
+blacklist hid_sensor_hub
diff --git a/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf b/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
index 4bdee52..20819d6 100644
--- a/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
+++ b/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
@@ -1,11 +1,5 @@
 [Login]
 # This config is what should be used for laptops with S3 support
-#HandlePowerKey=suspend-then-hibernate
-#HandleLidSwitch=suspend-then-hibernate
-#HandleLidSwitchExternalPower=suspend-then-hibernate
-
-# But in their infinite wisdom Dell removed S3 support from the 9310, so
-# this is needed to make sure the laptop actually sleeps well.
-HandlePowerKey=hybrid-sleep
-HandleLidSwitch=hybrid-sleep
-HandleLidSwitchExternalPower=hybrid-sleep
+HandlePowerKey=suspend-then-hibernate
+HandleLidSwitch=suspend-then-hibernate
+HandleLidSwitchExternalPower=suspend-then-hibernate
diff --git a/.linux/etc/systemd/sleep.conf.d/fix-9310.conf b/.linux/etc/systemd/sleep.conf.d/fix-9310.conf
deleted file mode 100644
index e18032c..0000000
--- a/.linux/etc/systemd/sleep.conf.d/fix-9310.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Sleep]
-HibernateMode=shutdown
diff --git a/.linux/etc/systemd/system/ath11k-resume.service b/.linux/etc/systemd/system/ath11k-resume.service
deleted file mode 100644
index ca4afd5..0000000
--- a/.linux/etc/systemd/system/ath11k-resume.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Resume: modprobe ath11k_pci
-After=suspend.target hibernate.target hybrid-sleep.target
-
-[Service]
-Type=oneshot
-ExecStartPre=/usr/bin/sleep 3
-ExecStart=/usr/sbin/modprobe ath11k_pci
-
-[Install]
-WantedBy=suspend.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ath11k-suspend.service b/.linux/etc/systemd/system/ath11k-suspend.service
deleted file mode 100644
index 3f69497..0000000
--- a/.linux/etc/systemd/system/ath11k-suspend.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Suspend: rmmod ath11k_pci
-Before=sleep.target hibernate.target hybrid-sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rmmod ath11k_pci
-
-[Install]
-WantedBy=sleep.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ax500-resume.service b/.linux/etc/systemd/system/ax500-resume.service
deleted file mode 100644
index 5697f2a..0000000
--- a/.linux/etc/systemd/system/ax500-resume.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Resume: modprobe hci_uart
-After=suspend.target hibernate.target hybrid-sleep.target
-
-[Service]
-Type=oneshot
-ExecStartPre=/usr/bin/sleep 3
-ExecStart=/usr/sbin/modprobe hci_uart
-
-[Install]
-WantedBy=suspend.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ax500-suspend.service b/.linux/etc/systemd/system/ax500-suspend.service
deleted file mode 100644
index a1e5ed3..0000000
--- a/.linux/etc/systemd/system/ax500-suspend.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Suspend: rmmod hci_uart
-Before=sleep.target hibernate.target hybrid-sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rmmod hci_uart
-
-[Install]
-WantedBy=sleep.target hibernate.target hybrid-sleep.target