From 4ad2bf71ca60791a4f071f916edd027a90e25278 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Dec 2024 11:07:07 +0100 Subject: [PATCH 1/3] refactor: add overlay stub --- flake.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 947b031..f25df5d 100644 --- a/flake.nix +++ b/flake.nix @@ -46,8 +46,18 @@ ]; perSystem = - { pkgs, inputs' , ... }: + { pkgs, inputs' , system, lib, ... }: { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ + (final: prev: { + # overlay here + }) + ]; + config = { }; + }; + devShells = rec { default = pkgs.mkShellNoCC { packages = ci.nativeBuildInputs; }; From 80d92e5c1f6c04e567a7e496a2b2fb6cee0d4002 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Dec 2024 11:07:30 +0100 Subject: [PATCH 2/3] fix(example): set bluetoothMac --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index f25df5d..caa77d0 100644 --- a/flake.nix +++ b/flake.nix @@ -96,6 +96,8 @@ nixos-x13s.enable = true; nixos-x13s.kernel = "jhovold"; # jhovold is default + nixos-x13s.bluetoothMac = "02:68:b3:29:da:98"; + # allow unfree firmware nixpkgs.config.allowUnfree = true; From b116d698f4b531a7577ccb875ca6a8106b9d63ee Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 5 Dec 2024 11:07:42 +0100 Subject: [PATCH 3/3] fix(nixpkgs): use fork with cpupower fix --- flake.lock | 12 ++++++------ flake.nix | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index fa922aa..4e3e6f2 100644 --- a/flake.lock +++ b/flake.lock @@ -37,16 +37,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", - "owner": "NixOS", + "lastModified": 1733393026, + "narHash": "sha256-hpUyV0NHnIZpFzN6p7udW6Jh+m9tlLvCcNf1/wG5pQY=", + "owner": "steveej-forks", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "b1714b7f9e5761ad965a4df7602105f1e159b89e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "steveej-forks", + "ref": "steveej-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index caa77d0..01daa7c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:steveej-forks/nixpkgs/steveej-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; linux-jhovold.url = "github:jhovold/linux/wip/sc8280xp-6.13-rc1";