From 13a2f51241a205d09564b9ad63c6bdcabfaa2cfd Mon Sep 17 00:00:00 2001 From: Superredstone Date: Fri, 24 Apr 2026 17:40:33 +0200 Subject: [PATCH] feat(katana): move to cachy kernel --- flake.lock | 133 ++++++++++++++++++++++++++++++++-- flake.nix | 3 + machines/katana/boot.nix | 2 +- modules/nix-config/caches.nix | 2 + 4 files changed, 133 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 9fbd3dd..f5c25a9 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1776608760, + "narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1776792814, + "narHash": "sha256-39dlIhz9KxUNQFxGpE9SvCviaOWAivdW0XJM8RnPNmg=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "d7d558d0b2e239e27b40bcf1af6fe12e323aa391", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -49,7 +81,41 @@ "type": "github" } }, + "flake-compat_2": { + "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": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -450,6 +516,29 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1776796985, + "narHash": "sha256-cNFg3H09sBZl1v9ds6PDHfLCUTDJbefGMSv+WxFs+9c=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "ac5956bbceb022998fc1dd0001322f10ef1e6dda", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1776548001, @@ -466,7 +555,38 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { + "locked": { + "lastModified": 1776750258, + "narHash": "sha256-jab3OFEK7MpiAolaLBjvIxdf258UWvvusWxPJPE5ito=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8d73c2809cb39eecce6284c38100e69a6064e5d9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1776548001, "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", @@ -482,7 +602,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -498,7 +618,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -536,8 +656,8 @@ }, "nixvim_2": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4", "systems": "systems_3" }, "locked": { @@ -581,7 +701,8 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nix-cachyos-kernel": "nix-cachyos-kernel", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "sops-nix": "sops-nix", "spotiflac-cli": "spotiflac-cli" @@ -609,7 +730,7 @@ }, "spotiflac-cli": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1771096762, diff --git a/flake.nix b/flake.nix index 811b3eb..ab2f9ab 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; hyprland.url = "github:hyprwm/Hyprland"; spotiflac-cli.url = "github:Superredstone/spotiflac-cli"; }; @@ -24,10 +25,12 @@ nixvim, spotiflac-cli, sops-nix, + nix-cachyos-kernel, ... }@inputs: let overlays = [ + nix-cachyos-kernel.overlays.pinned ]; personalEmail = "patrickcanal3@gmail.com"; username = "r3ddy"; diff --git a/machines/katana/boot.nix b/machines/katana/boot.nix index 6580d69..f5735cb 100644 --- a/machines/katana/boot.nix +++ b/machines/katana/boot.nix @@ -10,7 +10,7 @@ verbose = false; systemd.enable = true; }; - kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest; + kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; # pkgs.linuxPackages_latest; consoleLogLevel = 3; kernelParams = [ "quiet" diff --git a/modules/nix-config/caches.nix b/modules/nix-config/caches.nix index 59c283a..0b817a2 100644 --- a/modules/nix-config/caches.nix +++ b/modules/nix-config/caches.nix @@ -5,11 +5,13 @@ "https://cache.nixos.org" "https://nixvim-superredstone.cachix.org" "https://spotiflac-cli.cachix.org" + "https://attic.xuyh0120.win/lantian" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nixvim-superredstone.cachix.org-1:mEXHVxEv5dKka3FOxTMFDfdk/DJ0baydsahi+zZIcQE=" "spotiflac-cli.cachix.org-1:UgpE8P0TO8NuF03vF117r/vgTkjq13Z3JqGzaQdC7xE=" + "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; trusted-users = [ "root"