From 814f8a0b4f485be855c81973d257186a8fa5f22f Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 29 Mar 2025 16:08:13 -0400 Subject: [PATCH 1/2] Revert "overlay to fix rtl8821ce" This reverts commit 21647634d3f06756a98902182cd5870eb01f87e4. --- flake.lock | 17 ----------------- flake.nix | 1 - hosts/ytnix/default.nix | 2 ++ overlay/default.nix | 3 --- 4 files changed, 2 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 79a60dd..ebf3a62 100644 --- a/flake.lock +++ b/flake.lock @@ -762,22 +762,6 @@ "type": "github" } }, - "nixpkgs-rtl8821ce": { - "locked": { - "lastModified": 1743276155, - "narHash": "sha256-58M8lZwf07NZA+rfqF4S7XBAchBaqLayXCmlCn3XUMQ=", - "owner": "cything", - "repo": "nixpkgs", - "rev": "b1a1a918e0f3b30085441fd246b52b572057e919", - "type": "github" - }, - "original": { - "owner": "cything", - "ref": "rtl8821ce-6.14", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -980,7 +964,6 @@ "nix-index-database": "nix-index-database", "nix-ld": "nix-ld", "nixpkgs": "nixpkgs_4", - "nixpkgs-rtl8821ce": "nixpkgs-rtl8821ce", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", diff --git a/flake.nix b/flake.nix index 21db059..b76d3e1 100644 --- a/flake.nix +++ b/flake.nix @@ -91,7 +91,6 @@ flake-utils.follows = "flake-utils"; }; }; - nixpkgs-rtl8821ce.url = "github:cything/nixpkgs/rtl8821ce-6.14"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 733f136..eba3509 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -363,6 +363,8 @@ services.trezord.enable = true; + programs.niri.enable = false; + programs.niri.package = pkgs.niri-unstable; programs.xwayland.enable = true; services.udev.extraHwdb = '' diff --git a/overlay/default.nix b/overlay/default.nix index f61128b..f4a7353 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -23,9 +23,6 @@ in meta.mainProgram = "garage"; } ); - linuxPackages = prev.linuxPackages // { - rtl8821ce = nixpkgsFrom inputs.nixpkgs-rtl8821ce "linuxPackages.rtl8821ce"; - }; } ) ] From 0e428e8d688b53b8aa95f0fab88895a3de8cfb0f Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 29 Mar 2025 16:10:30 -0400 Subject: [PATCH 2/2] just change nixpkgs atp --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index ebf3a62..f000fd8 100644 --- a/flake.lock +++ b/flake.lock @@ -828,16 +828,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743256265, - "narHash": "sha256-1GJtabBAEwSkwKgSBe+osLCYwcRr5zx5H7ipuoVkO/4=", - "owner": "nixos", + "lastModified": 1743276155, + "narHash": "sha256-58M8lZwf07NZA+rfqF4S7XBAchBaqLayXCmlCn3XUMQ=", + "owner": "cything", "repo": "nixpkgs", - "rev": "5dab1e63b3efccf767a54b0b978b41fe7410aff0", + "rev": "b1a1a918e0f3b30085441fd246b52b572057e919", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", + "owner": "cything", + "ref": "rtl8821ce-6.14", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b76d3e1..31b2c6c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "cy's flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs.url = "github:cything/nixpkgs/rtl8821ce-6.14"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; sops-nix = { url = "github:Mic92/sops-nix";