From 2020fe7d4f8df707a5384840e99b6253364c2bbd Mon Sep 17 00:00:00 2001 From: Crony Akatsuki Date: Sun, 25 Jan 2026 10:35:17 +0100 Subject: [PATCH] feat: cahotic nyx archived, move to xddxdd flake for cachyos kernel. --- flake.lock | 254 +++++++++++++++++----------------- flake.nix | 9 +- helpers.nix | 1 - hosts/skadi/configuration.nix | 5 +- 4 files changed, 131 insertions(+), 138 deletions(-) diff --git a/flake.lock b/flake.lock index f82f103..5da2621 100644 --- a/flake.lock +++ b/flake.lock @@ -166,28 +166,35 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", - "jovian": "jovian", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, + "cachyos-kernel": { + "flake": false, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "lastModified": 1769201405, + "narHash": "sha256-k/KQL7J9ZnLlF28E6ywGpfo5dxkuxCcEtJ/XEZDTw3M=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "ff53672af48a106f52857d62c9275b165cc452ef", "type": "github" }, "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1769199354, + "narHash": "sha256-y1DKMryOr1w4xcZnDkaZjvENIPmr3j/YB4Srtfd3I2Y=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "c8b990198baf3c34b64e4e5c5ffeb7c068eede1a", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", "type": "github" } }, @@ -457,6 +464,22 @@ "type": "github" } }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -482,6 +505,24 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, + "locked": { + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, "locked": { "lastModified": 1765835352, "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", @@ -496,7 +537,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -517,20 +558,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -903,27 +930,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -943,7 +949,7 @@ "type": "github" } }, - "home-manager_4": { + "home-manager_3": { "inputs": { "nixpkgs": [ "zen-browser", @@ -1416,28 +1422,6 @@ "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -1445,7 +1429,7 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay_3" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1765382359, @@ -1544,6 +1528,29 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat_9", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1769276850, + "narHash": "sha256-F9yejGB16LItrZORuWzVxCAuwVInltuhYL/2EwhKXwk=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "df9b9eb25f5bec9e7b3a124242edea5bc09b0bf6", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -1585,8 +1592,8 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6" + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1768062066, @@ -1602,29 +1609,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1736,6 +1720,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1767313136, @@ -1817,6 +1816,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1769213460, + "narHash": "sha256-IE3gp3oJXGqXXgiKvgwoyRWMgELsiI2IQhoxmsk1+aM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ba617574108ea6eed171064cbd6b82d86f093d6b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1767364772, "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", @@ -1832,7 +1847,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1769018530, "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", @@ -2060,25 +2075,25 @@ "aagl": "aagl", "agenix": "agenix", "auto-cpufreq": "auto-cpufreq", - "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "extract-romset": "extract-romset", "git-hooks": "git-hooks", "hb-downloader": "hb-downloader", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprlock": "hyprlock", "lanzaboote": "lanzaboote", "lnxlink": "lnxlink", "nbfc-linux": "nbfc-linux", "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nix-on-droid": "nix-on-droid", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "note": "note", "stylix": "stylix", "upfast": "upfast", @@ -2104,27 +2119,6 @@ } }, "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -2168,7 +2162,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" @@ -2542,7 +2536,7 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 243b6ce..6749c8d 100644 --- a/flake.nix +++ b/flake.nix @@ -116,12 +116,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Chaotic repo for some of their packages - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # AAGL aagl.url = "github:ezKEa/aagl-gtk-on-nix"; aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -146,6 +140,9 @@ url = "github:nix-community/lanzaboote/v1.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; + + # Cachy os kernel + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; }; outputs = { diff --git a/helpers.nix b/helpers.nix index e456bc0..5102c1b 100644 --- a/helpers.nix +++ b/helpers.nix @@ -29,7 +29,6 @@ inputs.aagl.nixosModules.default inputs.auto-cpufreq.nixosModules.default inputs.nix-flatpak.nixosModules.nix-flatpak - inputs.chaotic.nixosModules.default inputs.lanzaboote.nixosModules.lanzaboote ] else []; diff --git a/hosts/skadi/configuration.nix b/hosts/skadi/configuration.nix index 0974dc0..0df9d3e 100644 --- a/hosts/skadi/configuration.nix +++ b/hosts/skadi/configuration.nix @@ -34,7 +34,7 @@ boot.blacklistedKernelModules = ["intel_pmc_bxt" "iTCO_vendor_support" "iTCO_wdt"]; # Use the xanmod kernel - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-x86_64-v3; services.scx = { enable = true; scheduler = "scx_lavd"; @@ -267,6 +267,7 @@ "https://nix-gaming.cachix.org" "https://cache.nixos-cuda.org" "https://deploy-rs.cachix.org" + "https://attic.xuyh0120.win/lantian" ]; trusted-substituters = [ "https://hyprland.cachix.org" @@ -278,6 +279,7 @@ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI=" + "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; }; @@ -297,6 +299,7 @@ }); }) (import inputs.emacs-overlay) + inputs.nix-cachyos-kernel.overlays.pinned ]; };