diff --git a/flake.lock b/flake.lock index 4e3e6f2..fa922aa 100644 --- a/flake.lock +++ b/flake.lock @@ -37,16 +37,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733393026, - "narHash": "sha256-hpUyV0NHnIZpFzN6p7udW6Jh+m9tlLvCcNf1/wG5pQY=", - "owner": "steveej-forks", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1714b7f9e5761ad965a4df7602105f1e159b89e", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { - "owner": "steveej-forks", - "ref": "steveej-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 01daa7c..947b031 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { - nixpkgs.url = "github:steveej-forks/nixpkgs/steveej-unstable"; - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-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"; @@ -47,18 +46,8 @@ ]; perSystem = - { pkgs, inputs' , system, lib, ... }: + { pkgs, inputs' , ... }: { - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - (final: prev: { - # overlay here - }) - ]; - config = { }; - }; - devShells = rec { default = pkgs.mkShellNoCC { packages = ci.nativeBuildInputs; }; @@ -97,8 +86,6 @@ 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;