diff --git a/flake.lock b/flake.lock
index cfd9e71..ed0cc9a 100755
--- a/flake.lock
+++ b/flake.lock
@@ -54,6 +54,31 @@
         "type": "github"
       }
     },
+    "chaotic": {
+      "inputs": {
+        "flake-schemas": "flake-schemas",
+        "home-manager": "home-manager",
+        "jovian": "jovian",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1780415250,
+        "narHash": "sha256-St4tdYQziDgytYTTb+a5DAYRMph+m0K2MK/O+CKhM5U=",
+        "owner": "chaotic-cx",
+        "repo": "nyx",
+        "rev": "a4b6649ef062e978bfc69500f54d92c195b741c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "chaotic-cx",
+        "ref": "nyxpkgs-unstable",
+        "repo": "nyx",
+        "type": "github"
+      }
+    },
     "copetch": {
       "inputs": {
         "nixpkgs": [
@@ -185,15 +210,16 @@
     "home-manager": {
       "inputs": {
         "nixpkgs": [
+          "chaotic",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780408569,
-        "narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=",
+        "lastModified": 1780370888,
+        "narHash": "sha256-PRJj9RKTEf/sITycujP1c/BrvLJKMYXzcpwTsXNulXQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f384af1bec6423a0d4ba1855917ab948f64e5808",
+        "rev": "a7a415883195ffbd4dabec8f098f201e6eaaadf8",
         "type": "github"
       },
       "original": {
@@ -205,16 +231,15 @@
     "home-manager_2": {
       "inputs": {
         "nixpkgs": [
-          "nyx-loner",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780342707,
-        "narHash": "sha256-wQ56uDoEMaZ9XPHCtSUEGn6beBO7Egy6sCT0N/NM4Fo=",
+        "lastModified": 1780408569,
+        "narHash": "sha256-s7Tv6FUQThRAvW8En8XVC6HMb0uiikzVccCcCo9u/Bg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5a608a621b001922dd708ca51a6260d5bef9e29b",
+        "rev": "f384af1bec6423a0d4ba1855917ab948f64e5808",
         "type": "github"
       },
       "original": {
@@ -597,16 +622,16 @@
       "inputs": {
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": [
-          "nyx-loner",
+          "chaotic",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780129573,
-        "narHash": "sha256-6/S2FvBz+dxEgPfRU7dK+ycLYzRU7L8aN+GjDRyVs/E=",
+        "lastModified": 1780389805,
+        "narHash": "sha256-G3Ev/ScG2g19QSrW3GzY+giPU1RK4+GBtFhJopXGkCU=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "8f97d1dee8c0971b01cd6b17ccf913e8bb70f5d5",
+        "rev": "811a2724d8335b86f32973c5e0fd2a9b5797d1fa",
         "type": "github"
       },
       "original": {
@@ -639,7 +664,7 @@
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
-          "nyx-loner",
+          "chaotic",
           "jovian",
           "nixpkgs"
         ]
@@ -735,30 +760,6 @@
         "type": "github"
       }
     },
-    "nyx-loner": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "home-manager": "home-manager_2",
-        "jovian": "jovian",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1780425697,
-        "narHash": "sha256-TEyWArbUnLAvtdUYbnseFXTo4csEyoAh75gAQED06vw=",
-        "owner": "lonerOrz",
-        "repo": "nyx-loner",
-        "rev": "7e9aad598c4a8e0230062c87d3baf8fe2a339877",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lonerOrz",
-        "repo": "nyx-loner",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -785,31 +786,31 @@
     "root": {
       "inputs": {
         "Hyprspace": "Hyprspace",
+        "chaotic": "chaotic",
         "copetch": "copetch",
         "helium": "helium",
-        "home-manager": "home-manager",
+        "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "nix-darwin": "nix-darwin",
         "nixpkgs": "nixpkgs_2",
         "noctalia": "noctalia",
-        "nyx-loner": "nyx-loner",
         "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
-          "nyx-loner",
+          "chaotic",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1780284119,
-        "narHash": "sha256-y2wR4Mk6D/N1ID4FZa2oUMStCUxyIoRzmgOOpLzoWmo=",
+        "lastModified": 1780370483,
+        "narHash": "sha256-7mDa7OBAaf7MU6ZovT9ENfD62kH911SsSazBb4KTDF0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "51390d0bfca0a68a8c337d215a4bbeddc2ca616e",
+        "rev": "4a408e1fc99ad517b4cb402fd0de7464f40c05e1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ad046e1..1423cc5 100755
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nyx-loner = {
-      url = "github:lonerOrz/nyx-loner";
+    chaotic = {
+      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-darwin = {
@@ -48,7 +48,7 @@
       nixpkgs,
       nix-darwin,
       home-manager,
-      nyx-loner,
+      chaotic,
       ...
     }:
     let
@@ -64,7 +64,7 @@
         modules = [
           { nixpkgs.hostPlatform = linuxSystem; }
           home-manager.nixosModules.home-manager
-          nyx-loner.nixosModules.default
+          chaotic.nixosModules.default
           {
             nixpkgs.config.allowUnfree = true;
             home-manager = {
diff --git a/modules/nixos/boot/default.nix b/modules/nixos/boot/default.nix
index f7605d5..b0be544 100755
--- a/modules/nixos/boot/default.nix
+++ b/modules/nixos/boot/default.nix
@@ -8,8 +8,7 @@
   ];
 
   environment.systemPackages = [ pkgs.efibootmgr ];
-
-  boot.kernelPackages = pkgs.linuxPackages_cachyos-lto;
+  boot.kernelPackages = pkgs.linuxPackages_cachyos;
 
   boot.kernelParams = [
     "preempt=full"
diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix
index 0d1fb8f..7561478 100755
--- a/modules/nixos/system/nix/default.nix
+++ b/modules/nixos/system/nix/default.nix
@@ -16,7 +16,7 @@
       "https://ezkea.cachix.org"
       "https://noctalia.cachix.org"
       "https://hyprland.cachix.org"
-      "https://cache.garnix.io"
+      "https://nyx-cache.chaotic.cx/"
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
@@ -24,7 +24,7 @@
       "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
       "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+      "nyx-cache.chaotic.cx:dJxTrgMC3V3cFfyIiBQDQorG6k1LsqurH/srpMSq7qk="
     ];
   };