From 36ccf34fd84e7d975770ecca345ff7d58a53d11d Mon Sep 17 00:00:00 2001
From: Randall <idgr@tutanota.com>
Date: Sat, 24 Sep 2022 16:41:38 -0400
Subject: [PATCH] Replaced supergfxctl with nvidia-manager

---
 chrootInstall.sh                    | 16 +++++++---------
 programs/supergfxd-openrc/supergfxd | 12 ------------
 2 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 programs/supergfxd-openrc/supergfxd

diff --git a/chrootInstall.sh b/chrootInstall.sh
index ea6c191..aab1e75 100755
--- a/chrootInstall.sh
+++ b/chrootInstall.sh
@@ -145,7 +145,6 @@ if [ "$formfactor" == 1 ]; then
       KEYBOARD_KEY_c00b6=home # Fn+F2
       KEYBOARD_KEY_c00b5=end   # Fn+F4
       KEYBOARD_KEY_ff31007c=f20 # x11 mic-mute' > /etc/udev/hwdb.d/90-zephyrus-kbd.hwdb
-    systemd-hwdb update
     udevadm trigger
     # xbindkeys config
     echo '#ScreenBrightUp
@@ -165,21 +164,20 @@ if [ "$formfactor" == 1 ]; then
         m:0x0 + c:237
         XF86KbdBrightnessDown
     #G14IntegratedGPU
-    "supergfxctl -m integrated; pkill -KILL -u '"$username"'"
+    "/usr/bin/nvidia_off.sh; pkill -KILL -u '"$username"'"
         m:0x0 + c:232
         XF86MonBrightnessDown
     #G14DedicatedGPU
-    "supergfxctl -m dedicated; pkill -KILL -u '"$username"'"
+    "/usr/bin/nvidia_on.sh; pkill -KILL -u '"$username"'"
         m:0x0 + c:233
         XF86MonBrightnessUp' > /home/"$username"/.xbindkeysrc
     curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/bashpower-g14/bashpower.start -o /etc/local.d/bashpower.start
     curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/bashpower-g14/bashpower.stop -o /etc/local.d/bashpower.stop
-    curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/supergfxd-openrc/supergfxd -o /etc/init.d/supergfxd
-    pacman -S supergfxctl mesa vulkan-icd-loader vulkan-radeon libva-mesa-driver libva-utils --needed --noconfirm
-    chmod 755 /etc/local.d/bashpower.start /etc/local.d/bashpower.stop /etc/init.d/supergfxd
-    rc-add supergfxd
-    rc-service supergfxd start
-    supergfxctl -m integrated
+    pacman -S mesa vulkan-icd-loader vulkan-radeon libva-mesa-driver libva-utils --needed --noconfirm
+    curl -L https://github.com/rwinkhart/nvidia-manager/releases/download/v1.0.0/nvidia-manager-1.0.0-1-any.pkg.tar.zst -o nvidia-manager-1.0.0-1-any.pkg.tar.zst
+    pacman -U nvidia-manager-1.0.0-1-any.pkg.tar.zst --noconfirm
+    rm -rf nvidia-manager-1.0.0-1-any.pkg.tar.zst
+    chmod 755 /etc/local.d/bashpower.start /etc/local.d/bashpower.stop
 fi
 
 # ssh configuration
diff --git a/programs/supergfxd-openrc/supergfxd b/programs/supergfxd-openrc/supergfxd
deleted file mode 100644
index 4d6e2e1..0000000
--- a/programs/supergfxd-openrc/supergfxd
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/openrc-run
-
-description="supergfx daemon"
-command="/usr/bin/supergfxd"
-command_background=true
-pidfile="/run/${RC_SVCNAME}.pid"
-supervisor=supervise-daemon
-supervise_daemon_args="-e IS_SUPERGFX_SERVICE=1"
-
-depend() {
-        after logger modules
-}