diff --git a/flake.lock b/flake.lock index 39e234b..c09742c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "acer-wmi-ext": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776998627, + "narHash": "sha256-n0ENc4Xi1d3ApoHTRsfssC6AAroFgIKXJzJFykxNanY=", + "owner": "Lumpiasty", + "repo": "acer-wmi-ext", + "rev": "d0be381bbd661ed4bb327a9c92b980a0b9edacac", + "type": "github" + }, + "original": { + "owner": "Lumpiasty", + "ref": "main", + "repo": "acer-wmi-ext", + "type": "github" + } + }, "cf": { "locked": { "lastModified": 1756852014, @@ -340,6 +361,7 @@ }, "root": { "inputs": { + "acer-wmi-ext": "acer-wmi-ext", "claude-code": "claude-code", "home-manager": "home-manager", "lanzaboote": "lanzaboote", diff --git a/flake.nix b/flake.nix index 328dc78..3c3b25c 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,10 @@ url = "git+ssh://git@gitea.lumpiasty.xyz/Lumpiasty/peerix.git"; # fork of github:sophronesis/peerix inputs.nixpkgs.follows = "nixpkgs"; }; + acer-wmi-ext = { + url = "github:Lumpiasty/acer-wmi-ext/main"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixos-hardware, ... }@inputs: diff --git a/lib/mkNixosSystem.nix b/lib/mkNixosSystem.nix index c90ef7b..af6b0d8 100644 --- a/lib/mkNixosSystem.nix +++ b/lib/mkNixosSystem.nix @@ -8,6 +8,7 @@ claude-code, nix-sweep, peerix, + acer-wmi-ext, ... }: hardwareConfig: hostConfig: @@ -17,10 +18,14 @@ nixpkgs.lib.nixosSystem { specialArgs = { inherit nix-flatpak; inherit plasma-manager; + inherit acer-wmi-ext; }; modules = [ { - nixpkgs.overlays = [ claude-code.overlays.default ]; + nixpkgs.overlays = [ + claude-code.overlays.default + acer-wmi-ext.overlays.default + ]; nix.settings = { substituters = [ "https://claude-code.cachix.org" ]; trusted-public-keys = [ "claude-code.cachix.org-1:YeXf2aNu7UTX8Vwrze0za1WEDS+4DuI2kVeWEE4fsRk=" ]; diff --git a/overlays/pkgs.nix b/overlays/pkgs.nix index e7fd8dd..3cfea2a 100644 --- a/overlays/pkgs.nix +++ b/overlays/pkgs.nix @@ -1,7 +1,4 @@ self: super: { opencode-claude-auth = super.callPackage ../pkgs/opencode-claude-auth {}; - linuxPackages = super.linuxPackages.extend (lpself: lpsuper: { - acer-wmi-ext = lpsuper.callPackage ../pkgs/acer-wmi-ext {}; - }); } \ No newline at end of file diff --git a/pkgs/acer-wmi-ext/default.nix b/pkgs/acer-wmi-ext/default.nix deleted file mode 100644 index 9bf00c3..0000000 --- a/pkgs/acer-wmi-ext/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Custom module for Acer WMI features, like battery charge limit and fan control -{ - lib, - stdenv, - fetchFromGitHub, - kernel -}: - -stdenv.mkDerivation { - pname = "acer-wmi-ext"; - version = "0.0.0"; - - src = fetchFromGitHub { - owner = "Lumpiasty"; - repo = "acer-wmi-ext"; - rev = "71bc84f4729eb53e7786aaed37957c6d91ce0cfd"; - sha256 = "sha256-eMKEVgEFaBB1oDL5mlmnJyEj24jzi8HsISl3cCzstD8="; - }; - - nativeBuildInputs = [ kernel.moduleBuildDependencies ]; - - # Makefile provided in repo is useless, hardcoded paths, not using it - - setSourceRoot = '' - export sourceRoot=$(pwd)/source - ''; - - makeFlags = [ - "-C" - "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "M=$(sourceRoot)" - ]; - - buildFlags = [ "modules" ]; - installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; - installTargets = [ "modules_install" ]; - - meta = { - description = "Acer WMI kernel module for battery charge limit and fan control"; - homepage = "https://github.com/TenSeventy7/acer-wmi-ext"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - }; -}