package: Prevent having interfering tools and configs

Askannz · Sep 22, 2024 · d8c3ba6 · d8c3ba6
1 parent b2693a4
commit d8c3ba6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/optimus_manager/envs.py b/optimus_manager/envs.py
@@ -13,9 +13,7 @@
 USER_CONFIG_COPY_PATH = "%s/config_copy.conf" % TMP_VARS_FOLDER_PATH
 CURRENT_DAEMON_RUN_ID = "%s/daemon_run_id" % TMP_VARS_FOLDER_PATH
 
-
 XORG_CONF_PATH = "/etc/X11/xorg.conf.d/10-optimus-manager.conf"
-
 DEFAULT_CONFIG_PATH = "/usr/share/optimus-manager/optimus-manager.conf"
 USER_CONFIG_PATH = "/etc/optimus-manager/optimus-manager.conf"
 

diff --git a/package/PKGBUILD b/package/PKGBUILD
@@ -8,7 +8,7 @@ license=("MIT")
 url="https://github.com/Askannz/optimus-manager"
 
 epoch=1
-pkgver=r743.2868105.python3.12
+pkgver=r745.b2693a4.python3.12
 pkgrel=1
 arch=("any")
 
@@ -18,7 +18,12 @@ sha1sums=("SKIP")
 
 conflicts=(
 	"bumblebee"
+	"envycontrol"
+	"nvidia-exec"
+	"nvidia-switch"
+	"nvidia-xrun"
 	"optimus-manager"
+	"switcheroo-control"
 )
 
 
@@ -46,6 +51,7 @@ depends=(
 
 
 optdepends=(
+	'gdm-prime: needed if your login screen is gdm'
 	'bbswitch: alternatively switches GPUs by using standard Optimus ACPI calls'
 	'acpi_call: alternatively switches GPUs by brute forcing ACPI calls'
 )

diff --git a/package/optimus-manager.install b/package/optimus-manager.install
@@ -1,7 +1,14 @@
 #! /bin/bash
 
 
-post_install() {
+pre_install () {
+	rm --force \
+		"/etc/X11/xorg.conf" \
+		"/etc/X11/nvidia-xorg.conf.d/"*nvidia*
+}
+
+
+post_install () {
 	systemctl enable "optimus-manager.service"
 }