diff --git a/install/config/all.sh b/install/config/all.sh index 89638867..580bc6fa 100644 --- a/install/config/all.sh +++ b/install/config/all.sh @@ -34,13 +34,13 @@ run_logged $OMARCHY_INSTALL/config/hardware/printer.sh run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh -run_logged $OMARCHY_INSTALL/config/hardware/intel-video-acceleration.sh -run_logged $OMARCHY_INSTALL/config/hardware/intel-lmp.sh -run_logged $OMARCHY_INSTALL/config/hardware/intel-thermald.sh -run_logged $OMARCHY_INSTALL/config/hardware/intel-ipu7-camera.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/video-acceleration.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/lmp.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/thermald.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/ipu7-camera.sh run_logged $OMARCHY_INSTALL/config/hardware/vulkan.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-intel-panther-lake-display.sh -run_logged $OMARCHY_INSTALL/config/hardware/intel-panther-lake-audio.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/fix-ptl-display.sh +run_logged $OMARCHY_INSTALL/config/hardware/intel/ptl-audio.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-bcm43xx.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh diff --git a/install/config/hardware/fix-intel-panther-lake-display.sh b/install/config/hardware/intel/fix-ptl-display.sh similarity index 100% rename from install/config/hardware/fix-intel-panther-lake-display.sh rename to install/config/hardware/intel/fix-ptl-display.sh diff --git a/install/config/hardware/intel-ipu7-camera.sh b/install/config/hardware/intel/ipu7-camera.sh similarity index 100% rename from install/config/hardware/intel-ipu7-camera.sh rename to install/config/hardware/intel/ipu7-camera.sh diff --git a/install/config/hardware/intel-lmp.sh b/install/config/hardware/intel/lmp.sh similarity index 100% rename from install/config/hardware/intel-lmp.sh rename to install/config/hardware/intel/lmp.sh diff --git a/install/config/hardware/intel-panther-lake-audio.sh b/install/config/hardware/intel/ptl-audio.sh similarity index 99% rename from install/config/hardware/intel-panther-lake-audio.sh rename to install/config/hardware/intel/ptl-audio.sh index c750fe02..0bd7392e 100644 --- a/install/config/hardware/intel-panther-lake-audio.sh +++ b/install/config/hardware/intel/ptl-audio.sh @@ -1,5 +1,6 @@ # Install Panther Lake audio kernel for Intel Panther Lake systems # The linux-ptl-audio kernel includes audio driver patches not yet in mainline. + if omarchy-hw-intel-ptl; then echo "Detected Intel Panther Lake, installing PTL audio kernel..." diff --git a/install/config/hardware/intel-thermald.sh b/install/config/hardware/intel/thermald.sh similarity index 100% rename from install/config/hardware/intel-thermald.sh rename to install/config/hardware/intel/thermald.sh diff --git a/install/config/hardware/intel-video-acceleration.sh b/install/config/hardware/intel/video-acceleration.sh similarity index 92% rename from install/config/hardware/intel-video-acceleration.sh rename to install/config/hardware/intel/video-acceleration.sh index 41e421a7..b8ce4f80 100644 --- a/install/config/hardware/intel-video-acceleration.sh +++ b/install/config/hardware/intel/video-acceleration.sh @@ -1,5 +1,5 @@ # This installs hardware video acceleration for Intel GPUs -# Check if we have an Intel GPU at all + if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then # HD Graphics / Iris / Xe / Arc use intel-media-driver if [[ ${INTEL_GPU,,} =~ (hd\ graphics|uhd\ graphics|xe|iris|arc) ]]; then diff --git a/migrations/1773505447.sh b/migrations/1773505447.sh index 8683c971..02c75c67 100644 --- a/migrations/1773505447.sh +++ b/migrations/1773505447.sh @@ -1,3 +1,3 @@ echo "Enable thermald for Intel Sandy Bridge and newer laptops" -source "$OMARCHY_PATH/install/config/hardware/intel-thermald.sh" +source "$OMARCHY_PATH/install/config/hardware/intel/thermald.sh" diff --git a/migrations/1774366575.sh b/migrations/1774366575.sh index 0e99d66d..5332b7fe 100644 --- a/migrations/1774366575.sh +++ b/migrations/1774366575.sh @@ -1,3 +1,3 @@ echo "Install Intel Low Power Mode for Intel CPUs" -source "$OMARCHY_PATH/install/config/hardware/intel-lmp.sh" +source "$OMARCHY_PATH/install/config/hardware/intel/lmp.sh"