From 5f9c39b5ff354a66c2b58ff1b043012dac2b2b98 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 11 Dec 2024 14:08:35 -0500 Subject: [PATCH] Enable bluetooth, fix wheel err --- flake.lock | 50 ++++++++++++++-------------- modules/common-desktop/bluetooth.nix | 1 + modules/common-desktop/wheel.nix | 15 ++------- 3 files changed, 28 insertions(+), 38 deletions(-) create mode 100644 modules/common-desktop/bluetooth.nix diff --git a/flake.lock b/flake.lock index 871fc6f..530bf54 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -215,11 +215,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1733101372, - "narHash": "sha256-mkyyBVPj8SIc01zEBX3gZ2ATJj8Fb06nxDME7pDxYQo=", + "lastModified": 1733821969, + "narHash": "sha256-JYAnT6hfRXdBNRCmhZa3XPFv19zbWXi8DDcY9AeNiQI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "094b2c4ee459dd5d3d1611c919d59f26110053b0", + "rev": "89887483a47f9e7e849d43e5992f9da54b3e8e0e", "type": "github" }, "original": { @@ -246,23 +246,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "lastModified": 1733376361, + "narHash": "sha256-aLJxoTDDSqB+/3orsulE6/qdlX6MzDLIITLZqdgMpqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "929116e316068c7318c54eb4d827f7d9756d5e9c", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -312,11 +312,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1733581612, - "narHash": "sha256-EDYI66HlP4fc8lSUFNKCEt9dNHnsyMQoTQyZu5Z/qzU=", + "lastModified": 1733919521, + "narHash": "sha256-/UkFfezRLg/MA6q5GXCAJMGl2EWESWor+PT+xnWylnU=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "64f9f53e3fa0ef6135622ba22172ea660bc4bda0", + "rev": "0da17397073b149cca1e96e217d5952b7221c198", "type": "github" }, "original": { @@ -353,11 +353,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1733510476, - "narHash": "sha256-RH/8yIuo+fNLCjQ6e1mnXwmmxymjvfWC9JcbDuIA8TM=", + "lastModified": 1733858997, + "narHash": "sha256-PMZdRUZQlouWgHFCFW8ANDFL6fUjZ67KAEaqRXwRwvc=", "owner": "danth", "repo": "stylix", - "rev": "e309d64fe7f203274a7913e1d2b74307d15ba122", + "rev": "bc25f3d69d3bb54548b772d7c2771e65cc37dc10", "type": "github" }, "original": { diff --git a/modules/common-desktop/bluetooth.nix b/modules/common-desktop/bluetooth.nix new file mode 100644 index 0000000..193a0bb --- /dev/null +++ b/modules/common-desktop/bluetooth.nix @@ -0,0 +1 @@ +{lib, ...}: {hardware.bluetooth.enable = lib.mkForce true;} diff --git a/modules/common-desktop/wheel.nix b/modules/common-desktop/wheel.nix index 3e9652d..0a097dc 100644 --- a/modules/common-desktop/wheel.nix +++ b/modules/common-desktop/wheel.nix @@ -1,17 +1,6 @@ {pkgs, ...}: { - boot.extraModulePackages = [ - (pkgs.linuxKernel.packages.linux_zen.hid-tmff2.overrideAttrs - (prev: { - src = pkgs.fetchFromGitHub { - owner = "Kimplul"; - repo = "hid-tmff2"; - rev = "cc4226299569b5a1402c0b937c6b3a2e0f246af4"; - hash = "sha256-Hv6eLbf5K9qGhweKHHf7IpZaCFsLMCvC0vxBapQOSpQ="; - fetchSubmodules = true; - }; - })) - ]; + # boot.extraModulePackages = [pkgs.linuxKernel.packages.linux_zen.hid-tmff2]; environment.systemPackages = with pkgs; [oversteer linuxConsoleTools]; - services.udev.packages = [pkgs.oversteer]; + # services.udev.packages = [pkgs.oversteer]; }