diff --git a/flake.lock b/flake.lock index 2e67468..1b91de5 100644 --- a/flake.lock +++ b/flake.lock @@ -252,7 +252,7 @@ "locked": { "lastModified": 1716827240, "narHash": "sha256-0LHXNvx7KEsn3j9w/4VtQiEWKrqJmmWn1k/169x/N04=", - "ref": "refs/heads/main", + "ref": "f8a243d7e9db4689bcfc7726df75d5725daf4b60", "rev": "f8a243d7e9db4689bcfc7726df75d5725daf4b60", "revCount": 40, "type": "git", @@ -265,18 +265,18 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716881121, - "narHash": "sha256-oTf3enbe/lbiNzsyZ8ria+422hx4e/FB3xQcY2LPnJw=", + "lastModified": 1717000136, + "narHash": "sha256-MyFE1416Wsb9UxTNiHTGoOvtUl5JuCftj4EBfz9oPHU=", "ref": "master", - "rev": "806e9d4a933dd1e75592e88894d4bd2f296f5bbf", - "revCount": 1694, + "rev": "2575b7552f52b34dadb08f140326fbbd19056355", + "revCount": 1685, "type": "git", - "url": "https://github.com/NixOS/nixos-hardware" + "url": "https://code.8bitbuddhism.com/aires/nixos-hardware" }, "original": { "ref": "master", "type": "git", - "url": "https://github.com/NixOS/nixos-hardware" + "url": "https://code.8bitbuddhism.com/aires/nixos-hardware" } }, "nixpkgs": { @@ -313,11 +313,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716793392, - "narHash": "sha256-ex3nO87EEQhshXd19QSVW5UIXL0pbPuew4q8TdEJQBY=", + "lastModified": 1716966868, + "narHash": "sha256-I5dlFm936SkuUu9haYabEBCUPeX6EuXLT1uFkEM/lbY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "67a8b308bae9c26be660ccceff3e53a65e01afe1", + "rev": "fafeae3d248c41c6c8a2ab5e09f9e2d3de706ef8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9b7b06a..4b9eb0e 100644 --- a/flake.nix +++ b/flake.nix @@ -25,8 +25,8 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Hardware configurations - #nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master"; - nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master"; + nixos-hardware.url = "git+https://code.8bitbuddhism.com/aires/nixos-hardware?ref=master"; + #nixos-hardware.url = "git+https://github.com/NixOS/nixos-hardware?ref=master"; # Home-manager home-manager = { diff --git a/hosts/Shura/bluetooth/vitrix-pdp-pro-params b/hosts/Shura/bluetooth/vitrix-pdp-pro-params new file mode 100644 index 0000000..25a32b9 --- /dev/null +++ b/hosts/Shura/bluetooth/vitrix-pdp-pro-params @@ -0,0 +1,42 @@ +[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 a7b20a3..546befb 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -15,6 +15,9 @@ let 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; @@ -75,6 +78,7 @@ in "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/F4:6A:D7:3A:16:75/info - - - - ${xbox-elite-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}" ]; # Configure the virtual machine created by nixos-rebuild build-vm