From d18ef876fec3100bfcd312c07db0f2ab7f8d872d Mon Sep 17 00:00:00 2001 From: Nekoh Date: Mon, 17 Jun 2024 23:51:24 -0400 Subject: [PATCH 1/4] Seperate each device into its own profile for future sanity --- profiles/pci/handhelds/profiles.toml | 99 ++++++++++++++++++++++++---- 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/profiles/pci/handhelds/profiles.toml b/profiles/pci/handhelds/profiles.toml index 84f835e..cb0e146 100644 --- a/profiles/pci/handhelds/profiles.toml +++ b/profiles/pci/handhelds/profiles.toml @@ -17,12 +17,13 @@ #DEVICEIDS=15bf #83E1 -[steam-deck] -desc = 'Valve Steam Deck' +[steam-deck-jupiter] +desc = 'Valve Steam Deck LCD' +nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "1435 163f" -hwd_product_name_pattern = '(Galileo)|(Jupiter)' +hwd_product_name_pattern = '(Jupiter)' priority = 6 packages = 'powerbuttond jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' #fbcon=vc:2-6 is not added here because it is added for all devices using calamares. @@ -30,33 +31,107 @@ post_install = """ echo "Steam Deck chwd installing..." username=$(id -nu 1000) services=("jupiter-fan-control") - kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" echo "Enabling services..." for service in ${services[@]}; do systemctl enable --now "${service}.service" done - echo "Adding required kernel parameters..." - sed -i "s/LINUX_OPTIONS=\"[^\"]*/& ${kernelparams}/" /etc/sdboot-manage.conf + #kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" + #echo "Adding required kernel parameters..." + #sed -i "s/LINUX_OPTIONS=\"[^\"]*/& ${kernelparams}/" /etc/sdboot-manage.conf """ post_remove = """ echo "Steam deck chwd removing..." username=$(id -nu 1000) services=("jupiter-fan-control") - kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" echo "Disabling services..." for service in ${services[@]}; do systemctl disable "${service}.service" done - echo "Removing kernel parameters..." - sed -i "s/${kernelparams}//" /etc/sdboot-manage.conf + #kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" + #echo "Removing kernel parameters..." + #sed -i "s/${kernelparams}//" /etc/sdboot-manage.conf """ -[phoenix] -desc = 'ASUS ROG Ally and Lenovo Legion Go' +[steam-deck-galileo] +desc = 'Valve Steam Deck OLED' +nonfree = false +class_ids = "0300" +vendor_ids = "1002" +device_ids = "1435 163f" +hwd_product_name_pattern = '(Galileo)' +priority = 6 +packages = 'powerbuttond jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' +#fbcon=vc:2-6 is not added here because it is added for all devices using calamares. +post_install = """ + echo "Steam Deck chwd installing..." + username=$(id -nu 1000) + services=("jupiter-fan-control") + echo "Enabling services..." + for service in ${services[@]}; do + systemctl enable --now "${service}.service" + done + #kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" + #echo "Adding required kernel parameters..." + #sed -i "s/LINUX_OPTIONS=\"[^\"]*/& ${kernelparams}/" /etc/sdboot-manage.conf +""" +post_remove = """ + echo "Steam deck chwd removing..." + username=$(id -nu 1000) + services=("jupiter-fan-control") + echo "Disabling services..." + for service in ${services[@]}; do + systemctl disable "${service}.service" + done + #kernelparams="amd_iommu=off amdgpu.gttsize=8128 spi_amd.speed_dev=1 audit=0 iomem=relaxed amdgpu.ppfeaturemask=0xffffffff" + #echo "Removing kernel parameters..." + #sed -i "s/${kernelparams}//" /etc/sdboot-manage.conf +""" + +[phoenix-rog-ally] +desc = 'ASUS ROG Ally' +nonfree = false +class_ids = "0300" +vendor_ids = "1002" +device_ids = "15bf" +hwd_product_name_pattern = '(ROG Ally).*' +priority = 6 +packages = 'hhd hhd-ui adjustor jupiter-hw-support steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' +post_install = """ + echo "Ally and Legion chwd installing..." + username=$(id -nu 1000) + services=("hhd@${username}") + maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") + echo "Enabling services..." + for service in ${services[@]}; do + systemctl enable --now "${service}.service" + done + echo "Masking potentially conflicting services" + for mask in ${maskservices[@]}; do + systemctl mask "${mask}.service" + done +""" +post_remove = """ + echo "Ally and Legion chwd removing..." + username=$(id -nu 1000) + services=("hhd@${username}") + maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") + echo "Disabling services..." + for service in ${services[@]}; do + systemctl disable "${service}.service" + done + echo "Unmasking potentially conflicting services" + for mask in ${maskservices[@]}; do + systemctl unmask "${mask}.service" + done +""" + +[phoenix-legion-go] +desc = 'Lenovo Legion Go' +nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "15bf" -hwd_product_name_pattern = '(ROG Ally).*|(83E1)' +hwd_product_name_pattern = '(83E1)' priority = 6 packages = 'hhd hhd-ui adjustor jupiter-hw-support steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' post_install = """ From c8046d040e9220b5f2d9e1839aff6aef81d307b1 Mon Sep 17 00:00:00 2001 From: Nekoh Date: Mon, 17 Jun 2024 23:56:05 -0400 Subject: [PATCH 2/4] Fix echo statements --- profiles/pci/handhelds/profiles.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/profiles/pci/handhelds/profiles.toml b/profiles/pci/handhelds/profiles.toml index cb0e146..b520176 100644 --- a/profiles/pci/handhelds/profiles.toml +++ b/profiles/pci/handhelds/profiles.toml @@ -28,7 +28,7 @@ priority = 6 packages = 'powerbuttond jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' #fbcon=vc:2-6 is not added here because it is added for all devices using calamares. post_install = """ - echo "Steam Deck chwd installing..." + echo "Steam Deck Jupiter chwd installing..." username=$(id -nu 1000) services=("jupiter-fan-control") echo "Enabling services..." @@ -40,7 +40,7 @@ post_install = """ #sed -i "s/LINUX_OPTIONS=\"[^\"]*/& ${kernelparams}/" /etc/sdboot-manage.conf """ post_remove = """ - echo "Steam deck chwd removing..." + echo "Steam deck Jupiter chwd removing..." username=$(id -nu 1000) services=("jupiter-fan-control") echo "Disabling services..." @@ -63,7 +63,7 @@ priority = 6 packages = 'powerbuttond jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' #fbcon=vc:2-6 is not added here because it is added for all devices using calamares. post_install = """ - echo "Steam Deck chwd installing..." + echo "Steam Deck Galileo chwd installing..." username=$(id -nu 1000) services=("jupiter-fan-control") echo "Enabling services..." @@ -75,7 +75,7 @@ post_install = """ #sed -i "s/LINUX_OPTIONS=\"[^\"]*/& ${kernelparams}/" /etc/sdboot-manage.conf """ post_remove = """ - echo "Steam deck chwd removing..." + echo "Steam deck Galileo chwd removing..." username=$(id -nu 1000) services=("jupiter-fan-control") echo "Disabling services..." @@ -97,7 +97,7 @@ hwd_product_name_pattern = '(ROG Ally).*' priority = 6 packages = 'hhd hhd-ui adjustor jupiter-hw-support steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' post_install = """ - echo "Ally and Legion chwd installing..." + echo "Ally chwd installing..." username=$(id -nu 1000) services=("hhd@${username}") maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") @@ -111,7 +111,7 @@ post_install = """ done """ post_remove = """ - echo "Ally and Legion chwd removing..." + echo "Ally chwd removing..." username=$(id -nu 1000) services=("hhd@${username}") maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") @@ -135,7 +135,7 @@ hwd_product_name_pattern = '(83E1)' priority = 6 packages = 'hhd hhd-ui adjustor jupiter-hw-support steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' post_install = """ - echo "Ally and Legion chwd installing..." + echo "Legion go chwd installing..." username=$(id -nu 1000) services=("hhd@${username}") maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") @@ -149,7 +149,7 @@ post_install = """ done """ post_remove = """ - echo "Ally and Legion chwd removing..." + echo "Legion go chwd removing..." username=$(id -nu 1000) services=("hhd@${username}") maskservices=("jupiter-biosupdate" "jupiter-controller-update" "jupiter-fan-control") From 74ef50df8fa7ff7c68b0105161fa8a969aa9b414 Mon Sep 17 00:00:00 2001 From: Nekoh Date: Wed, 21 Aug 2024 15:32:35 -0400 Subject: [PATCH 3/4] Add Ally X in Description --- profiles/pci/handhelds/profiles.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/profiles/pci/handhelds/profiles.toml b/profiles/pci/handhelds/profiles.toml index b520176..442dceb 100644 --- a/profiles/pci/handhelds/profiles.toml +++ b/profiles/pci/handhelds/profiles.toml @@ -26,7 +26,6 @@ device_ids = "1435 163f" hwd_product_name_pattern = '(Jupiter)' priority = 6 packages = 'powerbuttond jupiter-hw-support jupiter-fan-control steamdeck-dsp steam cachyos-handheld mesa lib32-mesa vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau opencl-rusticl-mesa lib32-opencl-rusticl-mesa rocm-opencl-runtime' -#fbcon=vc:2-6 is not added here because it is added for all devices using calamares. post_install = """ echo "Steam Deck Jupiter chwd installing..." username=$(id -nu 1000) @@ -88,7 +87,7 @@ post_remove = """ """ [phoenix-rog-ally] -desc = 'ASUS ROG Ally' +desc = 'ASUS ROG Ally & Ally X' nonfree = false class_ids = "0300" vendor_ids = "1002" From 6828b3dc1bfd7d5029a0f338177acd0cb7737988 Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Sun, 22 Sep 2024 02:35:56 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=9A=A7=20profiles/handhelds:=20remove?= =?UTF-8?q?=20nonfree=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- profiles/pci/handhelds/profiles.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/profiles/pci/handhelds/profiles.toml b/profiles/pci/handhelds/profiles.toml index 442dceb..de82352 100644 --- a/profiles/pci/handhelds/profiles.toml +++ b/profiles/pci/handhelds/profiles.toml @@ -19,7 +19,6 @@ [steam-deck-jupiter] desc = 'Valve Steam Deck LCD' -nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "1435 163f" @@ -53,7 +52,6 @@ post_remove = """ [steam-deck-galileo] desc = 'Valve Steam Deck OLED' -nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "1435 163f" @@ -88,7 +86,6 @@ post_remove = """ [phoenix-rog-ally] desc = 'ASUS ROG Ally & Ally X' -nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "15bf" @@ -126,7 +123,6 @@ post_remove = """ [phoenix-legion-go] desc = 'Lenovo Legion Go' -nonfree = false class_ids = "0300" vendor_ids = "1002" device_ids = "15bf"