diff --git a/hosts/Shura/bluetooth/mano-touchpad-bluetooth-params b/hosts/Shura/bluetooth/mano-touchpad-bluetooth-params deleted file mode 100644 index 6e6be7a..0000000 --- a/hosts/Shura/bluetooth/mano-touchpad-bluetooth-params +++ /dev/null @@ -1,31 +0,0 @@ -[General] -Name=MANO-703UB V2_BLE -Appearance=0x03c1 -AddressType=static -SupportedTechnologies=LE; -Trusted=true -Blocked=false -WakeAllowed=true -Services=00001800-0000-1000-8000-00805f9b34fb;0000180a-0000-1000-8000-00805f9b34fb;0000180f-0000-1000-8000-00805f9b34fb;00001812-0000-1000-8000-00805f9b34fb;0000ff00-0000-1000-8000-00805f9b34fb; - -[ConnectionParameters] -MinInterval=6 -MaxInterval=6 -Latency=9 -Timeout=200 - -[IdentityResolvingKey] -Key=10943ED4C3FD489941E66426DB4C2479 - -[LongTermKey] -Key=9EEF52460DD57A878A1629B814361EDC -Authenticated=0 -EncSize=16 -EDiv=35588 -Rand=8974202121033153697 - -[DeviceID] -Source=2 -Vendor=8654 -Product=24577 -Version=17 diff --git a/hosts/Shura/bluetooth/shure-aonic-bluetooth-params b/hosts/Shura/bluetooth/shure-aonic-bluetooth-params deleted file mode 100644 index 94a2312..0000000 --- a/hosts/Shura/bluetooth/shure-aonic-bluetooth-params +++ /dev/null @@ -1,19 +0,0 @@ -[General] -Name=Shure AONIC TW2 -Class=0x2c0404 -SupportedTechnologies=BR/EDR;LE; -Trusted=true -Blocked=false -Services=00001101-0000-1000-8000-00805f9b34fb;00001108-0000-1000-8000-00805f9b34fb;0000110a-0000-1000-8000-00805f9b34fb;0000110b-0000-1000-8000-00805f9b34fb;0000110c-0000-1000-8000-00805f9b34fb;0000110d-0000-1000-8000-00805f9b34fb;0000110e-0000-1000-8000-00805f9b34fb;0000111e-0000-1000-8000-00805f9b34fb;0000eb03-d102-11e1-9b23-00025b00a5a5;0000eb04-d102-11e1-9b23-00025b00a5a5;0000eb05-d102-11e1-9b23-00025b00a5a5; -AddressType=public - -[LinkKey] -Key=DFC42899B038D6C6B1296CF98DB0508A -Type=4 -PINLength=0 - -[ConnectionParameters] -MinInterval=24 -MaxInterval=40 -Latency=0 -Timeout=400 diff --git a/hosts/Shura/bluetooth/vitrix-pdp-pro-params b/hosts/Shura/bluetooth/vitrix-pdp-pro-params deleted file mode 100644 index 25a32b9..0000000 --- a/hosts/Shura/bluetooth/vitrix-pdp-pro-params +++ /dev/null @@ -1,42 +0,0 @@ -[General] -Name=Victrix Pro BFG -Appearance=0x03c4 -AddressType=public -SupportedTechnologies=LE; -Trusted=true -Blocked=false -WakeAllowed=true -Services=00001800-0000-1000-8000-00805f9b34fb;00001801-0000-1000-8000-00805f9b34fb;0000180a-0000-1000-8000-00805f9b34fb;0000180f-0000-1000-8000-00805f9b34fb;00001812-0000-1000-8000-00805f9b34fb;00001813-0000-1000-8000-00805f9b34fb;f95a48e6-a721-11e9-a2a3-022ae2dbcce4; - -[LongTermKey] -Key=F12268049C72EA0561E2E77DEA02AC12 -Authenticated=0 -EncSize=16 -EDiv=29996 -Rand=5139827239406697411 - -[PeripheralLongTermKey] -Key=CC60B7A9080383302B61EC2127E0D5CD -Authenticated=0 -EncSize=16 -EDiv=59630 -Rand=6653202288716901387 - -[SlaveLongTermKey] -Key=CC60B7A9080383302B61EC2127E0D5CD -Authenticated=0 -EncSize=16 -EDiv=59630 -Rand=6653202288716901387 - -[DeviceID] -Source=2 -Vendor=3695 -Product=587 -Version=768 - -[ConnectionParameters] -MinInterval=6 -MaxInterval=6 -Latency=0 -Timeout=300 \ No newline at end of file diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index c923313..a64d2e7 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -4,17 +4,6 @@ let stateVersion = "24.05"; hostName = "Shura"; - # Copy bluetooth device configs - shure-aonic-bluetooth = pkgs.writeText "info" ( - builtins.readFile ./bluetooth/shure-aonic-bluetooth-params - ); - mano-touchpad-bluetooth = pkgs.writeText "info" ( - builtins.readFile ./bluetooth/mano-touchpad-bluetooth-params - ); - vitrix-pdp-pro-bluetooth = pkgs.writeText "info" ( - builtins.readFile ./bluetooth/vitrix-pdp-pro-params - ); - # Use gremlin user's monitor configuration for GDM (desktop monitor primary). See https://discourse.nixos.org/t/gdm-monitor-configuration/6356/4 monitorsXmlContent = builtins.readFile ./monitors.xml; monitorsConfig = pkgs.writeText "gdm_monitors.xml" monitorsXmlContent; @@ -130,12 +119,6 @@ in systemd.tmpfiles.rules = [ # Use gremlin user's monitor config for GDM (defined above) "L+ /run/gdm/.config/monitors.xml - - - - ${monitorsConfig}" - - # Install Bluetooth device profiles - "d /var/lib/bluetooth/AC:50:DE:9F:AB:88/ 0700 root root" # First, make sure the directory exists - "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:0E:DD:72:2F:0C/info - - - - ${shure-aonic-bluetooth}" - "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/F8:5D:3C:7D:9A:00/info - - - - ${mano-touchpad-bluetooth}" - "L+ /var/lib/bluetooth/AC:50:DE:9F:AB:88/00:34:30:47:37:AB/info - - - - ${vitrix-pdp-pro-bluetooth}" ]; }