Merge branch 'fluke/asus_bios_settings' into 'next'

Bugfixes and improvements Closes #48 See merge request asus-linux/asus-nb-ctrl!17
Bugfixes and improvements
2026-01-22 17:33:19 +01:00 · 2021-01-27 01:16:39 +00:00 · 2021-01-27 14:13:02 +13:00 · 2021-01-26 08:08:13 +00:00 · 2021-01-26 21:07:19 +13:00 · 2021-01-10 22:34:45 +13:00
40 changed files with 1751 additions and 538 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

 ## [Unreleased]
+
+# [2.2.1] - 2021-01-27
+### Added
+- Add ROG Zephyrus M15 LED config
+### Changed
+- Bugfixes
+- Fix reboot/restartx status for GFX switching
+- Update readme
+- Change CLI arg tag for fan modes
+- Make dracut include the nvidia modules in initramfs
+
+# [2.2.0] - 2021-01-26
+### Added
+- Dbus command to fetch all supported functions of the laptop. That is, all the
+  functions that asusd supports for the currently running laptop.
+- Bios setting toggles for:
+  + Dedicated gfx toggle (support depends on the laptop)
+  + Bios boot POST sound toggle
+### Changed
+- added config option for dedicated gfx mode on laptops with it to enable
+  switching directly to dedicated using `asusctl graphics -m nvidia`
+
+# [2.1.2] - 2021-01-10
+### Changed
+- Adjust gfx controller to assume that the graphics driver is loaded if the
+  mode is set for nvidia/hybrid
+
+# [2.1.1] - 2021-01-09
+### Changed
+- Updates to dependencies
+
 # [2.1.0] - 2020-10-25
 ### Added
 - Option to turn off AniMe display (@asere)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,9 +8,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"

 [[package]]
 name = "aho-corasick"
-version = "0.7.13"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86"
+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
 dependencies = [
 "memchr",
 ]
@@ -23,15 +23,14 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"

 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"

 [[package]]
 name = "asus-nb"
-version = "2.1.0"
+version = "2.2.1"
 dependencies = [
- "ctrl-gfx",
 "dbus",
 "gumdrop",
 "rog_fan_curve",
@@ -46,10 +45,9 @@ dependencies = [

 [[package]]
 name = "asus-nb-ctrl"
-version = "2.1.0"
+version = "2.2.1"
 dependencies = [
 "asus-nb",
- "ctrl-gfx",
 "env_logger",
 "gumdrop",
 "intel-pstate",
@@ -80,6 +78,26 @@ dependencies = [
 "serde_json",
 ]

+[[package]]
+name = "async-io"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
+dependencies = [
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "libc",
+ "log",
+ "nb-connect",
+ "once_cell",
+ "parking",
+ "polling",
+ "vec-arena",
+ "waker-fn",
+ "winapi",
+]
+
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -99,9 +117,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

 [[package]]
 name = "base64"
-version = "0.12.3"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"

 [[package]]
 name = "bitflags"
@@ -117,9 +135,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "blake2b_simd"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a"
+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
 dependencies = [
 "arrayref",
 "arrayvec",
@@ -134,15 +152,21 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"

 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
+
+[[package]]
+name = "cache-padded"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"

 [[package]]
 name = "cc"
-version = "1.0.60"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"

 [[package]]
 name = "cfg-if"
@@ -151,10 +175,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"

 [[package]]
-name = "chrono"
-version = "0.4.18"
+name = "cfg-if"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d021fddb7bd3e734370acfa4a83f34095571d8570c039f1420d77540f68d5772"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
 "libc",
 "num-integer",
@@ -163,6 +193,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+dependencies = [
+ "cache-padded",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -171,34 +210,24 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

 [[package]]
 name = "crc32fast"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.7.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
 dependencies = [
 "autocfg",
- "cfg-if",
+ "cfg-if 1.0.0",
 "lazy_static",
 ]

-[[package]]
-name = "ctrl-gfx"
-version = "2.1.3"
-dependencies = [
- "log",
- "sysfs-class",
- "zbus",
- "zvariant",
-]
-
 [[package]]
 name = "dbus"
 version = "0.8.4"
@@ -211,13 +240,13 @@ dependencies = [

 [[package]]
 name = "derivative"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
@@ -248,8 +277,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
@@ -273,37 +302,150 @@ checksum = "22deed3a8124cff5fa835713fa105621e43bbdc46690c3a6b68328a012d350d4"
 dependencies = [
 "proc-macro-error",
 "proc-macro2",
- "quote 1.0.7",
+ "quote 1.0.8",
 "rustversion",
- "syn 1.0.42",
+ "syn 1.0.60",
 "synstructure",
 ]

 [[package]]
 name = "fastrand"
-version = "1.3.5"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c85295147490b8fcf2ea3d104080a105a8b2c63f9c319e82c02d8e952388919"
+checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
+dependencies = [
+ "instant",
+]

 [[package]]
 name = "filetime"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e"
+checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
 "libc",
- "redox_syscall",
+ "redox_syscall 0.2.4",
 "winapi",
 ]

 [[package]]
-name = "getrandom"
-version = "0.1.15"
+name = "futures"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
+checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
 dependencies = [
- "cfg-if",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
+
+[[package]]
+name = "futures-lite"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote 1.0.8",
+ "syn 1.0.60",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
+
+[[package]]
+name = "futures-task"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "futures-util"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "proc-macro-hack",
+ "proc-macro-nested",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if 1.0.0",
 "libc",
 "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -324,15 +466,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915ef07c710d84733522461de2a734d4d62a3fd39a4d4f404c2f385ef8618d05"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
 name = "hermit-abi"
-version = "0.1.16"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
 "libc",
 ]
@@ -346,6 +488,15 @@ dependencies = [
 "quick-error",
 ]

+[[package]]
+name = "instant"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "intel-pstate"
 version = "0.2.1"
@@ -358,9 +509,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

 [[package]]
 name = "lazy_static"
@@ -370,9 +521,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.77"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
+checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"

 [[package]]
 name = "libdbus-sys"
@@ -385,9 +536,9 @@ dependencies = [

 [[package]]
 name = "libflate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9bac9023e1db29c084f9f8cd9d3852e5e8fddf98fb47c4964a0ea4663d95949"
+checksum = "389de7875e06476365974da3e7ff85d55f1972188ccd9f6020dd7c8156e17914"
 dependencies = [
 "adler32",
 "crc32fast",
@@ -413,9 +564,9 @@ dependencies = [

 [[package]]
 name = "libusb1-sys"
-version = "0.4.2"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f02e930161703cc97c0aab3a905feb9740db03a80910f31ab0f8fa309223f39"
+checksum = "be241693102a24766d0b8526c8988771edac2842630d7e730f8e9fbc014f3703"
 dependencies = [
 "cc",
 "libc",
@@ -427,11 +578,11 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]

 [[package]]
@@ -457,9 +608,19 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
+
+[[package]]
+name = "nb-connect"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8123a81538e457d44b933a02faf885d3fe8408806b23fa700e8f01c6c3a98998"
+dependencies = [
+ "libc",
+ "winapi",
+]

 [[package]]
 name = "nix"
@@ -469,7 +630,7 @@ checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
 dependencies = [
 "bitflags 1.2.1",
 "cc",
- "cfg-if",
+ "cfg-if 0.1.10",
 "libc",
 "void",
 ]
@@ -486,20 +647,23 @@ dependencies = [

 [[package]]
 name = "notify-rust"
-version = "4.0.0"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "144acee6a0543dc74893e4b8a33936b5b0a94cc2d4ab024afd0c6daff7afc3c0"
+checksum = "95a3a5dd7b4b415b112ce0fae1988f3e6dee90a96918bf3950b5f2289b19a04b"
 dependencies = [
- "dbus",
 "mac-notification-sys",
+ "serde",
 "winrt-notification",
+ "zbus",
+ "zvariant",
+ "zvariant_derive",
 ]

 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
 "autocfg",
 "num-traits",
@@ -507,9 +671,9 @@ dependencies = [

 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
 "autocfg",
 ]
@@ -551,15 +715,46 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+
+[[package]]
+name = "parking"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkg-config"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+
+[[package]]
+name = "polling"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4"
+dependencies = [
+ "cfg-if 0.1.10",
+ "libc",
+ "log",
+ "wepoll-sys",
+ "winapi",
+]

 [[package]]
 name = "proc-macro-crate"
@@ -567,7 +762,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
 dependencies = [
- "toml 0.5.6",
+ "toml 0.5.8",
 ]

 [[package]]
@@ -578,8 +773,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
 "proc-macro-error-attr",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 "version_check",
 ]

@@ -590,15 +785,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
+ "quote 1.0.8",
 "version_check",
 ]

 [[package]]
-name = "proc-macro2"
-version = "1.0.23"
+name = "proc-macro-hack"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51ef7cd2518ead700af67bf9d1a658d90b6037d77110fd9c0445429d0ba1c6c9"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+
+[[package]]
+name = "proc-macro-nested"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
 "unicode-xid 0.2.1",
 ]
@@ -617,9 +824,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"

 [[package]]
 name = "quote"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
+checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
 dependencies = [
 "proc-macro2",
 ]
@@ -630,6 +837,15 @@ version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"

+[[package]]
+name = "redox_syscall"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+dependencies = [
+ "bitflags 1.2.1",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.3.5"
@@ -637,15 +853,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
 dependencies = [
 "getrandom",
- "redox_syscall",
+ "redox_syscall 0.1.57",
 "rust-argon2",
 ]

 [[package]]
 name = "regex"
-version = "1.3.9"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -655,9 +871,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.18"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"

 [[package]]
 name = "rle-decode-fast"
@@ -667,18 +883,18 @@ checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"

 [[package]]
 name = "rog_fan_curve"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da77fe4a6ad41da874d83eca6a32075a5b8f6ad4778682bc1308075e7ef856a9"
+checksum = "c71cfe91a717104796aeefea4e98ce5cefb11f2bb5dd10bba865dd4ae86273cb"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "rusb"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fa037368ee577fca9ef237c5ec129084c18e7e3e5987cc611fb8b2d78cf84a"
+checksum = "f6f32cd45962594f9f8cd4547b5757132715600e2c8840aa9ccd3d1a9ed6fdc6"
 dependencies = [
 "libc",
 "libusb1-sys",
@@ -686,9 +902,9 @@ dependencies = [

 [[package]]
 name = "rust-argon2"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
 dependencies = [
 "base64",
 "blake2b_simd",
@@ -698,14 +914,9 @@ dependencies = [

 [[package]]
 name = "rustversion"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
-dependencies = [
- "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
-]
+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"

 [[package]]
 name = "ryu"
@@ -721,29 +932,29 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"

 [[package]]
 name = "serde"
-version = "1.0.116"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.116"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.57"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c"
+checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
 dependencies = [
 "itoa",
 "ryu",
@@ -757,10 +968,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
+
 [[package]]
 name = "smart-default"
 version = "0.6.0"
@@ -768,8 +985,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
@@ -801,12 +1018,12 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.42"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
+ "quote 1.0.8",
 "unicode-xid 0.2.1",
 ]

@@ -826,8 +1043,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 "unicode-xid 0.2.1",
 ]

@@ -842,32 +1059,31 @@ dependencies = [

 [[package]]
 name = "tar"
-version = "0.4.30"
+version = "0.4.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489997b7557e9a43e192c527face4feacc78bfbe6eed67fd55c4c9e381cba290"
+checksum = "0313546c01d59e29be4f09687bcb4fb6690cec931cc3607b6aec7a0e417f4cc6"
 dependencies = [
 "filetime",
 "libc",
- "redox_syscall",
 "xattr",
 ]

 [[package]]
 name = "termcolor"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
 dependencies = [
 "winapi-util",
 ]

 [[package]]
 name = "thread_local"
-version = "1.0.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "d8208a331e1cb318dd5bd76951d2b8fc48ca38a69f5f4e4af1b6a9f8c6236915"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]

 [[package]]
@@ -901,9 +1117,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
 dependencies = [
 "serde",
 ]
@@ -932,9 +1148,15 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

 [[package]]
 name = "vcpkg"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
+
+[[package]]
+name = "vec-arena"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d"

 [[package]]
 name = "version_check"
@@ -948,6 +1170,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"

+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
 [[package]]
 name = "wasi"
 version = "0.9.0+wasi-snapshot-preview1"
@@ -960,6 +1188,15 @@ version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

+[[package]]
+name = "wepoll-sys"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1042,16 +1279,20 @@ dependencies = [

 [[package]]
 name = "zbus"
-version = "1.2.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f3d015ea4cb76e7f951e429086995126807372f80c9a2a29bf00fcfd31a50b0"
+checksum = "40b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8"
 dependencies = [
+ "async-io",
 "byteorder",
 "derivative",
 "enumflags2",
 "fastrand",
+ "futures",
+ "nb-connect",
 "nix",
 "once_cell",
+ "polling",
 "scoped-tls",
 "serde",
 "serde_repr",
@@ -1061,21 +1302,21 @@ dependencies = [

 [[package]]
 name = "zbus_macros"
-version = "1.2.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54567d486c1ece9268173866c227ac1e168aa5cdf983ae9d13aaf45767fdf679"
+checksum = "87cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]

 [[package]]
 name = "zvariant"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb79b31a454101beda19e64082dfd9ad59c5ff8afa41e1de1065333105b02740"
+checksum = "2fc67d552ac18ccd9e440f062f5b32c46776f96073122a8da2fe0c533833a213"
 dependencies = [
 "byteorder",
 "enumflags2",
@@ -1085,12 +1326,12 @@ dependencies = [

 [[package]]
 name = "zvariant_derive"
-version = "2.2.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605bf414a59d93a3d55055e72ea066c5c0bc578ed2227df15c407207b1c780ef"
+checksum = "eaee686340b5bff077d52423d8cc4f0f7cb323fe3f31ef676b8a3a2810bc53c5"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
- "quote 1.0.7",
- "syn 1.0.42",
+ "quote 1.0.8",
+ "syn 1.0.60",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["asus-notify", "asus-nb-ctrl", "asus-nb", "ctrl-gfx"]
+members = ["asus-notify", "asus-nb-ctrl", "asus-nb"]

 [profile.release]
 lto = true
--- a/90
+++ b/90
@@ -1,36 +1,37 @@
-prefix ?= /usr
-sysconfdir ?= /etc
+VERSION := $(shell grep -Pm1 'version = "(\d.\d.\d)"' asus-nb-ctrl/Cargo.toml | cut -d'"' -f2)
+
+INSTALL = install
+INSTALL_PROGRAM = ${INSTALL} -D -m 0755
+INSTALL_DATA = ${INSTALL} -D -m 0644
+
+prefix = /usr
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
 datarootdir = $(prefix)/share
-datadir = $(datarootdir)
+libdir = $(exec_prefix)/lib
+zshcpl = $(datarootdir)/zsh/site-functions

-SRC = Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.rs')
+BIN_C := asusctl
+BIN_D := asusd
+BIN_N := asus-notify
+LEDCFG := asusd-ledmodes.toml
+X11CFG := 90-nvidia-screen-G05.conf
+PMRULES := 90-asusd-nvidia-pm.rules

-.PHONY: all clean distclean install uninstall update
-
-BIN_C=asusctl
-BIN_D=asusd
-BIN_N=asus-notify
-LEDCFG=asusd-ledmodes.toml
-X11CFG=90-nvidia-screen-G05.conf
-PMRULES=90-asusd-nvidia-pm.rules
-VERSION:=$(shell grep -Pm1 'version = "(\d.\d.\d)"' asus-nb-ctrl/Cargo.toml | cut -d'"' -f2)
+SRC := Cargo.toml Cargo.lock Makefile $(shell find -type f -wholename '**/src/*.rs')

 DEBUG ?= 0
 ifeq ($(DEBUG),0)
-	ARGS += "--release"
+	ARGS += --release
 	TARGET = release
 endif

 VENDORED ?= 0
 ifeq ($(VENDORED),1)
-	ARGS += "--frozen"
+	ARGS += --frozen
 endif

-all: target/release/$(BIN_D)
+all: build

 clean:
 	cargo clean
@@ -38,34 +39,37 @@ clean:
 distclean:
 	rm -rf .cargo vendor vendor.tar.xz

-install: all
-	install -D -m 0755 "target/release/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
-	install -D -m 0755 "target/release/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
-	install -D -m 0755 "target/release/$(BIN_N)" "$(DESTDIR)$(bindir)/$(BIN_N)"
-	install -D -m 0644 "data/$(PMRULES)" "$(DESTDIR)/lib/udev/rules.d/$(PMRULES)"
-	install -D -m 0644 "data/$(BIN_D).rules" "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules"
-	install -D -m 0644 "data/$(LEDCFG)" "$(DESTDIR)$(sysconfdir)/asusd/$(LEDCFG)"
-	install -D -m 0644 "data/$(BIN_D).conf" "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf"
-	install -D -m 0644 "data/$(X11CFG)" "$(DESTDIR)$(sysconfdir)/X11/xorg.conf.d/$(X11CFG)"
-	install -D -m 0644 "data/$(BIN_D).service" "$(DESTDIR)/lib/systemd/system/$(BIN_D).service"
-	install -D -m 0644 "data/$(BIN_N).service" "$(DESTDIR)/lib/systemd/user/$(BIN_N).service"
-	install -D -m 0644 "data/icons/asus_notif_yellow.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_yellow.png"
-	install -D -m 0644 "data/icons/asus_notif_green.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_green.png"
-	install -D -m 0644 "data/icons/asus_notif_red.png" "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_red.png"
-	install -D -m 0644 "data/_asusctl" "$(DESTDIR)/usr/share/zsh/site-functions/_asusctl"
+install:
+	$(INSTALL_PROGRAM) "./target/release/$(BIN_C)" "$(DESTDIR)$(bindir)/$(BIN_C)"
+	$(INSTALL_PROGRAM) "./target/release/$(BIN_D)" "$(DESTDIR)$(bindir)/$(BIN_D)"
+	$(INSTALL_PROGRAM) "./target/release/$(BIN_N)" "$(DESTDIR)$(bindir)/$(BIN_N)"
+	$(INSTALL_DATA) "./data/$(PMRULES)" "$(DESTDIR)$(libdir)/udev/rules.d/$(PMRULES)"
+	$(INSTALL_DATA) "./data/$(BIN_D).rules" "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
+	$(INSTALL_DATA) "./data/$(LEDCFG)" "$(DESTDIR)/etc/asusd/$(LEDCFG)"
+	$(INSTALL_DATA) "./data/$(BIN_D).conf" "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
+	$(INSTALL_DATA) "./data/$(X11CFG)" "$(DESTDIR)$(datarootdir)/X11/xorg.conf.d/$(X11CFG)"
+	$(INSTALL_DATA) "./data/$(BIN_D).service" "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
+	$(INSTALL_DATA) "./data/$(BIN_N).service" "$(DESTDIR)$(libdir)/systemd/user/$(BIN_N).service"
+	$(INSTALL_DATA) "./data/icons/asus_notif_yellow.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png"
+	$(INSTALL_DATA) "./data/icons/asus_notif_green.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
+	$(INSTALL_DATA) "./data/icons/asus_notif_red.png" "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_red.png"
+	$(INSTALL_DATA) "./data/_asusctl" "$(DESTDIR)$(zshcpl)/_asusctl"

 uninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_C)"
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_D)"
 	rm -f "$(DESTDIR)$(bindir)/$(BIN_N)"
-	rm -f "$(DESTDIR)/lib/udev/rules.d/$(PMRULES)"
-	rm -f "$(DESTDIR)/lib/udev/rules.d/99-$(BIN_D).rules"
-	rm -f "$(DESTDIR)$(sysconfdir)/dbus-1/system.d/$(BIN_D).conf"
-	rm -f "$(DESTDIR)$(sysconfdir)/X11/xorg.conf.d/$(X11CFG)"
-	rm -f "$(DESTDIR)/lib/systemd/system/$(BIN_D).service"
-	rm -r "$(DESTDIR)/lib/systemd/user/$(BIN_N).service"
-	rm -r "$(DESTDIR)/usr/share/icons/hicolor/512x512/apps/asus_notif_*"
-	rm -f "$(DESTDIR)/usr/share/zsh/site-functions/_asusctl"
+	rm -f "$(DESTDIR)$(libdir)/udev/rules.d/$(PMRULES)"
+	rm -f "$(DESTDIR)$(libdir)/udev/rules.d/99-$(BIN_D).rules"
+	rm -f "$(DESTDIR)/etc/asusd/$(LEDCFG)"
+	rm -f "$(DESTDIR)$(datarootdir)/dbus-1/system.d/$(BIN_D).conf"
+	rm -f "$(DESTDIR)$(datarootdir)/X11/xorg.conf.d/$(X11CFG)"
+	rm -f "$(DESTDIR)$(libdir)/systemd/system/$(BIN_D).service"
+	rm -r "$(DESTDIR)$(libdir)/systemd/user/$(BIN_N).service"
+	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_yellow.png"
+	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_green.png"
+	rm -r "$(DESTDIR)$(datarootdir)/icons/hicolor/512x512/apps/asus_notif_red.png"
+	rm -f "$(DESTDIR)$(zshcpl)/_asusctl"

 update:
 	cargo update
@@ -79,9 +83,11 @@ vendor:
 	tar pcfJ vendor_asus-nb-ctrl_$(VERSION).tar.xz vendor
 	rm -rf vendor

-target/release/$(BIN_D): $(SRC)
+build:
 ifeq ($(VENDORED),1)
 	@echo "version = $(VERSION)"
 	tar pxf vendor_asus-nb-ctrl_$(VERSION).tar.xz
 endif
 	cargo build $(ARGS)
+
+.PHONY: all clean distclean install uninstall update build
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ but can also be used with non-asus laptops with reduced features.

 This app is developed and tested on fedora only. Support is not provided for Arch or Arch based distros.

+**NOTICE:**
+The following is *not* required for 5.11 kernel versions, as this version includes
+all the required patches.
+---
 This program requires the kernel patch [here](https://www.spinics.net/lists/linux-input/msg68977.html) to be applied.
 Alternatively you may use the dkms module for 'hid-asus-rog` from one of the
 repositories [here](https://download.opensuse.org/repositories/home:/luke_nukem:/asus/).
@@ -25,7 +29,7 @@ in to the kernel.

 ## Discord

-[Discord server link](https://discord.gg/PVyFzWj)
+[Discord server link](https://discord.gg/ngbdKabAnP)

 ## SUPPORTED LAPTOPS

@@ -53,13 +57,17 @@ will probably suffer another rename once it becomes generic enough to do so.
 - [X] Set battery charge limit (with kernel supporting this)
 - [X] Fancy fan control on G14 + G15 thanks to @Yarn1
 - [X] Graphics mode switching between iGPU, dGPU, and On-Demand
+- [X] Toggle bios setting for boot/POST sound
+- [X] Toggle bios setting for "dedicated gfx" mode on supported laptops (g-sync)

 # FUNCTIONS

 ## Graphics switching

 A new feature has been added to enable switching graphics modes. This can be disabled
-in the config with `"manage_gfx": false,`. Please be aware it is a work in progress.
+in the config with `"manage_gfx": false,`. Additionally there is an extra setting
+for laptops capable of g-sync dedicated gfx mode to enable the graphics switching
+to switch on dedicated gfx for "nvidia" mode.

 The CLI option for this does not require root until it asks for it, and provides
 instructions.
@@ -79,7 +87,8 @@ If you have installed the Nvidia driver manually you will require the
 ### fedora and openSUSE

 You *may* need a file `/etc/dracut.conf.d/90-nvidia-dracut-G05.conf` installed
-to stop dracut including the nvidia modules in the ramdisk.
+to stop dracut including the nvidia modules in the ramdisk. This is espeically
+true if you manually installed the nvidia drivers.

 ```
 # filename /etc/dracut.conf.d/90-nvidia-dracut-G05.conf
@@ -133,14 +142,11 @@ To switch Fan/Thermal profiles you need to bind the Fn+F5 key to `asusctl profil

 # BUILDING

-Requirements are:
+Requirements are rust >= 1.40 installed from rustup.io if the distro provided version is too old, and `make`.

- `rustc` + `cargo` + `make`
- `libusb-1.0-0-dev`
- `libdbus-1-dev`
- `llvm`
- `libclang-dev`
- `libudev-dev`
+**Ubuntu*:** `apt install libdbus-1-dev libclang-dev libudev-dev`
+
+**fedora:** `dnf install clang-devel dbus-devel systemd-devel`

 ## Installing

@@ -148,6 +154,8 @@ Packaging and auto-builds are available [here](https://build.opensuse.org/packag

 Download repositories are available [here](https://download.opensuse.org/repositories/home:/luke_nukem:/asus/)

+Alternatively check the releases page for f33 RPM.
+
 ---

 Run `make` then `sudo make install` then reboot.
--- a/asus-nb-ctrl/Cargo.toml
+++ b/asus-nb-ctrl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asus-nb-ctrl"
-version = "2.1.0"
+version = "2.2.1"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -22,7 +22,6 @@ name = "asusd"
 path = "src/daemon.rs"

 [dependencies]
-ctrl-gfx = { path = "../ctrl-gfx" }
 asus-nb = { path = "../asus-nb" }
 rusb = "^0.6.0"
 udev = "^0.4.0"
@@ -32,10 +31,8 @@ gumdrop = "^0.8.0"
 log = "^0.4.8"
 env_logger = "^0.7.1"

-# async
-zbus = "1.2.0"
-zvariant = "2.2.0"
-#tokio = { version = "^0.2.4", features = ["rt-threaded", "sync"] }
+zbus = "^1.8.0"
+zvariant = "^2.4.0"

 # serialisation
 serde = "^1.0"
@@ -49,4 +46,4 @@ rog_fan_curve = { version = "0.1.5", features = ["serde"] }
 # cpu power management
 intel-pstate = "^0.2.1"

-yansi-term = "^0.1"
+yansi-term = "^0.1"
--- a/asus-nb-ctrl/src/config.rs
+++ b/asus-nb-ctrl/src/config.rs
@@ -1,16 +1,51 @@
 use asus_nb::aura_modes::AuraModes;
-use log::{error, warn};
+use log::{error, info, warn};
 use rog_fan_curve::Curve;
 use serde_derive::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 use std::fs::{File, OpenOptions};
 use std::io::{Read, Write};

+use crate::VERSION;
+
 pub static CONFIG_PATH: &str = "/etc/asusd/asusd.conf";

+/// for parsing old v2.1.2 config
+#[derive(Deserialize)]
+struct ConfigV212 {
+    gfx_managed: bool,
+    active_profile: String,
+    toggle_profiles: Vec<String>,
+    // TODO: remove power_profile
+    power_profile: u8,
+    bat_charge_limit: u8,
+    kbd_led_brightness: u8,
+    kbd_backlight_mode: u8,
+    kbd_backlight_modes: Vec<AuraModes>,
+    power_profiles: BTreeMap<String, Profile>,
+}
+
+impl ConfigV212 {
+    fn into_current(self) -> Config {
+        Config {
+            gfx_managed: self.gfx_managed,
+            gfx_nv_mode_is_dedicated: true,
+            active_profile: self.active_profile,
+            toggle_profiles: self.toggle_profiles,
+            power_profile: self.power_profile,
+            bat_charge_limit: self.bat_charge_limit,
+            kbd_led_brightness: self.kbd_led_brightness,
+            kbd_backlight_mode: self.kbd_backlight_mode,
+            kbd_backlight_modes: self.kbd_backlight_modes,
+            power_profiles: self.power_profiles,
+        }
+    }
+}
+
 #[derive(Default, Deserialize, Serialize)]
 pub struct Config {
    pub gfx_managed: bool,
+    pub gfx_nv_mode_is_dedicated: bool,
    pub active_profile: String,
    pub toggle_profiles: Vec<String>,
    // TODO: remove power_profile
@@ -24,7 +59,7 @@ pub struct Config {

 impl Config {
    /// `load` will attempt to read the config, and panic if the dir is missing
-    pub fn load(mut self, supported_led_modes: &[u8]) -> Self {
+    pub fn load(supported_led_modes: &[u8]) -> Self {
        let mut file = OpenOptions::new()
            .read(true)
            .write(true)
@@ -35,23 +70,30 @@ impl Config {
                CONFIG_PATH
            )); // okay to cause panic here
        let mut buf = String::new();
-        if let Ok(l) = file.read_to_string(&mut buf) {
-            if l == 0 {
-                self = Config::create_default(&mut file, &supported_led_modes);
+        if let Ok(read_len) = file.read_to_string(&mut buf) {
+            if read_len == 0 {
+                return Config::create_default(&mut file, &supported_led_modes);
            } else {
-                self = serde_json::from_str(&buf).unwrap_or_else(|_| {
-                    warn!("Could not deserialise {}", CONFIG_PATH);
-                    panic!("Please remove {} then restart asusd", CONFIG_PATH);
-                });
+                if let Ok(data) = serde_json::from_str(&buf) {
+                    return data;
+                } else if let Ok(data) = serde_json::from_str::<ConfigV212>(&buf) {
+                    let config = data.into_current();
+                    config.write();
+                    info!("Updated config version to: {}", VERSION);
+                    return config;
+                }
+                warn!("Could not deserialise {}", CONFIG_PATH);
+                panic!("Please remove {} then restart asusd", CONFIG_PATH);
            }
        }
-        self
+        Config::create_default(&mut file, &supported_led_modes)
    }

    fn create_default(file: &mut File, supported_led_modes: &[u8]) -> Self {
        // create a default config here
        let mut config = Config::default();
        config.gfx_managed = true;
+        config.gfx_nv_mode_is_dedicated = true;

        config.bat_charge_limit = 100;
        config.kbd_backlight_mode = 0;
--- a/asus-nb-ctrl/src/ctrl_anime.rs
+++ b/asus-nb-ctrl/src/ctrl_anime.rs
@@ -6,12 +6,12 @@ const DEV_PAGE: u8 = 0x5e;
 // These bytes are in [1] position of the array
 const WRITE: u8 = 0xc0;
 const INIT: u8 = 0xc2;
-const APPLY: u8 = 0xc3;
-const SET: u8 = 0xc4;
+const SET: u8 = 0xc3;
+const APPLY: u8 = 0xc4;

 // Used to turn the panel on and off
 // The next byte can be 0x03 for "on" and 0x00 for "off"
-const ON_OFF : u8 = 0x04;
+const ON_OFF: u8 = 0x04;

 use asus_nb::error::AuraError;
 use log::{error, info, warn};
@@ -21,11 +21,25 @@ use std::error::Error;
 use std::time::Duration;
 use zbus::dbus_interface;

+use crate::GetSupported;
+
+use serde_derive::{Deserialize, Serialize};
+#[derive(Serialize, Deserialize)]
+pub struct AnimeSupportedFunctions(bool);
+
+impl GetSupported for CtrlAnimeDisplay {
+    type A = AnimeSupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        AnimeSupportedFunctions(CtrlAnimeDisplay::get_device(0x0b05, 0x193b).is_ok())
+    }
+}
+
 #[allow(dead_code)]
 #[derive(Debug)]
 pub enum AnimatrixCommand {
    Apply,
-    Set,
+    SetBoot(bool),
    Write(Vec<u8>),
    WriteImage(Vec<Vec<u8>>),
    //ReloadLast,
@@ -41,6 +55,8 @@ pub trait Dbus {
    fn set_anime(&mut self, input: Vec<Vec<u8>>);

    fn set_on_off(&mut self, status: bool);
+
+    fn set_boot_on_off(&mut self, status: bool);
 }

 impl crate::ZbusAdd for CtrlAnimeDisplay {
@@ -59,27 +75,39 @@ impl crate::ZbusAdd for CtrlAnimeDisplay {
 impl Dbus for CtrlAnimeDisplay {
    fn set_anime(&mut self, input: Vec<Vec<u8>>) {
        self.do_command(AnimatrixCommand::WriteImage(input))
-            .unwrap_or_else(|err| warn!("{}", err));
+            .map_or_else(|err| warn!("{}", err), |()| info!("Writing image to Anime"));
    }

    fn set_on_off(&mut self, status: bool) {
-        let mut activity : Vec<u8> = vec![0; PACKET_SIZE];
-        activity[0] = DEV_PAGE;
-        activity[1] = WRITE;
-        activity[2] = ON_OFF;
+        let mut flush: Vec<u8> = vec![0; PACKET_SIZE];
+        flush[0] = DEV_PAGE;
+        flush[1] = WRITE;
+        flush[2] = ON_OFF;

        let status_str;
        if status {
-            activity[3] = 0x03;
+            flush[3] = 0x03;
            status_str = "on";
        } else {
-            activity[3] = 0x00;
+            flush[3] = 0x00;
            status_str = "off";
        }
-        info!("Turning {} the AniMe", status_str);

-        self.do_command(AnimatrixCommand::Write(activity))
-            .unwrap_or_else(|err| warn!("{}", err));
+        self.do_command(AnimatrixCommand::Write(flush)).map_or_else(
+            |err| warn!("{}", err),
+            |()| info!("Turning {} the AniMe", status_str),
+        );
+    }
+
+    fn set_boot_on_off(&mut self, status: bool) {
+        let status_str = if status { "on" } else { "off" };
+
+        self.do_command(AnimatrixCommand::SetBoot(status))
+            .and_then(|()| self.do_command(AnimatrixCommand::Apply))
+            .map_or_else(
+                |err| warn!("{}", err),
+                |()| info!("Turning {} the AniMe at boot/shutdown", status_str),
+            );
    }
 }

@@ -127,7 +155,8 @@ impl CtrlAnimeDisplay {

        match command {
            AnimatrixCommand::Apply => self.do_apply()?,
-            AnimatrixCommand::Set => self.do_set()?,
+            //AnimatrixCommand::Set => self.do_set_boot()?,
+            AnimatrixCommand::SetBoot(status) => self.do_set_boot(status)?,
            AnimatrixCommand::Write(bytes) => self.write_bytes(&bytes)?,
            AnimatrixCommand::WriteImage(effect) => self.write_image(effect)?,
            //AnimatrixCommand::ReloadLast => self.reload_last_builtin(&config).await?,
@@ -212,12 +241,12 @@ impl CtrlAnimeDisplay {
    }

    #[inline]
-    fn do_set(&mut self) -> Result<(), AuraError> {
+    fn do_set_boot(&mut self, status: bool) -> Result<(), AuraError> {
        let mut flush = [0; PACKET_SIZE];
        flush[0] = DEV_PAGE;
        flush[1] = SET;
        flush[2] = 0x01;
-        flush[3] = 0x80;
+        flush[3] = if status { 0x00 } else { 0x80 };

        self.write_bytes(&flush)?;
        Ok(())
--- a/asus-nb-ctrl/src/ctrl_charge.rs
+++ b/asus-nb-ctrl/src/ctrl_charge.rs
@@ -1,6 +1,7 @@
-use crate::{config::Config, error::RogError};
+use crate::{config::Config, error::RogError, GetSupported};
 //use crate::dbus::DbusEvents;
 use log::{info, warn};
+use serde_derive::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::fs::OpenOptions;
 use std::io::Write;
@@ -11,8 +12,22 @@ use zbus::dbus_interface;

 static BAT_CHARGE_PATH: &str = "/sys/class/power_supply/BAT0/charge_control_end_threshold";

+#[derive(Serialize, Deserialize)]
+pub struct ChargeSupportedFunctions {
+    pub charge_level_set: bool,
+}
+
+impl GetSupported for CtrlCharge {
+    type A = ChargeSupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        ChargeSupportedFunctions {
+            charge_level_set: CtrlCharge::get_battery_path().is_ok(),
+        }
+    }
+}
+
 pub struct CtrlCharge {
-    path: &'static str,
    config: Arc<Mutex<Config>>,
 }

@@ -43,7 +58,7 @@ impl CtrlCharge {
    }

    #[dbus_interface(signal)]
-    pub fn notify_charge(&self, limit: u8) -> zbus::Result<()>;
+    pub fn notify_charge(&self, limit: u8) -> zbus::Result<()> {}
 }

 impl crate::ZbusAdd for CtrlCharge {
@@ -62,7 +77,6 @@ impl crate::Reloadable for CtrlCharge {
    fn reload(&mut self) -> Result<(), RogError> {
        if let Ok(mut config) = self.config.try_lock() {
            config.read();
-            info!("Reloaded battery charge limit");
            self.set(config.bat_charge_limit, &mut config)?;
        }
        Ok(())
@@ -71,9 +85,8 @@ impl crate::Reloadable for CtrlCharge {

 impl CtrlCharge {
    pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
-        let path = CtrlCharge::get_battery_path()?;
-        info!("Device has battery charge threshold control");
-        Ok(CtrlCharge { path, config })
+        CtrlCharge::get_battery_path()?;
+        Ok(CtrlCharge { config })
    }

    fn get_battery_path() -> Result<&'static str, RogError> {
@@ -81,7 +94,8 @@ impl CtrlCharge {
            Ok(BAT_CHARGE_PATH)
        } else {
            Err(RogError::MissingFunction(
-                "Charge control not available".into(),
+                "Charge control not available, you may require a v5.8.10 series kernel or newer"
+                    .into(),
            ))
        }
    }
@@ -96,10 +110,10 @@ impl CtrlCharge {

        let mut file = OpenOptions::new()
            .write(true)
-            .open(self.path)
-            .map_err(|err| RogError::Path(self.path.into(), err))?;
+            .open(BAT_CHARGE_PATH)
+            .map_err(|err| RogError::Path(BAT_CHARGE_PATH.into(), err))?;
        file.write_all(limit.to_string().as_bytes())
-            .map_err(|err| RogError::Write(self.path.into(), err))?;
+            .map_err(|err| RogError::Write(BAT_CHARGE_PATH.into(), err))?;
        info!("Battery charge limit: {}", limit);

        config.read();
--- a/asus-nb-ctrl/src/ctrl_fan_cpu.rs
+++ b/asus-nb-ctrl/src/ctrl_fan_cpu.rs
@@ -1,6 +1,10 @@
-use crate::config::{Config, Profile};
+use crate::{
+    config::{Config, Profile},
+    GetSupported,
+};
 use asus_nb::profile::ProfileEvent;
 use log::{info, warn};
+use serde_derive::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
@@ -19,6 +23,25 @@ pub struct CtrlFanAndCPU {
    config: Arc<Mutex<Config>>,
 }

+#[derive(Serialize, Deserialize)]
+pub struct FanCpuSupportedFunctions {
+    pub stock_fan_modes: bool,
+    pub min_max_freq: bool,
+    pub fan_curve_set: bool,
+}
+
+impl GetSupported for CtrlFanAndCPU {
+    type A = FanCpuSupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        FanCpuSupportedFunctions {
+            stock_fan_modes: CtrlFanAndCPU::get_fan_path().is_ok(),
+            min_max_freq: intel_pstate::PState::new().is_ok(),
+            fan_curve_set: rog_fan_curve::Board::from_board_name().is_some(),
+        }
+    }
+}
+
 pub struct DbusFanAndCpu {
    inner: Arc<Mutex<CtrlFanAndCPU>>,
 }
@@ -55,7 +78,7 @@ impl DbusFanAndCpu {
                if let Some(profile) = cfg.power_profiles.get(&cfg.active_profile) {
                    if let Ok(json) = serde_json::to_string(profile) {
                        self.notify_profile(&json)
-                        .unwrap_or_else(|err| warn!("{}", err));
+                            .unwrap_or_else(|err| warn!("{}", err));
                    }
                }
            }
@@ -101,7 +124,7 @@ impl DbusFanAndCpu {
    }

    #[dbus_interface(signal)]
-    fn notify_profile(&self, profile: &str) -> zbus::Result<()>;
+    fn notify_profile(&self, profile: &str) -> zbus::Result<()> {}
 }

 impl crate::ZbusAdd for DbusFanAndCpu {
@@ -109,7 +132,7 @@ impl crate::ZbusAdd for DbusFanAndCpu {
        server
            .at(&"/org/asuslinux/Profile".try_into().unwrap(), self)
            .map_err(|err| {
-                warn!("DbusFanAndCpu: {}", err);
+                warn!("DbusFanAndCpu: add_to_server {}", err);
                err
            })
            .ok();
@@ -192,7 +215,7 @@ impl CtrlFanAndCPU {
            Ok(FAN_TYPE_2_PATH)
        } else {
            Err(RogError::MissingFunction(
-                "Fan mode not available, you may require a v5.8 series kernel or newer".into(),
+                "Fan mode not available, you may require a v5.8.10 series kernel or newer".into(),
            ))
        }
    }
--- a/asus-nb-ctrl/src/ctrl_gfx/error.rs
+++ b/asus-nb-ctrl/src/ctrl_gfx/error.rs
@@ -1,6 +1,8 @@
 use std::error;
 use std::fmt;

+use crate::error::RogError;
+
 #[derive(Debug)]
 pub enum GfxError {
    ParseVendor,
@@ -28,3 +30,9 @@ impl fmt::Display for GfxError {
 }

 impl error::Error for GfxError {}
+
+impl From<GfxError> for RogError {
+    fn from(err: GfxError) -> Self {
+        RogError::GfxSwitching(err)
+    }
+}
--- a/asus-nb-ctrl/src/ctrl_gfx/gfx.rs
+++ b/asus-nb-ctrl/src/ctrl_gfx/gfx.rs
@@ -1,16 +1,19 @@
+use ctrl_gfx::error::GfxError;
+use ctrl_gfx::*;
+use ctrl_rog_bios::CtrlRogBios;
 use log::{error, info, warn};
-use std::error::Error;
 use std::io::Write;
 use std::iter::FromIterator;
 use std::path::Path;
 use std::process::Command;
 use std::str::FromStr;
+use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
+use system::{GraphicsDevice, Module, PciBus};
+use vendors::{GfxCtrlAction, GfxVendors};
 use zbus::dbus_interface;

-use crate::vendors::*;
 use crate::*;
-use crate::{error::GfxError, system::*};

 pub struct CtrlGraphics {
    bus: PciBus,
@@ -20,6 +23,7 @@ pub struct CtrlGraphics {
    #[allow(dead_code)]
    other: Vec<GraphicsDevice>,
    initfs_cmd: Option<Command>,
+    config: Arc<Mutex<Config>>,
 }

 trait Dbus {
@@ -30,10 +34,8 @@ trait Dbus {
    fn notify_action(&self, action: &str) -> zbus::Result<()>;
 }

-#[cfg(feature = "use-zbus")]
 use std::convert::TryInto;

-#[cfg(feature = "use-zbus")]
 #[dbus_interface(name = "org.asuslinux.Daemon")]
 impl Dbus for CtrlGraphics {
    fn vendor(&self) -> String {
@@ -58,14 +60,39 @@ impl Dbus for CtrlGraphics {
    }

    #[dbus_interface(signal)]
-    fn notify_gfx(&self, vendor: &str) -> zbus::Result<()>;
+    fn notify_gfx(&self, vendor: &str) -> zbus::Result<()> {}

    #[dbus_interface(signal)]
-    fn notify_action(&self, action: &str) -> zbus::Result<()>;
+    fn notify_action(&self, action: &str) -> zbus::Result<()> {}
+}
+
+impl ZbusAdd for CtrlGraphics {
+    fn add_to_server(self, server: &mut zbus::ObjectServer) {
+        server
+            .at(
+                &"/org/asuslinux/Gfx"
+                    .try_into()
+                    .expect("Couldn't add to zbus"),
+                self,
+            )
+            .map_err(|err| {
+                warn!("CtrlGraphics: add_to_server {}", err);
+                err
+            })
+            .ok();
+    }
+}
+
+impl Reloadable for CtrlGraphics {
+    fn reload(&mut self) -> Result<(), RogError> {
+        self.auto_power()?;
+        info!("Reloaded gfx mode: {:?}", CtrlGraphics::get_vendor()?);
+        Ok(())
+    }
 }

 impl CtrlGraphics {
-    pub fn new() -> std::io::Result<CtrlGraphics> {
+    pub fn new(config: Arc<Mutex<Config>>) -> std::io::Result<CtrlGraphics> {
        let bus = PciBus::new()?;

        info!("Rescanning PCI bus");
@@ -123,13 +150,12 @@ impl CtrlGraphics {
            cmd.arg("-u");
            initfs_cmd = Some(cmd);
            info!("Using initramfs update command 'update-initramfs'");
+        } else if Path::new(DRACUT_PATH).exists() {
+            let mut cmd = Command::new("dracut");
+            cmd.arg("-f");
+            initfs_cmd = Some(cmd);
+            info!("Using initramfs update command 'dracut'");
        }
-        // } else if Path::new(DRACUT_PATH).exists() {
-        //     let mut cmd = Command::new("dracut");
-        //     cmd.arg("-f");
-        //     initfs_cmd = Some(cmd);
-        //     info!("Using initramfs update command 'dracut'");
-        // }

        Ok(CtrlGraphics {
            bus,
@@ -138,31 +164,11 @@ impl CtrlGraphics {
            nvidia,
            other,
            initfs_cmd,
+            config,
        })
    }

-    #[cfg(feature = "use-zbus")]
-    pub fn add_to_server(self, server: &mut zbus::ObjectServer) {
-        server
-            .at(&"/org/asuslinux/Gfx".try_into().unwrap(), self)
-            .map_err(|err| {
-                warn!("CtrlGraphics: add_to_server {}", err);
-                err
-            })
-            .ok();
-    }
-
-    pub fn reload(&mut self) -> Result<(), Box<dyn Error>> {
-        self.auto_power()?;
-        info!("Reloaded gfx mode: {:?}", CtrlGraphics::get_vendor()?);
-        Ok(())
-    }
-
-    // fn can_switch(&self) -> bool {
-    //     !self.nvidia.is_empty() && (!self.intel.is_empty() || !self.amd.is_empty())
-    // }
-
-    fn get_prime_discrete() -> Result<String, GfxError> {
+    fn get_prime_discrete() -> Result<String, RogError> {
        let s = std::fs::read_to_string(PRIME_DISCRETE_PATH)
            .map_err(|err| GfxError::Read(PRIME_DISCRETE_PATH.into(), err))?
            .trim()
@@ -170,51 +176,75 @@ impl CtrlGraphics {
        Ok(s)
    }

-    fn set_prime_discrete(mode: &str) -> Result<(), GfxError> {
+    fn set_prime_discrete(mode: &str) -> Result<(), RogError> {
        std::fs::write(PRIME_DISCRETE_PATH, mode)
            .map_err(|err| GfxError::Read(PRIME_DISCRETE_PATH.into(), err))?;
        Ok(())
    }

    /// Associated method to get which vendor mode is set
-    pub fn get_vendor() -> Result<String, GfxError> {
+    pub fn get_vendor() -> Result<String, RogError> {
+        let mode = match Self::get_prime_discrete() {
+            Ok(m) => m,
+            Err(_) => "nvidia".to_string(),
+        };
        let modules = Module::all().map_err(|err| GfxError::Read("get_vendor".into(), err))?;
-        let vendor = if modules
+
+        let driver_loaded = if modules
            .iter()
            .any(|module| module.name == "nouveau" || module.name == "nvidia")
        {
-            info!("nvidia or nouveau module found");
-            let mode = match Self::get_prime_discrete() {
-                Ok(m) => m,
-                Err(_) => "nvidia".to_string(),
-            };
+            true
+        } else {
+            false
+        };

+        let vendor = if mode == "off" {
+            if driver_loaded {
+                info!("dGPU driver loaded for compute mode");
+                "compute".to_string()
+            } else {
+                info!("No dGPU driver loaded");
+                "integrated".to_string()
+            }
+        } else {
+            info!("Assuming dGPU driver loaded");
            if mode == "on-demand" {
                "hybrid".to_string()
-            } else if mode == "off" {
-                "compute".to_string()
            } else {
                "nvidia".to_string()
            }
-        } else {
-            info!("No dGPU driver (nouveau or nvidia) loaded");
-            "integrated".to_string()
        };

        Ok(vendor)
    }

-    pub fn is_switching_prime_modes(vendor: &GfxVendors) -> Result<bool, GfxError> {
+    fn is_switching_prime_modes(&self, vendor: &GfxVendors) -> Result<bool, RogError> {
        let prev_mode = GfxVendors::from_str(&Self::get_vendor()?)?;
-        let x = (prev_mode == GfxVendors::Hybrid || prev_mode == GfxVendors::Nvidia)
-            && (*vendor == GfxVendors::Hybrid || *vendor == GfxVendors::Nvidia);
-        Ok(x)
+        if prev_mode == GfxVendors::Integrated
+            && (*vendor == GfxVendors::Hybrid || *vendor == GfxVendors::Nvidia)
+        {
+            return Ok(true);
+        }
+        if (prev_mode == GfxVendors::Hybrid || prev_mode == GfxVendors::Nvidia)
+            && *vendor == GfxVendors::Integrated
+        {
+            return Ok(true);
+        }
+        if let Ok(config) = self.config.clone().try_lock() {
+            if CtrlRogBios::has_dedicated_gfx_toggle() && config.gfx_nv_mode_is_dedicated {
+                if prev_mode == GfxVendors::Hybrid && *vendor == GfxVendors::Nvidia {
+                    return Ok(true);
+                }
+                if *vendor == GfxVendors::Hybrid && prev_mode == GfxVendors::Nvidia {
+                    return Ok(true);
+                }
+            }
+        }
+        Ok(false)
    }

-    /// Write out config files if required, enable/disable relevant services, and update the ramdisk
-    pub fn set(&mut self, vendor: GfxVendors) -> Result<String, GfxError> {
-        //self.switchable_or_fail()?;
-
+    pub fn set_gfx_config(vendor: GfxVendors) -> Result<(), RogError> {
        let mode = if vendor == GfxVendors::Hybrid {
            "on-demand\n"
        } else if vendor == GfxVendors::Nvidia {
@@ -227,10 +257,6 @@ impl CtrlGraphics {
        info!("Setting {} to {}", PRIME_DISCRETE_PATH, mode);
        Self::set_prime_discrete(mode)?;

-        // Switching from hybrid to/from nvidia shouldn't require a ramdisk update
-        // or a reboot.
-        let no_reboot = Self::is_switching_prime_modes(&vendor)?;
-
        {
            info!("Writing {}", MODPROBE_PATH);

@@ -298,43 +324,69 @@ impl CtrlGraphics {
                status
            );
        }
+        Ok(())
+    }
+
+    /// Write out config files if required, enable/disable relevant services, and update the ramdisk
+    fn set(&mut self, vendor: GfxVendors) -> Result<String, RogError> {
+        // Switching from hybrid to/from nvidia shouldn't require a ramdisk update
+        // or a reboot.
+        let reboot = self.is_switching_prime_modes(&vendor)?;
+
+        if CtrlRogBios::has_dedicated_gfx_toggle() {
+            if let Ok(config) = self.config.clone().try_lock() {
+                // Switch to dedicated if config says to do so
+                if config.gfx_nv_mode_is_dedicated && vendor == GfxVendors::Nvidia {
+                    CtrlRogBios::set_gfx_mode(true)
+                        .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                } else if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
+                    // otherwise if switching to non-Nvidia mode turn off dedicated mode
+                    if ded == 1 && vendor != GfxVendors::Nvidia {
+                        CtrlRogBios::set_gfx_mode(false)
+                            .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                    }
+                }
+            }
+        }
+
+        Self::set_gfx_config(vendor.clone())?;

        let mut required_action = GfxCtrlAction::None;
-        if !no_reboot {
+        if reboot {
            info!("Updating initramfs");
            if let Some(cmd) = self.initfs_cmd.as_mut() {
+                // If switching to Nvidia dedicated we need these modules included
+                if Path::new(DRACUT_PATH).exists() && vendor == GfxVendors::Nvidia {
+                    cmd.arg("--add-drivers");
+                    cmd.arg("nvidia nvidia-drm nvidia-modeset nvidia-uvm");
+                    info!("System uses dracut, forcing nvidia modules to be included in init");
+                }
+
                let status = cmd
                    .status()
                    .map_err(|err| GfxError::Write(format!("{:?}", cmd), err))?;
                if !status.success() {
                    error!("Ram disk update failed");
+                    return Ok("Ram disk update failed".into());
                } else {
                    info!("Successfully updated iniramfs");
                }
            }
            required_action = GfxCtrlAction::Reboot;
-        } else if no_reboot {
+        } else if !reboot {
            required_action = GfxCtrlAction::RestartX;
        }

        Ok(required_action.into())
    }

-    // pub fn get_power(&self) -> Option<bool> {
-    //     if self.can_switch() {
-    //         return Some(self.nvidia.iter().any(GraphicsDevice::exists));
-    //     }
-    //     None
-    // }
-    pub fn get_runtime_status() -> Result<String, GfxError> {
+    fn get_runtime_status() -> Result<String, RogError> {
        const PATH: &str = "/sys/bus/pci/devices/0000:01:00.0/power/runtime_status";
        let buf = std::fs::read_to_string(PATH).map_err(|err| GfxError::Read(PATH.into(), err))?;
        Ok(buf)
    }

-    fn set_power(&self, power: bool) -> Result<(), GfxError> {
-        // self.switchable_or_fail()?;
-
+    fn set_power(&self, power: bool) -> Result<(), RogError> {
        if power {
            info!("Enabling graphics power");
            self.bus
@@ -356,7 +408,7 @@ impl CtrlGraphics {
        Ok(())
    }

-    fn auto_power(&self) -> Result<(), GfxError> {
+    fn auto_power(&self) -> Result<(), RogError> {
        let vendor = CtrlGraphics::get_vendor()?;
        self.set_power(vendor != "integrated")
    }
--- a/asus-nb-ctrl/src/ctrl_gfx/mod.rs
+++ b/asus-nb-ctrl/src/ctrl_gfx/mod.rs
@@ -2,14 +2,14 @@ pub mod vendors;

 pub mod error;

-pub mod ctrl_gfx;
+pub mod gfx;

 pub mod system;

 const PRIME_DISCRETE_PATH: &str = "/etc/prime-discrete";
 const MODPROBE_PATH: &str = "/etc/modprobe.d/asusd.conf";
 const INITRAMFS_PATH: &str = "/usr/sbin/update-initramfs";
-// const DRACUT_PATH: &str = "/usr/bin/dracut";
+const DRACUT_PATH: &str = "/usr/bin/dracut";

 static MODPROBE_NVIDIA: &[u8] = MODPROBE_HYBRID;

@@ -55,4 +55,3 @@ static PRIMARY_GPU_NVIDIA: &[u8] = br#"

 static PRIMARY_GPU_END: &[u8] = br#"
 EndSection"#;
-
--- a/asus-nb-ctrl/src/ctrl_gfx/system.rs
+++ b/asus-nb-ctrl/src/ctrl_gfx/system.rs
--- a/asus-nb-ctrl/src/ctrl_gfx/vendors.rs
+++ b/asus-nb-ctrl/src/ctrl_gfx/vendors.rs
@@ -6,9 +6,10 @@ pub enum GfxVendors {
    Hybrid,
 }

-use crate::error::GfxError;
 use std::str::FromStr;

+use super::error::GfxError;
+
 impl FromStr for GfxVendors {
    type Err = GfxError;

--- a/asus-nb-ctrl/src/ctrl_leds.rs
+++ b/asus-nb-ctrl/src/ctrl_leds.rs
@@ -2,16 +2,65 @@
 static LED_APPLY: [u8; 17] = [0x5d, 0xb4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 static LED_SET: [u8; 17] = [0x5d, 0xb5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];

-use crate::{config::Config, error::RogError, laptops::HELP_ADDRESS};
-use asus_nb::{aura_brightness_bytes, aura_modes::AuraModes, fancy::KeyColourArray, LED_MSG_LEN};
-use log::{info, warn};
-use std::convert::TryInto;
+static KBD_BRIGHT_PATH: &str = "/sys/class/leds/asus::kbd_backlight/brightness";
+
+use crate::{
+    config::Config,
+    error::RogError,
+    laptops::{match_laptop, HELP_ADDRESS},
+};
+use asus_nb::{
+    aura_brightness_bytes,
+    aura_modes::{AuraModes, PER_KEY},
+    fancy::KeyColourArray,
+    LED_MSG_LEN,
+};
+use log::{error, info, warn};
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
 use std::sync::Arc;
 use std::sync::Mutex;
+use std::{convert::TryInto, path::Path};
 use zbus::dbus_interface;

+use crate::GetSupported;
+
+use serde_derive::{Deserialize, Serialize};
+#[derive(Serialize, Deserialize)]
+pub struct LedSupportedFunctions {
+    pub brightness_set: bool,
+    pub stock_led_modes: Option<Vec<u8>>,
+    pub per_key_led_mode: bool,
+}
+
+impl GetSupported for CtrlKbdBacklight {
+    type A = LedSupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        // let mode = <&str>::from(&<AuraModes>::from(*mode));
+        let mut stock_led_modes = None;
+        let mut per_key_led_mode = false;
+        if let Some(laptop) = match_laptop() {
+            let modes = laptop.supported_modes().to_vec();
+            if modes.contains(&PER_KEY) {
+                per_key_led_mode = true;
+                let modes = modes
+                    .iter()
+                    .filter(|x| **x != PER_KEY)
+                    .map(|x| *x)
+                    .collect();
+                stock_led_modes = Some(modes);
+            }
+        }
+
+        LedSupportedFunctions {
+            brightness_set: CtrlKbdBacklight::get_kbd_bright_path().is_ok(),
+            stock_led_modes,
+            per_key_led_mode,
+        }
+    }
+}
+
 pub struct CtrlKbdBacklight {
    led_node: Option<String>,
    #[allow(dead_code)]
@@ -42,6 +91,9 @@ impl crate::ZbusAdd for DbusKbdBacklight {
    fn add_to_server(self, server: &mut zbus::ObjectServer) {
        server
            .at(&"/org/asuslinux/Led".try_into().unwrap(), self)
+            .map_err(|err| {
+                error!("DbusKbdBacklight: add_to_server {}", err);
+            })
            .ok();
    }
 }
@@ -76,7 +128,14 @@ impl DbusKbdBacklight {
        if let Ok(mut ctrl) = self.inner.try_lock() {
            if let Ok(mut cfg) = ctrl.config.clone().try_lock() {
                ctrl.toggle_mode(false, &mut cfg)
-                .unwrap_or_else(|err| warn!("{}", err));
+                    .unwrap_or_else(|err| warn!("{}", err));
+
+                if let Some(mode) = cfg.get_led_mode_data(cfg.kbd_backlight_mode) {
+                    if let Ok(json) = serde_json::to_string(&mode) {
+                        self.notify_led(&json)
+                            .unwrap_or_else(|err| warn!("{}", err));
+                    }
+                }
            }
        }
    }
@@ -85,7 +144,14 @@ impl DbusKbdBacklight {
        if let Ok(mut ctrl) = self.inner.try_lock() {
            if let Ok(mut cfg) = ctrl.config.clone().try_lock() {
                ctrl.toggle_mode(true, &mut cfg)
-                .unwrap_or_else(|err| warn!("{}", err));
+                    .unwrap_or_else(|err| warn!("{}", err));
+
+                if let Some(mode) = cfg.get_led_mode_data(cfg.kbd_backlight_mode) {
+                    if let Ok(json) = serde_json::to_string(&mode) {
+                        self.notify_led(&json)
+                            .unwrap_or_else(|err| warn!("{}", err));
+                    }
+                }
            }
        }
    }
@@ -213,16 +279,37 @@ impl CtrlKbdBacklight {
        condev_iface: Option<&String>,
        supported_modes: Vec<u8>,
        config: Arc<Mutex<Config>>,
-    ) -> Self {
+    ) -> Result<Self, RogError> {
        // TODO: return error if *all* nodes are None
-        CtrlKbdBacklight {
-            led_node: Self::get_node_failover(id_product, None, Self::scan_led_node).ok(),
-            kbd_node: Self::get_node_failover(id_product, condev_iface, Self::scan_kbd_node).ok(),
+        let ctrl = CtrlKbdBacklight {
+            // Using `ok` here so we can continue without keyboard features but
+            // still get brightness control at least... maybe...
+            led_node: Some(Self::get_node_failover(
+                id_product,
+                None,
+                Self::scan_led_node,
+            )?),
+            kbd_node: Some(Self::get_node_failover(
+                id_product,
+                condev_iface,
+                Self::scan_kbd_node,
+            )?),
            // TODO: Check for existance
-            bright_node: "/sys/class/leds/asus::kbd_backlight/brightness".to_string(),
+            bright_node: Self::get_kbd_bright_path()?.to_owned(),
            supported_modes,
            flip_effect_write: false,
            config,
+        };
+        Ok(ctrl)
+    }
+
+    fn get_kbd_bright_path() -> Result<&'static str, RogError> {
+        if Path::new(KBD_BRIGHT_PATH).exists() {
+            Ok(KBD_BRIGHT_PATH)
+        } else {
+            Err(RogError::MissingFunction(
+                "Keyboard features missing, you may require a v5.11 series kernel or newer".into(),
+            ))
        }
    }

@@ -231,6 +318,8 @@ impl CtrlKbdBacklight {
        iface: Option<&String>,
        fun: fn(&str, Option<&String>) -> Result<String, RogError>,
    ) -> Result<String, RogError> {
+        // We do three tries here just to be certain that we avoid systemd unit
+        // load order issues
        for n in 0..=2 {
            // 0,1,2 inclusive
            match fun(id_product, iface) {
@@ -404,7 +493,6 @@ impl CtrlKbdBacklight {
    fn toggle_mode(&mut self, reverse: bool, config: &mut Config) -> Result<(), RogError> {
        let current = config.kbd_backlight_mode;
        if let Some(idx) = self.supported_modes.iter().position(|v| *v == current) {
-
            let mut idx = idx;
            // goes past end of array
            if reverse {
--- a/asus-nb-ctrl/src/ctrl_rog_bios.rs
+++ b/asus-nb-ctrl/src/ctrl_rog_bios.rs
@@ -0,0 +1,261 @@
+use crate::{
+    config::Config,
+    ctrl_gfx::{gfx::CtrlGraphics, vendors::GfxVendors},
+    error::RogError,
+    GetSupported,
+};
+//use crate::dbus::DbusEvents;
+use log::{info, warn};
+use serde_derive::{Deserialize, Serialize};
+use std::convert::TryInto;
+use std::fs::OpenOptions;
+use std::io::{Read, Write};
+use std::path::Path;
+use std::sync::Arc;
+use std::sync::Mutex;
+use zbus::dbus_interface;
+
+static ASUS_SWITCH_GRAPHIC_MODE: &str =
+    "/sys/firmware/efi/efivars/AsusSwitchGraphicMode-607005d5-3f75-4b2e-98f0-85ba66797a3e";
+static ASUS_POST_LOGO_SOUND: &str =
+    "/sys/firmware/efi/efivars/AsusPostLogoSound-607005d5-3f75-4b2e-98f0-85ba66797a3e";
+
+pub struct CtrlRogBios {
+    config: Arc<Mutex<Config>>,
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct RogBiosSupportedFunctions {
+    pub post_sound_toggle: bool,
+    pub dedicated_gfx_toggle: bool,
+}
+
+impl GetSupported for CtrlRogBios {
+    type A = RogBiosSupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        RogBiosSupportedFunctions {
+            post_sound_toggle: CtrlRogBios::check_path_exists(ASUS_POST_LOGO_SOUND).is_ok(),
+            dedicated_gfx_toggle: CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE).is_ok(),
+        }
+    }
+}
+
+#[dbus_interface(name = "org.asuslinux.Daemon")]
+impl CtrlRogBios {
+    pub fn set_dedicated_graphic_mode(&mut self, dedicated: bool) {
+        Self::set_gfx_mode(dedicated)
+            .map_err(|err| {
+                warn!("CtrlRogBios: set_asus_switch_graphic_mode {}", err);
+                err
+            })
+            .ok();
+        self.notify_dedicated_graphic_mode(dedicated)
+            .map_err(|err| {
+                warn!("CtrlRogBios: notify_asus_switch_graphic_mode {}", err);
+                err
+            })
+            .ok();
+    }
+
+    pub fn dedicated_graphic_mode(&self) -> i8 {
+        Self::get_gfx_mode()
+            .map_err(|err| {
+                warn!("CtrlRogBios: get_gfx_mode {}", err);
+                err
+            })
+            .unwrap_or(-1)
+    }
+
+    #[dbus_interface(signal)]
+    pub fn notify_dedicated_graphic_mode(&self, dedicated: bool) -> zbus::Result<()> {}
+
+    // // // // // // // // // //
+
+    pub fn set_post_boot_sound(&mut self, on: bool) {
+        Self::set_boot_sound(on)
+            .map_err(|err| {
+                warn!("CtrlRogBios: set_post_boot_sound {}", err);
+                err
+            })
+            .ok();
+        self.notify_post_boot_sound(on)
+            .map_err(|err| {
+                warn!("CtrlRogBios: notify_post_boot_sound {}", err);
+                err
+            })
+            .ok();
+    }
+
+    pub fn post_boot_sound(&self) -> i8 {
+        Self::get_boot_sound()
+            .map_err(|err| {
+                warn!("CtrlRogBios: get_boot_sound {}", err);
+                err
+            })
+            .unwrap_or(-1)
+    }
+
+    #[dbus_interface(signal)]
+    pub fn notify_post_boot_sound(&self, dedicated: bool) -> zbus::Result<()> {}
+}
+
+impl crate::ZbusAdd for CtrlRogBios {
+    fn add_to_server(self, server: &mut zbus::ObjectServer) {
+        server
+            .at(&"/org/asuslinux/RogBios".try_into().unwrap(), self)
+            .map_err(|err| {
+                warn!("CtrlRogBios: add_to_server {}", err);
+                err
+            })
+            .ok();
+    }
+}
+
+impl crate::Reloadable for CtrlRogBios {
+    fn reload(&mut self) -> Result<(), RogError> {
+        Ok(())
+    }
+}
+
+impl CtrlRogBios {
+    pub fn new(config: Arc<Mutex<Config>>) -> Result<Self, RogError> {
+        match CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE) {
+            Ok(_) => {
+                CtrlRogBios::set_path_mutable(ASUS_SWITCH_GRAPHIC_MODE)?;
+            }
+            Err(err) => {
+                info!("ROG Switchable Graphics (bios) not detected: {}", err);
+            }
+        }
+
+        match CtrlRogBios::check_path_exists(ASUS_POST_LOGO_SOUND) {
+            Ok(_) => {
+                CtrlRogBios::set_path_mutable(ASUS_POST_LOGO_SOUND)?;
+            }
+            Err(err) => {
+                info!("ROG boot sound toggle (bios) not detected: {}", err);
+            }
+        }
+
+        Ok(CtrlRogBios { config })
+    }
+
+    fn set_path_mutable(path: &str) -> Result<(), RogError> {
+        use std::process::Command;
+
+        let output = Command::new("/usr/bin/chattr")
+            .arg("-i")
+            .arg(path)
+            .output()
+            .map_err(|err| RogError::Path(path.into(), err))?;
+        info!("Set {} writeable: status: {}", path, output.status);
+        Ok(())
+    }
+
+    fn check_path_exists(path: &str) -> Result<(), RogError> {
+        if Path::new(path).exists() {
+            Ok(())
+        } else {
+            Err(RogError::MissingFunction(path.into()))
+        }
+    }
+
+    pub fn has_dedicated_gfx_toggle() -> bool {
+        if CtrlRogBios::check_path_exists(ASUS_SWITCH_GRAPHIC_MODE).is_ok() {
+            return true;
+        }
+        false
+    }
+
+    pub fn get_gfx_mode() -> Result<i8, RogError> {
+        let path = ASUS_SWITCH_GRAPHIC_MODE;
+        let mut file = OpenOptions::new()
+            .read(true)
+            .open(path)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        let mut data = Vec::new();
+        file.read_to_end(&mut data)
+            .map_err(|err| RogError::Read(path.into(), err))?;
+
+        let idx = data.len() - 1;
+        Ok(data[idx] as i8)
+    }
+
+    pub(super) fn set_gfx_mode(dedicated: bool) -> Result<(), RogError> {
+        let path = ASUS_SWITCH_GRAPHIC_MODE;
+        let mut file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .open(path)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        let mut data = Vec::new();
+        file.read_to_end(&mut data).unwrap();
+
+        let idx = data.len() - 1;
+        if dedicated {
+            data[idx] = 1;
+            info!("Set system-level graphics mode: Dedicated Nvidia");
+        } else {
+            data[idx] = 0;
+            info!("Set system-level graphics mode: Optimus");
+        }
+        file.write_all(&data)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
+            if let Ok(vendor) = CtrlGraphics::get_vendor() {
+                if ded == 1 && vendor != "nvidia" {
+                    warn!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
+                    CtrlGraphics::set_gfx_config(GfxVendors::Nvidia)
+                        .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                }
+            }
+        }
+
+        Ok(())
+    }
+
+    pub fn get_boot_sound() -> Result<i8, RogError> {
+        let path = ASUS_POST_LOGO_SOUND;
+        let mut file = OpenOptions::new()
+            .read(true)
+            .open(path)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        let mut data = Vec::new();
+        file.read_to_end(&mut data)
+            .map_err(|err| RogError::Read(path.into(), err))?;
+
+        let idx = data.len() - 1;
+        Ok(data[idx] as i8)
+    }
+
+    pub(super) fn set_boot_sound(on: bool) -> Result<(), RogError> {
+        let path = ASUS_POST_LOGO_SOUND;
+        let mut file = OpenOptions::new()
+            .read(true)
+            .write(true)
+            .open(path)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        let mut data = Vec::new();
+        file.read_to_end(&mut data)
+            .map_err(|err| RogError::Read(path.into(), err))?;
+
+        let idx = data.len() - 1;
+        if on {
+            data[idx] = 1;
+            info!("Set boot POST sound on");
+        } else {
+            data[idx] = 0;
+            info!("Set boot POST sound off");
+        }
+        file.write_all(&data)
+            .map_err(|err| RogError::Path(path.into(), err))?;
+
+        Ok(())
+    }
+}
--- a/asus-nb-ctrl/src/daemon.rs
+++ b/asus-nb-ctrl/src/daemon.rs
@@ -1,10 +1,14 @@
-use ctrl_gfx::ctrl_gfx::CtrlGraphics;
-use daemon::config::Config;
-use daemon::ctrl_anime::CtrlAnimeDisplay;
 use daemon::ctrl_charge::CtrlCharge;
 use daemon::ctrl_fan_cpu::{CtrlFanAndCPU, DbusFanAndCpu};
 use daemon::ctrl_leds::{CtrlKbdBacklight, DbusKbdBacklight};
 use daemon::laptops::match_laptop;
+use daemon::{
+    config::Config, laptops::print_board_info, supported::SupportedFunctions, GetSupported,
+};
+use daemon::{
+    ctrl_anime::CtrlAnimeDisplay,
+    ctrl_gfx::{gfx::CtrlGraphics, vendors::GfxVendors},
+};

 use asus_nb::DBUS_NAME;
 use daemon::{CtrlTask, Reloadable, ZbusAdd};
@@ -15,6 +19,7 @@ use std::io::Write;
 use std::sync::Arc;
 use std::sync::Mutex;

+use daemon::ctrl_rog_bios::CtrlRogBios;
 use std::convert::Into;
 use std::convert::TryInto;
 use zbus::fdo;
@@ -40,14 +45,16 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 // - to maintain constant times of 1ms, per-key colours should use
 //   the effect endpoint so that the complete colour block is written
 //   as fast as 1ms per row of the matrix inside it. (10ms total time)
-//
-// DBUS processing takes 6ms if not tokiod
 fn start_daemon() -> Result<(), Box<dyn Error>> {
+    let supported = SupportedFunctions::get_supported();
+    print_board_info();
+    println!("{}", serde_json::to_string_pretty(&supported).unwrap());
+
    let laptop = match_laptop();
    let config = if let Some(laptop) = laptop.as_ref() {
-        Config::default().load(laptop.supported_modes())
+        Config::load(laptop.supported_modes())
    } else {
-        Config::default().load(&[])
+        Config::load(&[])
    };

    let connection = Connection::new_system()?;
@@ -55,9 +62,24 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
        .request_name(DBUS_NAME, fdo::RequestNameFlags::ReplaceExisting.into())?;
    let mut object_server = zbus::ObjectServer::new(&connection);

+    supported.add_to_server(&mut object_server);
+
    let enable_gfx_switching = config.gfx_managed;
    let config = Arc::new(Mutex::new(config));

+    match CtrlRogBios::new(config.clone()) {
+        Ok(mut ctrl) => {
+            // Do a reload of any settings
+            ctrl.reload()
+                .unwrap_or_else(|err| warn!("Battery charge limit: {}", err));
+            // Then register to dbus server
+            ctrl.add_to_server(&mut object_server);
+        }
+        Err(err) => {
+            error!("rog_bios_control: {}", err);
+        }
+    }
+
    match CtrlCharge::new(config.clone()) {
        Ok(mut ctrl) => {
            // Do a reload of any settings
@@ -81,10 +103,25 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
    }

    if enable_gfx_switching {
-        match CtrlGraphics::new() {
+        match CtrlGraphics::new(config.clone()) {
            Ok(mut ctrl) => {
-                ctrl.reload()
-                    .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                // Need to check if a laptop has the dedicated gfx switch
+                if CtrlRogBios::has_dedicated_gfx_toggle() {
+                    if let Ok(ded) = CtrlRogBios::get_gfx_mode() {
+                        if let Ok(vendor) = CtrlGraphics::get_vendor() {
+                            if ded == 1 && vendor != "nvidia" {
+                                error!("Dedicated GFX toggle is on but driver mode is not nvidia \nSetting to nvidia driver mode");
+                                error!("You must reboot to enable Nvidia driver");
+                                CtrlGraphics::set_gfx_config(GfxVendors::Nvidia)?;
+                            } else if ded == 0 {
+                                info!("Dedicated GFX toggle is off");
+                            }
+                        }
+                    }
+                } else {
+                    ctrl.reload()
+                        .unwrap_or_else(|err| warn!("Gfx controller: {}", err));
+                }
                ctrl.add_to_server(&mut object_server);
            }
            Err(err) => {
@@ -96,29 +133,30 @@ fn start_daemon() -> Result<(), Box<dyn Error>> {
    // Collect tasks for task thread
    let mut tasks: Vec<Arc<Mutex<dyn CtrlTask + Send>>> = Vec::new();

-    match CtrlFanAndCPU::new(config.clone()) {
-        Ok(mut ctrl) => {
-            ctrl.reload()
-                .unwrap_or_else(|err| warn!("Profile control: {}", err));
-            let tmp = Arc::new(Mutex::new(ctrl));
-            DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server);
-            tasks.push(tmp);
-        }
-        Err(err) => {
-            error!("Profile control: {}", err);
-        }
+    if let Ok(mut ctrl) = CtrlFanAndCPU::new(config.clone()).map_err(|err| {
+        error!("Profile control: {}", err);
+    }) {
+        ctrl.reload()
+            .unwrap_or_else(|err| warn!("Profile control: {}", err));
+        let tmp = Arc::new(Mutex::new(ctrl));
+        DbusFanAndCpu::new(tmp.clone()).add_to_server(&mut object_server);
+        tasks.push(tmp);
    };

    if let Some(laptop) = laptop {
-        let ctrl = CtrlKbdBacklight::new(
+        if let Ok(ctrl) = CtrlKbdBacklight::new(
            laptop.usb_product(),
            laptop.condev_iface(),
            laptop.supported_modes().to_owned(),
            config,
-        );
-        let tmp = Arc::new(Mutex::new(ctrl));
-        DbusKbdBacklight::new(tmp.clone()).add_to_server(&mut object_server);
-        tasks.push(tmp);
+        )
+        .map_err(|err| {
+            error!("Keyboard control: {}", err);
+        }) {
+            let tmp = Arc::new(Mutex::new(ctrl));
+            DbusKbdBacklight::new(tmp.clone()).add_to_server(&mut object_server);
+            tasks.push(tmp);
+        }
    }

    // TODO: implement messaging between threads to check fails
--- a/asus-nb-ctrl/src/error.rs
+++ b/asus-nb-ctrl/src/error.rs
@@ -3,6 +3,8 @@ use rog_fan_curve::CurveError;
 use std::convert::From;
 use std::fmt;

+use crate::ctrl_gfx::error::GfxError;
+
 #[derive(Debug)]
 pub enum RogError {
    ParseFanLevel,
@@ -20,6 +22,8 @@ pub enum RogError {
    DoTask(String),
    MissingFunction(String),
    MissingLedBrightNode(String, std::io::Error),
+    ReloadFail(String),
+    GfxSwitching(GfxError),
 }

 impl fmt::Display for RogError {
@@ -41,6 +45,8 @@ impl fmt::Display for RogError {
            RogError::DoTask(deets) => write!(f, "Task error: {}", deets),
            RogError::MissingFunction(deets) => write!(f, "Missing functionality: {}", deets),
            RogError::MissingLedBrightNode(path, error) => write!(f, "Led node at {} is missing, please check you have the required patch or dkms module installed: {}", path, error),
+            RogError::ReloadFail(deets) => write!(f, "Task error: {}", deets),
+            RogError::GfxSwitching(deets) => write!(f, "Graphics switching error: {}", deets),
        }
    }
 }
--- a/asus-nb-ctrl/src/laptops.rs
+++ b/asus-nb-ctrl/src/laptops.rs
@@ -27,13 +27,12 @@ impl LaptopBase {
 }

 pub fn match_laptop() -> Option<LaptopBase> {
-    for device in rusb::devices().unwrap().iter() {
-        let device_desc = device.device_descriptor().unwrap();
+    for device in rusb::devices().expect("Failed here").iter() {
+        let device_desc = device.device_descriptor().expect("Failed there");
        if device_desc.vendor_id() == 0x0b05 {
            match device_desc.product_id() {
                0x1866 => {
                    let laptop = select_1866_device("1866".to_owned());
-                    print_modes(&laptop.supported_modes);
                    return Some(laptop);
                }
                0x1869 => return Some(select_1866_device("1869".to_owned())),
@@ -61,10 +60,6 @@ fn select_1866_device(prod: String) -> LaptopBase {
    let dmi = sysfs_class::DmiId::default();
    let board_name = dmi.board_name().expect("Could not get board_name");
    let prod_family = dmi.product_family().expect("Could not get product_family");
-    let prod_name = dmi.product_name().expect("Could not get product_name");
-
-    info!("Product name: {}", prod_name.trim());
-    info!("Board name: {}", board_name.trim());

    let mut laptop = LaptopBase {
        usb_product: prod,
@@ -81,7 +76,18 @@ fn select_1866_device(prod: String) -> LaptopBase {
    laptop
 }

-fn print_modes(supported_modes: &[u8]) {
+pub fn print_board_info() {
+    let dmi = sysfs_class::DmiId::default();
+    let board_name = dmi.board_name().expect("Could not get board_name");
+    let prod_name = dmi.product_name().expect("Could not get product_name");
+    let prod_family = dmi.product_family().expect("Could not get product_family");
+
+    info!("Product name: {}", prod_name.trim());
+    info!("Product family: {}", prod_family.trim());
+    info!("Board name: {}", board_name.trim());
+}
+
+pub fn print_modes(supported_modes: &[u8]) {
    if !supported_modes.is_empty() {
        info!("Supported Keyboard LED modes are:");
        for mode in supported_modes {
--- a/asus-nb-ctrl/src/lib.rs
+++ b/asus-nb-ctrl/src/lib.rs
@@ -8,15 +8,21 @@ pub mod ctrl_charge;
 ///
 pub mod ctrl_fan_cpu;
 ///
-pub mod ctrl_leds;
+pub mod ctrl_gfx;
 ///
+pub mod ctrl_leds;
+/// Control ASUS bios function such as boot sound, Optimus/Dedicated gfx mode
+pub mod ctrl_rog_bios;
 /// Laptop matching to determine capabilities
 pub mod laptops;

+/// Fetch all supported functions for the laptop
+pub mod supported;
+
 mod error;

-use config::Config;
 use crate::error::RogError;
+use config::Config;
 use zbus::ObjectServer;

 pub static VERSION: &str = env!("CARGO_PKG_VERSION");
@@ -38,3 +44,9 @@ pub trait CtrlTaskComplex {

    fn do_task(&mut self, config: &mut Config, event: Self::A);
 }
+
+pub trait GetSupported {
+    type A;
+
+    fn get_supported() -> Self::A;
+}
--- a/asus-nb-ctrl/src/main.rs
+++ b/asus-nb-ctrl/src/main.rs
@@ -1,11 +1,10 @@
 use asus_nb::{
    anime_dbus::AniMeDbusWriter,
-    cli_options::{AniMeActions, LedBrightness, SetAuraBuiltin},
+    cli_options::{AniMeActions, AniMeStatusValue, LedBrightness, SetAuraBuiltin},
    core_dbus::AuraDbusClient,
    profile::{ProfileCommand, ProfileEvent},
 };
-use ctrl_gfx::vendors::GfxVendors;
-use daemon::ctrl_fan_cpu::FanLevel;
+use daemon::{ctrl_fan_cpu::FanLevel, ctrl_gfx::vendors::GfxVendors};
 use gumdrop::{Opt, Options};
 use log::LevelFilter;
 use std::{env::args, io::Write, process::Command};
@@ -18,11 +17,16 @@ struct CLIStart {
    help: bool,
    #[options(help = "show program version number")]
    version: bool,
-    #[options(meta = "VAL", help = "<off, low, med, high>")]
+    #[options(help = "show supported functions of this laptop")]
+    show_supported: bool,
+    #[options(meta = "", help = "<off, low, med, high>")]
    kbd_bright: Option<LedBrightness>,
-    #[options(meta = "PWR", help = "<silent, normal, boost>")]
-    pwr_profile: Option<FanLevel>,
-    #[options(meta = "CHRG", help = "<20-100>")]
+    #[options(
+        meta = "",
+        help = "<silent, normal, boost>, set fan mode independent of profile"
+    )]
+    fan_mode: Option<FanLevel>,
+    #[options(meta = "", help = "<20-100>")]
    chg_limit: Option<u8>,
    #[options(command)]
    command: Option<CliCommand>,
@@ -38,6 +42,8 @@ enum CliCommand {
    Graphics(GraphicsCommand),
    #[options(name = "anime", help = "Manage AniMe Matrix")]
    AniMe(AniMeCommand),
+    #[options(help = "Change bios settings")]
+    Bios(BiosCommand),
 }

 #[derive(Options)]
@@ -56,7 +62,10 @@ struct LedModeCommand {
 struct GraphicsCommand {
    #[options(help = "print help message")]
    help: bool,
-    #[options(help = "Set graphics mode: <nvidia, hybrid, compute, integrated>")]
+    #[options(
+        meta = "",
+        help = "Set graphics mode: <nvidia, hybrid, compute, integrated>"
+    )]
    mode: Option<GfxVendors>,
    #[options(help = "Get the current mode")]
    get: bool,
@@ -70,14 +79,31 @@ struct GraphicsCommand {
 struct AniMeCommand {
    #[options(help = "print help message")]
    help: bool,
-    #[options(help = "turn on the panel (and accept write requests)", no_short)]
-    on: bool,
-    #[options(help = "turn off the panel (and reject write requests)", no_short)]
-    off: bool,
+    #[options(
+        meta = "",
+        help = "turn on/off the panel (accept/reject write requests)"
+    )]
+    turn: Option<AniMeStatusValue>,
+    #[options(meta = "", help = "turn on/off the panel at boot (with Asus effect)")]
+    boot: Option<AniMeStatusValue>,
    #[options(command)]
    command: Option<AniMeActions>,
 }

+#[derive(Options, Debug)]
+struct BiosCommand {
+    #[options(help = "print help message")]
+    help: bool,
+    #[options(meta = "", no_long, help = "toggle bios POST sound")]
+    post_sound_set: Option<bool>,
+    #[options(no_long, help = "read bios POST sound")]
+    post_sound_get: bool,
+    #[options(meta = "", no_long, help = "toggle GPU to/from dedicated mode")]
+    dedicated_gfx_set: Option<bool>,
+    #[options(no_long, help = "get GPU mode")]
+    dedicated_gfx_get: bool,
+}
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
    let mut logger = env_logger::Builder::new();
    logger
@@ -102,7 +128,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
            };
        }
        Err(err) => {
-            eprintln!("source {:?}", err);
+            eprintln!("source {}", err);
            std::process::exit(2);
        }
    }
@@ -117,76 +143,157 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
        println!("Version: {}", daemon::VERSION);
    }

-    let writer = AuraDbusClient::new()?;
-    let anime_writer = AniMeDbusWriter::new()?;
+    let dbus_client = AuraDbusClient::new()?;
+    let anime_dbus_client = AniMeDbusWriter::new()?;

    match parsed.command {
        Some(CliCommand::LedMode(mode)) => {
+            if (mode.command.is_none() && !mode.prev_mode && !mode.next_mode) || mode.help {
+                println!("Missing arg or command\n\n{}", mode.self_usage());
+                if let Some(lst) = mode.self_command_list() {
+                    println!("\n{}", lst);
+                }
+            }
            if mode.next_mode && mode.prev_mode {
                println!("Please specify either next or previous")
            }
            if mode.next_mode {
-                writer.next_keyboard_led_mode()?;
+                dbus_client.next_keyboard_led_mode()?;
            } else if mode.prev_mode {
-                writer.prev_keyboard_led_mode()?;
+                dbus_client.prev_keyboard_led_mode()?;
            } else if let Some(command) = mode.command {
-                writer.write_builtin_mode(&command.into())?
+                dbus_client.write_builtin_mode(&command.into())?
            }
        }
-        Some(CliCommand::Profile(command)) => {
-            if command.next {
-                writer.next_fan_profile()?;
+        Some(CliCommand::Profile(cmd)) => {
+            if (!cmd.next
+                && !cmd.create
+                && cmd.curve.is_none()
+                && cmd.max_percentage.is_none()
+                && cmd.min_percentage.is_none()
+                && cmd.preset.is_none()
+                && cmd.profile.is_none()
+                && cmd.turbo.is_none())
+                || cmd.help
+            {
+                println!("Missing arg or command\n\n{}", cmd.self_usage());
+                if let Some(lst) = cmd.self_command_list() {
+                    println!("\n{}", lst);
+                }
+            }
+            if cmd.next {
+                dbus_client.next_fan_profile()?;
            } else {
-                writer.write_profile_command(&ProfileEvent::Cli(command))?
+                dbus_client.write_profile_command(&ProfileEvent::Cli(cmd))?
            }
        }
-        Some(CliCommand::Graphics(command)) => do_gfx(command, &writer)?,
-        Some(CliCommand::AniMe(anime)) => {
-            if anime.on {
-                anime_writer.turn_on()?;
-            } else if anime.off {
-                anime_writer.turn_off()?;
-            } else if let Some(action) = anime.command {
+        Some(CliCommand::Graphics(cmd)) => do_gfx(cmd, &dbus_client)?,
+        Some(CliCommand::AniMe(cmd)) => {
+            if (cmd.command.is_none() && cmd.boot.is_none() && cmd.turn.is_none()) || cmd.help {
+                println!("Missing arg or command\n\n{}", cmd.self_usage());
+                if let Some(lst) = cmd.self_command_list() {
+                    println!("\n{}", lst);
+                }
+            }
+            if let Some(anime_turn) = cmd.turn {
+                anime_dbus_client.turn_on_off(anime_turn.into())?
+            }
+            if let Some(anime_boot) = cmd.boot {
+                anime_dbus_client.turn_boot_on_off(anime_boot.into())?
+            }
+            if let Some(action) = cmd.command {
                match action {
                    AniMeActions::Leds(anime_leds) => {
                        let led_brightness = anime_leds.led_brightness();
-                        anime_writer.set_leds_brightness(led_brightness)?;
+                        anime_dbus_client.set_leds_brightness(led_brightness)?;
                    }
                }
            }
        }
-        None => (),
+        Some(CliCommand::Bios(cmd)) => {
+            if (cmd.dedicated_gfx_set.is_none()
+                && !cmd.dedicated_gfx_get
+                && cmd.post_sound_set.is_none()
+                && !cmd.post_sound_get)
+                || cmd.help
+            {
+                println!("Missing arg or command\n\n{}", cmd.self_usage());
+                if let Some(lst) = cmd.self_command_list() {
+                    println!("\n{}", lst);
+                }
+            }
+
+            if let Some(opt) = cmd.post_sound_set {
+                dbus_client.set_bios_post_sound(opt)?;
+            }
+            if cmd.post_sound_get {
+                let res = if dbus_client.get_bios_post_sound()? == 1 {
+                    true
+                } else {
+                    false
+                };
+                println!("Bios POST sound on: {}", res);
+            }
+            if let Some(opt) = cmd.dedicated_gfx_set {
+                dbus_client.set_bios_dedicated_gfx(opt)?;
+            }
+            if cmd.dedicated_gfx_get {
+                let res = if dbus_client.get_bios_dedicated_gfx()? == 1 {
+                    true
+                } else {
+                    false
+                };
+                println!("Bios dedicated GPU on: {}", res);
+            }
+        }
+        None => {
+            if (!parsed.show_supported
+                && parsed.kbd_bright.is_none()
+                && parsed.fan_mode.is_none()
+                && parsed.chg_limit.is_none())
+                || parsed.help
+            {
+                println!("{}", CLIStart::usage());
+                println!();
+                println!("{}", CLIStart::command_list().unwrap());
+            }
+        }
    }

    if let Some(brightness) = parsed.kbd_bright {
        match brightness.level() {
            None => {
-                let level = writer.get_led_brightness()?;
+                let level = dbus_client.get_led_brightness()?;
                println!("Current keyboard led brightness: {}", level.to_string());
            }
-            Some(level) => writer.write_brightness(level)?,
+            Some(level) => dbus_client.write_brightness(level)?,
        }
    }

-    if let Some(fan_level) = parsed.pwr_profile {
-        writer.write_fan_mode(fan_level.into())?;
+    if parsed.show_supported {
+        let dat = dbus_client.get_supported_functions()?;
+        println!("Supported laptop functions:\n{}", dat.to_string());
+    }
+
+    if let Some(fan_level) = parsed.fan_mode {
+        dbus_client.write_fan_mode(fan_level.into())?;
    }
    if let Some(chg_limit) = parsed.chg_limit {
-        writer.write_charge_limit(chg_limit)?;
+        dbus_client.write_charge_limit(chg_limit)?;
    }
    Ok(())
 }

 fn do_gfx(
    command: GraphicsCommand,
-    writer: &AuraDbusClient,
+    dbus_client: &AuraDbusClient,
 ) -> Result<(), Box<dyn std::error::Error>> {
    if let Some(mode) = command.mode {
        println!("Updating settings, please wait...");
        println!("If this takes longer than 30s, ctrl+c then check `journalctl -b -u asusd`");

-        writer.write_gfx_mode(mode)?;
-        let res = writer.wait_gfx_changed()?;
+        dbus_client.write_gfx_mode(<&str>::from(&mode).into())?;
+        let res = dbus_client.wait_gfx_changed()?;
        match res.as_str() {
            "reboot" => {
                println!(
@@ -215,16 +322,19 @@ fn do_gfx(
                )?;
                std::process::exit(1)
            }
-            _ => std::process::exit(-1),
+            _ => {
+                println!("{}", Red.paint(&format!("\n{}\n", res.as_str())),);
+                std::process::exit(-1);
+            }
        }
        std::process::exit(-1)
    }
    if command.get {
-        let res = writer.get_gfx_mode()?;
+        let res = dbus_client.get_gfx_mode()?;
        println!("Current graphics mode: {}", res);
    }
    if command.pow {
-        let res = writer.get_gfx_pwr()?;
+        let res = dbus_client.get_gfx_pwr()?;
        if res.contains("active") {
            println!("Current power status: {}", Red.paint(&format!("{}", res)));
        } else {
--- a/asus-nb-ctrl/src/supported.rs
+++ b/asus-nb-ctrl/src/supported.rs
@@ -0,0 +1,56 @@
+use std::convert::TryInto;
+
+use log::warn;
+use serde_derive::{Deserialize, Serialize};
+use zbus::dbus_interface;
+
+use crate::{
+    ctrl_anime::{AnimeSupportedFunctions, CtrlAnimeDisplay},
+    ctrl_charge::{ChargeSupportedFunctions, CtrlCharge},
+    ctrl_fan_cpu::{CtrlFanAndCPU, FanCpuSupportedFunctions},
+    ctrl_leds::{CtrlKbdBacklight, LedSupportedFunctions},
+    ctrl_rog_bios::{CtrlRogBios, RogBiosSupportedFunctions},
+    GetSupported,
+};
+
+#[derive(Serialize, Deserialize)]
+pub struct SupportedFunctions {
+    anime_ctrl: AnimeSupportedFunctions,
+    charge_ctrl: ChargeSupportedFunctions,
+    fan_cpu_ctrl: FanCpuSupportedFunctions,
+    keyboard_led: LedSupportedFunctions,
+    rog_bios_ctrl: RogBiosSupportedFunctions,
+}
+
+#[dbus_interface(name = "org.asuslinux.Daemon")]
+impl SupportedFunctions {
+    fn supported_functions(&self) -> String {
+        serde_json::to_string_pretty(self).unwrap()
+    }
+}
+
+impl crate::ZbusAdd for SupportedFunctions {
+    fn add_to_server(self, server: &mut zbus::ObjectServer) {
+        server
+            .at(&"/org/asuslinux/Supported".try_into().unwrap(), self)
+            .map_err(|err| {
+                warn!("SupportedFunctions: add_to_server {}", err);
+                err
+            })
+            .ok();
+    }
+}
+
+impl GetSupported for SupportedFunctions {
+    type A = SupportedFunctions;
+
+    fn get_supported() -> Self::A {
+        SupportedFunctions {
+            keyboard_led: CtrlKbdBacklight::get_supported(),
+            anime_ctrl: CtrlAnimeDisplay::get_supported(),
+            charge_ctrl: CtrlCharge::get_supported(),
+            fan_cpu_ctrl: CtrlFanAndCPU::get_supported(),
+            rog_bios_ctrl: CtrlRogBios::get_supported(),
+        }
+    }
+}
--- a/asus-nb/Cargo.toml
+++ b/asus-nb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "asus-nb"
-version = "2.1.0"
+version = "2.2.1"
 license = "MPL-2.0"
 readme = "README.md"
 authors = ["Luke <luke@ljones.dev>"]
@@ -17,9 +17,8 @@ serde_derive = "^1.0"
 serde_json = "^1.0"
 yansi-term = "^0.1"
 rog_fan_curve = { version = "0.1", features = ["serde"] }
-zbus = "1.1.1"
-zvariant = "2.2.0"
-ctrl-gfx = { path = "../ctrl-gfx" } 
+zbus = "^1.8.0"
+zvariant = "^2.4.0"

 [dev-dependencies]
 tinybmp = "^0.2.3"
--- a/asus-nb/src/anime_dbus.rs
+++ b/asus-nb/src/anime_dbus.rs
@@ -1,8 +1,6 @@
-const DBUS_ANIME_PATH : &str = "/org/asuslinux/Anime";
-pub const ANIME_PANE1_PREFIX: [u8; 7] =
-    [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02];
-pub const ANIME_PANE2_PREFIX: [u8; 7] =
-    [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02];
+const DBUS_ANIME_PATH: &str = "/org/asuslinux/Anime";
+pub const ANIME_PANE1_PREFIX: [u8; 7] = [0x5e, 0xc0, 0x02, 0x01, 0x00, 0x73, 0x02];
+pub const ANIME_PANE2_PREFIX: [u8; 7] = [0x5e, 0xc0, 0x02, 0x74, 0x02, 0x73, 0x02];

 use crate::anime_matrix::{AniMeMatrix, AniMePacketType};
 use crate::DBUS_NAME;
@@ -10,9 +8,7 @@ use dbus::blocking::{Connection, Proxy};
 use std::error::Error;
 use std::{thread, time::Duration};

-use crate::dbus_anime::{
-    OrgAsuslinuxDaemon as OrgAsuslinuxDaemonAniMe,
-};
+use crate::dbus_anime::OrgAsuslinuxDaemon as OrgAsuslinuxDaemonAniMe;

 /// Interface for the AniMe dot-matrix display
 ///
@@ -38,12 +34,13 @@ impl AniMeDbusWriter {
    }

    // Create D-Bus proxy
-    fn new_proxy(&self) -> Proxy<&Connection>{
-        self.connection.with_proxy(
-            DBUS_NAME,
-            DBUS_ANIME_PATH,
-            Duration::from_millis(200),
-        )
+    fn new_proxy(&self) -> Proxy<&Connection> {
+        self.connection
+            .with_proxy(DBUS_NAME, DBUS_ANIME_PATH, Duration::from_millis(200))
+    }
+
+    fn thread_sleep(&self) {
+        thread::sleep(Duration::from_millis(self.block_time));
    }

    pub fn write_image_to_buf(_buf: &mut AniMePacketType, _image_data: &[u8]) {
@@ -66,22 +63,20 @@ impl AniMeDbusWriter {
    ///
    /// Where led brightness is 0..255, low to high
    #[inline]
-    pub fn write_image(&self, image: &mut AniMePacketType)
-                       -> Result<(), Box<dyn Error>> {
+    pub fn write_image(&self, image: &mut AniMePacketType) -> Result<(), Box<dyn Error>> {
        let proxy = self.new_proxy();

        image[0][..7].copy_from_slice(&ANIME_PANE1_PREFIX);
        image[1][..7].copy_from_slice(&ANIME_PANE2_PREFIX);

        proxy.set_anime(vec![image[0].to_vec(), image[1].to_vec()])?;
-        thread::sleep(Duration::from_millis(self.block_time));
+        self.thread_sleep();

        Ok(())
    }

    #[inline]
-    pub fn set_leds_brightness(&self, led_brightness: u8)
-                               -> Result<(), Box<dyn Error>> {
+    pub fn set_leds_brightness(&self, led_brightness: u8) -> Result<(), Box<dyn Error>> {
        let mut anime_matrix = AniMeMatrix::new();

        anime_matrix.fill_with(led_brightness);
@@ -90,24 +85,23 @@ impl AniMeDbusWriter {
        Ok(())
    }

-    fn turn_on_off(&self, status : bool) -> Result<(), Box<dyn Error>> {
+    #[inline]
+    pub fn turn_on_off(&self, status: bool) -> Result<(), Box<dyn Error>> {
        let proxy = self.new_proxy();

        proxy.set_on_off(status)?;
-        thread::sleep(Duration::from_millis(self.block_time));
+        self.thread_sleep();

        Ok(())
    }

    #[inline]
-    pub fn turn_on(&self) -> Result<(), Box<dyn Error>> {
-        self.turn_on_off(true)?;
-        Ok(())
-    }
+    pub fn turn_boot_on_off(&self, status: bool) -> Result<(), Box<dyn Error>> {
+        let proxy = self.new_proxy();
+
+        proxy.set_boot_on_off(status)?;
+        self.thread_sleep();

-    #[inline]
-    pub fn turn_off(&self) -> Result<(), Box<dyn Error>> {
-        self.turn_on_off(false)?;
        Ok(())
    }
 }
--- a/asus-nb/src/cli_options.rs
+++ b/asus-nb/src/cli_options.rs
@@ -27,9 +27,10 @@ impl FromStr for LedBrightness {
            "med" => Ok(LedBrightness { level: Some(0x02) }),
            "high" => Ok(LedBrightness { level: Some(0x03) }),
            _ => {
-                print!("{}\n{}\n",
-                       "Invalid argument, must be one of:",
-                       "off, low, med, high");
+                print!(
+                    "{}\n{}\n",
+                    "Invalid argument, must be one of:", "off, low, med, high"
+                );
                Err(AuraError::ParseBrightness)
            }
        }
@@ -231,16 +232,48 @@ impl Default for SetAuraBuiltin {
    }
 }

+#[derive(Copy, Clone, Debug)]
+pub enum AniMeStatusValue {
+    On,
+    Off,
+}
+impl FromStr for AniMeStatusValue {
+    type Err = AuraError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let s = s.to_lowercase();
+        match s.as_str() {
+            "on" => Ok(AniMeStatusValue::On),
+            "off" => Ok(AniMeStatusValue::Off),
+            _ => {
+                print!("{}\n{}\n", "Invalid argument, must be one of:", "on, off");
+                Err(AuraError::ParseAnime)
+            }
+        }
+    }
+}
+impl From<AniMeStatusValue> for bool {
+    fn from(value: AniMeStatusValue) -> Self {
+        match value {
+            AniMeStatusValue::On => true,
+            AniMeStatusValue::Off => false,
+        }
+    }
+}
+
 #[derive(Options)]
 pub struct AniMeLeds {
    #[options(help = "print help message")]
    help: bool,
-    #[options(no_long, required,
-              short = "b", meta = "BYTE",
-              help = "set all leds brightness value")]
+    #[options(
+        no_long,
+        required,
+        short = "b",
+        meta = "BYTE",
+        help = "set all leds brightness value"
+    )]
    led_brightness: u8,
 }
-
 impl AniMeLeds {
    pub fn led_brightness(&self) -> u8 {
        self.led_brightness
--- a/asus-nb/src/core_dbus.rs
+++ b/asus-nb/src/core_dbus.rs
@@ -1,8 +1,7 @@
-use crate::cli_options::LedBrightness;
 use super::*;
+use crate::cli_options::LedBrightness;
 use crate::fancy::KeyColourArray;
 use crate::profile::ProfileEvent;
-use ctrl_gfx::vendors::GfxVendors;
 use dbus::{blocking::Connection, Message};
 use std::error::Error;
 use std::sync::{
@@ -11,7 +10,9 @@ use std::sync::{
 };
 use std::{thread, time::Duration};

-use crate::dbus_charge::{OrgAsuslinuxDaemonNotifyCharge, OrgAsuslinuxDaemon as OrgAsuslinuxDaemonCharge};
+use crate::dbus_charge::{
+    OrgAsuslinuxDaemon as OrgAsuslinuxDaemonCharge, OrgAsuslinuxDaemonNotifyCharge,
+};
 use crate::dbus_gfx::{
    OrgAsuslinuxDaemon as OrgAsuslinuxDaemonGfx, OrgAsuslinuxDaemonNotifyAction,
    OrgAsuslinuxDaemonNotifyGfx,
@@ -22,6 +23,8 @@ use crate::dbus_ledmode::{
 use crate::dbus_profile::{
    OrgAsuslinuxDaemon as OrgAsuslinuxDaemonProfile, OrgAsuslinuxDaemonNotifyProfile,
 };
+use crate::dbus_rogbios::OrgAsuslinuxDaemon as OrgAsuslinuxDaemonRogBios;
+use crate::dbus_supported::OrgAsuslinuxDaemon as OrgAsuslinuxDaemonSupported;

 // Signals separated out
 pub struct CtrlSignals {
@@ -276,13 +279,13 @@ impl AuraDbusClient {
    }

    #[inline]
-    pub fn write_gfx_mode(&self, vendor: GfxVendors) -> Result<(), Box<dyn std::error::Error>> {
+    pub fn write_gfx_mode(&self, vendor: String) -> Result<(), Box<dyn std::error::Error>> {
        let proxy = self.connection.with_proxy(
            "org.asuslinux.Daemon",
            "/org/asuslinux/Gfx",
            Duration::from_secs(30),
        );
-        proxy.set_vendor(<&str>::from(&vendor))?;
+        proxy.set_vendor(&vendor)?;
        Ok(())
    }

@@ -356,4 +359,60 @@ impl AuraDbusClient {
        self.write_keyboard_leds(&AuraModes::LedBrightness(level))?;
        Ok(())
    }
+
+    //
+    #[inline]
+    pub fn get_bios_dedicated_gfx(&self) -> Result<i16, Box<dyn std::error::Error>> {
+        let proxy = self.connection.with_proxy(
+            "org.asuslinux.Daemon",
+            "/org/asuslinux/RogBios",
+            Duration::from_secs(2),
+        );
+        let x = proxy.dedicated_graphic_mode()?;
+        Ok(x)
+    }
+
+    #[inline]
+    pub fn set_bios_dedicated_gfx(&self, on: bool) -> Result<(), Box<dyn std::error::Error>> {
+        let proxy = self.connection.with_proxy(
+            "org.asuslinux.Daemon",
+            "/org/asuslinux/RogBios",
+            Duration::from_secs(2),
+        );
+        proxy.set_dedicated_graphic_mode(<bool>::from(on))?;
+        Ok(())
+    }
+
+    #[inline]
+    pub fn get_bios_post_sound(&self) -> Result<i16, Box<dyn std::error::Error>> {
+        let proxy = self.connection.with_proxy(
+            "org.asuslinux.Daemon",
+            "/org/asuslinux/RogBios",
+            Duration::from_secs(2),
+        );
+        let x = proxy.post_boot_sound()?;
+        Ok(x)
+    }
+
+    #[inline]
+    pub fn set_bios_post_sound(&self, on: bool) -> Result<(), Box<dyn std::error::Error>> {
+        let proxy = self.connection.with_proxy(
+            "org.asuslinux.Daemon",
+            "/org/asuslinux/RogBios",
+            Duration::from_secs(2),
+        );
+        proxy.set_post_boot_sound(<bool>::from(on))?;
+        Ok(())
+    }
+
+    #[inline]
+    pub fn get_supported_functions(&self) -> Result<String, Box<dyn std::error::Error>> {
+        let proxy = self.connection.with_proxy(
+            "org.asuslinux.Daemon",
+            "/org/asuslinux/Supported",
+            Duration::from_secs(2),
+        );
+        let x = proxy.supported_functions()?;
+        Ok(x)
+    }
 }
--- a/asus-nb/src/dbus_anime.rs
+++ b/asus-nb/src/dbus_anime.rs
@@ -1,5 +1,5 @@
 // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Anime -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs
-use dbus as dbus;
+use dbus;
 #[allow(unused_imports)]
 use dbus::arg;
 use dbus::blocking;
@@ -7,15 +7,21 @@ use dbus::blocking;
 pub trait OrgAsuslinuxDaemon {
    fn set_anime(&self, input: Vec<Vec<u8>>) -> Result<(), dbus::Error>;
    fn set_on_off(&self, status: bool) -> Result<(), dbus::Error>;
+    fn set_boot_on_off(&self, status: bool) -> Result<(), dbus::Error>;
 }

-impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> {
-
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
    fn set_anime(&self, input: Vec<Vec<u8>>) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetAnime", (input, ))
+        self.method_call("org.asuslinux.Daemon", "SetAnime", (input,))
    }

    fn set_on_off(&self, status: bool) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetOnOff", (status, ))
+        self.method_call("org.asuslinux.Daemon", "SetOnOff", (status,))
+    }
+
+    fn set_boot_on_off(&self, status: bool) -> Result<(), dbus::Error> {
+        self.method_call("org.asuslinux.Daemon", "SetBootOnOff", (status,))
    }
 }
--- a/asus-nb/src/dbus_charge.rs
+++ b/asus-nb/src/dbus_charge.rs
@@ -1,5 +1,5 @@
 // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/Charge -m None`, see https://github.com/diwic/dbus-rs
-use dbus as dbus;
+use dbus;
 #[allow(unused_imports)]
 use dbus::arg;
 use dbus::blocking;
@@ -9,15 +9,16 @@ pub trait OrgAsuslinuxDaemon {
    fn limit(&self) -> Result<i16, dbus::Error>;
 }

-impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> {
-
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
    fn set_limit(&self, limit: u8) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetLimit", (limit, ))
+        self.method_call("org.asuslinux.Daemon", "SetLimit", (limit,))
    }

    fn limit(&self) -> Result<i16, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "Limit", ())
-            .and_then(|r: (i16, )| Ok(r.0, ))
+            .and_then(|r: (i16,)| Ok(r.0))
    }
 }

@@ -34,9 +35,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyCharge {

 impl arg::ReadAll for OrgAsuslinuxDaemonNotifyCharge {
    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
-        Ok(OrgAsuslinuxDaemonNotifyCharge {
-            limit: i.read()?,
-        })
+        Ok(OrgAsuslinuxDaemonNotifyCharge { limit: i.read()? })
    }
 }

--- a/asus-nb/src/dbus_gfx.rs
+++ b/asus-nb/src/dbus_gfx.rs
@@ -1,5 +1,5 @@
 // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Gfx -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs
-use dbus as dbus;
+use dbus;
 #[allow(unused_imports)]
 use dbus::arg;
 use dbus::blocking;
@@ -10,20 +10,21 @@ pub trait OrgAsuslinuxDaemon {
    fn set_vendor(&self, vendor: &str) -> Result<(), dbus::Error>;
 }

-impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> {
-
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
    fn vendor(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "Vendor", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn power(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "Power", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn set_vendor(&self, vendor: &str) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetVendor", (vendor, ))
+        self.method_call("org.asuslinux.Daemon", "SetVendor", (vendor,))
    }
 }

@@ -40,9 +41,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyGfx {

 impl arg::ReadAll for OrgAsuslinuxDaemonNotifyGfx {
    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
-        Ok(OrgAsuslinuxDaemonNotifyGfx {
-            vendor: i.read()?,
-        })
+        Ok(OrgAsuslinuxDaemonNotifyGfx { vendor: i.read()? })
    }
 }

@@ -64,9 +63,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyAction {

 impl arg::ReadAll for OrgAsuslinuxDaemonNotifyAction {
    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
-        Ok(OrgAsuslinuxDaemonNotifyAction {
-            action: i.read()?,
-        })
+        Ok(OrgAsuslinuxDaemonNotifyAction { action: i.read()? })
    }
 }

--- a/asus-nb/src/dbus_ledmode.rs
+++ b/asus-nb/src/dbus_ledmode.rs
@@ -1,5 +1,5 @@
 // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/Led -m None`, see https://github.com/diwic/dbus-rs
-use dbus as dbus;
+use dbus;
 #[allow(unused_imports)]
 use dbus::arg;
 use dbus::blocking;
@@ -13,10 +13,11 @@ pub trait OrgAsuslinuxDaemon {
    fn led_brightness(&self) -> Result<i16, dbus::Error>;
 }

-impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> {
-
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
    fn set_led_mode(&self, data: &str) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetLedMode", (data, ))
+        self.method_call("org.asuslinux.Daemon", "SetLedMode", (data,))
    }

    fn next_led_mode(&self) -> Result<(), dbus::Error> {
@@ -29,17 +30,17 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslin

    fn led_mode(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "LedMode", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn led_modes(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "LedModes", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn led_brightness(&self) -> Result<i16, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "LedBrightness", ())
-            .and_then(|r: (i16, )| Ok(r.0, ))
+            .and_then(|r: (i16,)| Ok(r.0))
    }
 }

@@ -56,9 +57,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyLed {

 impl arg::ReadAll for OrgAsuslinuxDaemonNotifyLed {
    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
-        Ok(OrgAsuslinuxDaemonNotifyLed {
-            data: i.read()?,
-        })
+        Ok(OrgAsuslinuxDaemonNotifyLed { data: i.read()? })
    }
 }

--- a/asus-nb/src/dbus_profile.rs
+++ b/asus-nb/src/dbus_profile.rs
@@ -1,5 +1,5 @@
 // This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -p /org/asuslinux/Profile -m None -f org.asuslinux.Daemon -c blocking`, see https://github.com/diwic/dbus-rs
-use dbus as dbus;
+use dbus;
 #[allow(unused_imports)]
 use dbus::arg;
 use dbus::blocking;
@@ -12,10 +12,11 @@ pub trait OrgAsuslinuxDaemon {
    fn profiles(&self) -> Result<String, dbus::Error>;
 }

-impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslinuxDaemon for blocking::Proxy<'a, C> {
-
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
    fn set_profile(&self, profile: &str) -> Result<(), dbus::Error> {
-        self.method_call("org.asuslinux.Daemon", "SetProfile", (profile, ))
+        self.method_call("org.asuslinux.Daemon", "SetProfile", (profile,))
    }

    fn next_profile(&self) -> Result<(), dbus::Error> {
@@ -24,17 +25,17 @@ impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target=T>> OrgAsuslin

    fn active_profile_name(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "ActiveProfileName", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn profile(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "Profile", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }

    fn profiles(&self) -> Result<String, dbus::Error> {
        self.method_call("org.asuslinux.Daemon", "Profiles", ())
-            .and_then(|r: (String, )| Ok(r.0, ))
+            .and_then(|r: (String,)| Ok(r.0))
    }
 }

@@ -51,9 +52,7 @@ impl arg::AppendAll for OrgAsuslinuxDaemonNotifyProfile {

 impl arg::ReadAll for OrgAsuslinuxDaemonNotifyProfile {
    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
-        Ok(OrgAsuslinuxDaemonNotifyProfile {
-            profile: i.read()?,
-        })
+        Ok(OrgAsuslinuxDaemonNotifyProfile { profile: i.read()? })
    }
 }

--- a/asus-nb/src/dbus_rogbios.rs
+++ b/asus-nb/src/dbus_rogbios.rs
@@ -0,0 +1,86 @@
+// This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/RogBios -m None -o asus-nb/src/dbus_rogbios.rs`, see https://github.com/diwic/dbus-rs
+use dbus;
+#[allow(unused_imports)]
+use dbus::arg;
+use dbus::blocking;
+
+pub trait OrgAsuslinuxDaemon {
+    fn set_dedicated_graphic_mode(&self, dedicated: bool) -> Result<(), dbus::Error>;
+    fn dedicated_graphic_mode(&self) -> Result<i16, dbus::Error>;
+    fn set_post_boot_sound(&self, on: bool) -> Result<(), dbus::Error>;
+    fn post_boot_sound(&self) -> Result<i16, dbus::Error>;
+}
+
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
+    fn set_dedicated_graphic_mode(&self, dedicated: bool) -> Result<(), dbus::Error> {
+        self.method_call(
+            "org.asuslinux.Daemon",
+            "SetDedicatedGraphicMode",
+            (dedicated,),
+        )
+    }
+
+    fn dedicated_graphic_mode(&self) -> Result<i16, dbus::Error> {
+        self.method_call("org.asuslinux.Daemon", "DedicatedGraphicMode", ())
+            .and_then(|r: (i16,)| Ok(r.0))
+    }
+
+    fn set_post_boot_sound(&self, on: bool) -> Result<(), dbus::Error> {
+        self.method_call("org.asuslinux.Daemon", "SetPostBootSound", (on,))
+    }
+
+    fn post_boot_sound(&self) -> Result<i16, dbus::Error> {
+        self.method_call("org.asuslinux.Daemon", "PostBootSound", ())
+            .and_then(|r: (i16,)| Ok(r.0))
+    }
+}
+
+#[derive(Debug)]
+pub struct OrgAsuslinuxDaemonNotifyDedicatedGraphicMode {
+    pub dedicated: bool,
+}
+
+impl arg::AppendAll for OrgAsuslinuxDaemonNotifyDedicatedGraphicMode {
+    fn append(&self, i: &mut arg::IterAppend) {
+        arg::RefArg::append(&self.dedicated, i);
+    }
+}
+
+impl arg::ReadAll for OrgAsuslinuxDaemonNotifyDedicatedGraphicMode {
+    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
+        Ok(OrgAsuslinuxDaemonNotifyDedicatedGraphicMode {
+            dedicated: i.read()?,
+        })
+    }
+}
+
+impl dbus::message::SignalArgs for OrgAsuslinuxDaemonNotifyDedicatedGraphicMode {
+    const NAME: &'static str = "NotifyDedicatedGraphicMode";
+    const INTERFACE: &'static str = "org.asuslinux.Daemon";
+}
+
+#[derive(Debug)]
+pub struct OrgAsuslinuxDaemonNotifyPostBootSound {
+    pub dedicated: bool,
+}
+
+impl arg::AppendAll for OrgAsuslinuxDaemonNotifyPostBootSound {
+    fn append(&self, i: &mut arg::IterAppend) {
+        arg::RefArg::append(&self.dedicated, i);
+    }
+}
+
+impl arg::ReadAll for OrgAsuslinuxDaemonNotifyPostBootSound {
+    fn read(i: &mut arg::Iter) -> Result<Self, arg::TypeMismatchError> {
+        Ok(OrgAsuslinuxDaemonNotifyPostBootSound {
+            dedicated: i.read()?,
+        })
+    }
+}
+
+impl dbus::message::SignalArgs for OrgAsuslinuxDaemonNotifyPostBootSound {
+    const NAME: &'static str = "NotifyPostBootSound";
+    const INTERFACE: &'static str = "org.asuslinux.Daemon";
+}
--- a/asus-nb/src/dbus_supported.rs
+++ b/asus-nb/src/dbus_supported.rs
@@ -0,0 +1,18 @@
+// This code was autogenerated with `dbus-codegen-rust -s -d org.asuslinux.Daemon -f org.asuslinux.Daemon -c blocking -p /org/asuslinux/Supported -m None -o asus-nb/src/dbus_supported.rs`, see https://github.com/diwic/dbus-rs
+use dbus;
+#[allow(unused_imports)]
+use dbus::arg;
+use dbus::blocking;
+
+pub trait OrgAsuslinuxDaemon {
+    fn supported_functions(&self) -> Result<String, dbus::Error>;
+}
+
+impl<'a, T: blocking::BlockingSender, C: ::std::ops::Deref<Target = T>> OrgAsuslinuxDaemon
+    for blocking::Proxy<'a, C>
+{
+    fn supported_functions(&self) -> Result<String, dbus::Error> {
+        self.method_call("org.asuslinux.Daemon", "SupportedFunctions", ())
+            .and_then(|r: (String,)| Ok(r.0))
+    }
+}
--- a/asus-nb/src/lib.rs
+++ b/asus-nb/src/lib.rs
@@ -23,13 +23,15 @@ pub mod anime_dbus;
 /// Helper functions for the AniMe display
 pub mod anime_matrix;

+pub mod error;
+
+pub mod dbus_anime;
+pub mod dbus_charge;
 pub mod dbus_gfx;
 pub mod dbus_ledmode;
 pub mod dbus_profile;
-pub mod dbus_charge;
-pub mod dbus_anime;
-
-pub mod error;
+pub mod dbus_rogbios;
+pub mod dbus_supported;

 // static LED_INIT1: [u8; 2] = [0x5d, 0xb9];
 // static LED_INIT2: &str = "]ASUS Tech.Inc."; // ] == 0x5d
--- a/asus-nb/src/profile.rs
+++ b/asus-nb/src/profile.rs
@@ -75,7 +75,7 @@ fn parse_fan_curve(data: &str) -> Result<Curve, String> {
 #[derive(Debug, Clone, Options, Serialize, Deserialize)]
 pub struct ProfileCommand {
    #[options(help = "print help message")]
-    help: bool,
+    pub help: bool,
    #[options(help = "toggle to next profile in list")]
    pub next: bool,
    #[options(help = "create the profile if it doesn't exist")]
--- a/asus-notify/Cargo.toml
+++ b/asus-notify/Cargo.toml
@@ -11,7 +11,11 @@ edition = "2018"
 serde = "^1.0"
 serde_derive = "^1.0"
 serde_json = "^1.0"
-notify-rust = "^4.0.0"
 dbus = { version = "^0.8" }
 asus-nb = { path = "../asus-nb" }
-asus-nb-ctrl = { path = "../asus-nb-ctrl" }
+asus-nb-ctrl = { path = "../asus-nb-ctrl" }
+
+[dependencies.notify-rust]
+version = "^4.0.0"
+default-features = false
+features = ["z"]
--- a/asus-notify/src/main.rs
+++ b/asus-notify/src/main.rs
@@ -7,7 +7,7 @@ use std::time::Duration;

 fn main() -> Result<(), Box<dyn std::error::Error>> {
    println!("Version {}", env!("CARGO_PKG_VERSION"));
-    
+
    let mut cfg = Config::read_new()?;
    let mut last_profile = String::new();

@@ -83,7 +83,11 @@ fn do_thermal_notif(profile: &Profile, label: &str) -> Result<NotificationHandle
    };
    let x = Notification::new()
        .summary("ASUS ROG")
-        .body(&format!("Thermal profile changed to {}, turbo {}", label.to_uppercase(), turbo))
+        .body(&format!(
+            "Thermal profile changed to {}, turbo {}",
+            label.to_uppercase(),
+            turbo
+        ))
        .hint(Hint::Resident(true))
        .timeout(2000)
        .hint(Hint::Category("device".into()))
--- a/ctrl-gfx/Cargo.toml
+++ b/ctrl-gfx/Cargo.toml
@@ -1,19 +0,0 @@
-[package]
-name = "ctrl-gfx"
-version = "2.1.3"
-license = "MPL-2.0"
-readme = "README.md"
-authors = ["Luke <luke@ljones.dev>"]
-description = "Fine control of laptop GPU"
-edition = "2018"
-
-[dependencies]
-sysfs-class = "^0.1.2"
-log = "^0.4"
-
-zbus = { version = "1.1.1", optional = true }
-zvariant = { version = "2.2.0", optional = true }
-
-[features]
-default = ["use-zbus"]
-use-zbus = ["zbus", "zvariant"]
--- a/data/asusd-ledmodes.toml
+++ b/data/asusd-ledmodes.toml
@@ -8,6 +8,11 @@ prod_family = "Zephyrus M"
 board_names = ["GU502GV"]
 led_modes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 255]

+[[led_modes]]
+prod_family = "ROG Zephyrus M15"
+board_names = ["GU502LW"]
+led_modes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 255]
+
 [[led_modes]]
 prod_family = "Zephyrus"
 board_names = ["GM501GM", "GX531"]
Author	SHA1	Message	Date
Luke Jones	b3a555cab9	Merge branch 'fluke/asus_bios_settings' into 'next' Bugfixes and improvements Closes #48 See merge request asus-linux/asus-nb-ctrl!17	2021-01-27 01:16:39 +00:00
Luke	cf13b4f71b	Bugfixes and improvements - fix CLI feedback for reboot/restartx. Update readme - dracut force driver include for nvidia dedicated - change fan-mode CLI tag Closes #48	2021-01-27 14:13:02 +13:00
Luke Jones	cd0b9fe350	Merge branch 'fluke/asus_bios_settings' into 'next' Fluke/asus bios settings See merge request asus-linux/asus-nb-ctrl!15	2021-01-26 08:08:13 +00:00
Luke	82900f4645	CLI args for bios. Cleanup and improve - dbus method for 'supported modes' - add dedicated gfx safety - bring ctrl-gfx back in to main control for better integration - safely upgrade config files	2021-01-26 21:07:19 +13:00
Luke	703bba9ffd	Correct changelog	2021-01-10 22:34:45 +13:00
Luke Jones	73706154a4	Merge branch 'fluke/fixes' into 'next' Fixes See merge request asus-linux/asus-nb-ctrl!14	2021-01-10 09:31:46 +00:00
Luke	c9b2a0c777	Fixes - Adjust gfx controller to assume that the graphics driver is loaded if the mode is set for nvidia/hybrid - Small code adjustments for error handling	2021-01-10 22:27:56 +13:00
Luke	54cc51fe5d	Minor update to deps	2021-01-09 13:48:13 +13:00
Luke	81645d0777	Update deps and fmt	2021-01-09 13:42:46 +13:00
Luke Jones	d61c180ee5	Update discord link	2020-12-20 21:21:53 +00:00
Luke Jones	a668800fd9	Merge branch 'asere/anime_better_options' into 'next' Better anime options & gumdrop error Display See merge request asus-linux/asus-nb-ctrl!12	2020-12-20 21:18:51 +00:00
Asere	3bdc11c994	Better anime options & gumdrop error Display	2020-11-25 18:37:36 +01:00
Luke Jones	b496139063	Merge branch 'StaticRocket-next-patch-05672' into 'next' Update paths and variables to follow GNU Make standards See merge request asus-linux/asus-nb-ctrl!13	2020-11-08 00:17:44 +00:00
Randolph Sapp	607483629a	Don't rebuild during install Rebuild during all	2020-11-08 00:17:44 +00:00
Luke D Jones	5c8d138cef	Update readme	2020-10-25 20:37:53 +13:00
Luke D Jones	e3db1f7c4c	Add notification dbus signal for aura next/prev	2020-10-25 19:34:40 +13:00