diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 7ede8d4..2bf0350 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -5,6 +5,15 @@ on:
   pull_request:
 
 env:
+  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+  NIX_CONFIG: |
+    show-trace = true
+    experimental-features = nix-command flakes
+    accept-flake-config = true
+    system-features = nixos-test benchmark big-parallel kvm
+    secret-key-files = /home/runner/cache-priv-key.pem
+    extra-substituters = https://nixcache.cy7.sh
+    extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
   TERM: ansi
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
@@ -39,16 +48,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@v30
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            show-trace = true
-            experimental-features = nix-command flakes
-            accept-flake-config = true
-            system-features = nixos-test benchmark big-parallel kvm
-            secret-key-files = /home/runner/cache-priv-key.pem
-            extra-substituters = https://nixcache.cy7.sh
-            extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
 
       - name: Install Lix
         run: |
@@ -116,16 +115,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@v30
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            show-trace = true
-            experimental-features = nix-command flakes
-            accept-flake-config = true
-            system-features = nixos-test benchmark big-parallel kvm
-            secret-key-files = /home/runner/cache-priv-key.pem
-            extra-substituters = https://nixcache.cy7.sh
-            extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
 
       - name: Install Lix
         run: |
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index fea88fc..cd3c273 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -8,6 +8,14 @@ on:
         type: string
 
 env:
+  ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
+  NIX_CONFIG: |
+    show-trace = true
+    experimental-features = nix-command flakes
+    accept-flake-config = true
+    secret-key-files = /home/runner/cache-priv-key.pem
+    extra-substituters = https://nixcache.cy7.sh
+    extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
   TERM: ansi
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets. AWS_SECRET_ACCESS_KEY }}
@@ -32,16 +40,6 @@ jobs:
 
       - name: Install Nix
         uses: cachix/install-nix-action@v30
-        with:
-          enable_kvm: true
-          extra_nix_config: |
-            show-trace = true
-            experimental-features = nix-command flakes
-            accept-flake-config = true
-            system-features = nixos-test benchmark big-parallel kvm
-            secret-key-files = /home/runner/cache-priv-key.pem
-            extra-substituters = https://nixcache.cy7.sh
-            extra-trusted-public-keys = nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=
 
       - name: Install Lix
         run: |
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";
-      };
     }
   )
 ]