From 8eb28c23ee597f4262457c2d06994f38963c4c54 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Mon, 15 Dec 2025 15:11:10 -0500 Subject: [PATCH] alien: use cachyos kernel --- flake.lock | 136 +++++++++++++++++++++++++++++++-- flake.nix | 10 ++- system/hosts/alien/default.nix | 17 ++++- 3 files changed, 152 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 18d7a57..6aa10ce 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1765803132, + "narHash": "sha256-HQRBJcnUvoSh5ZvYWB3/vhvozuXAiOr36BUghEoGK+E=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "3c3ffceb2ab21e7a67a0565ae636d1471893e35b", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1765800897, + "narHash": "sha256-vtNHrRo6f4pk+9XUobPeL3t2RXtm6Dj9z+ngNGK6jN4=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "96d3efd823827b734074c0828c695d0c60d8a7d7", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": [ @@ -72,7 +104,41 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1765495779, + "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -93,7 +159,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -192,22 +258,59 @@ "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" + }, + "locked": { + "lastModified": 1765821177, + "narHash": "sha256-QNkmB5GzjZc3KUI3YN6MCTNxbwsKH9wZcsAbn24yDqg=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "495abf797d0ae70268c935620ee2ce5e0757ed40", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1765777093, + "narHash": "sha256-ed6h+jNx/4F/xOUtKlkk6zwQc/+qNhXiC+W7XCz+P6U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "9792f74fef4620ad0aa5142e8973374c697f106a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1765762245, @@ -224,9 +327,25 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -268,7 +387,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -317,7 +436,8 @@ "catppuccin-palette": "catppuccin-palette", "home-manager": "home-manager", "niri": "niri", - "nixpkgs": "nixpkgs", + "nix-cachyos-kernel": "nix-cachyos-kernel", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", diff --git a/flake.nix b/flake.nix index 84dacd9..ccec926 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; + catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -53,6 +55,7 @@ outputs = { nixpkgs, + nix-cachyos-kernel, catppuccin, catppuccin-palette, home-manager, @@ -70,12 +73,14 @@ hostname, system, extraModules ? [ ], + extraSpecialArgs ? { }, }: nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit catppuccin; - }; + } + // extraSpecialArgs; modules = [ { nixpkgs.overlays = [ @@ -145,6 +150,9 @@ alien = mkNixosSystem { hostname = "alien"; system = "x86_64-linux"; + extraSpecialArgs = { + inherit nix-cachyos-kernel; + }; }; vm-aarch64 = mkNixosSystem { diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix index b8d3d2a..7172e5d 100644 --- a/system/hosts/alien/default.nix +++ b/system/hosts/alien/default.nix @@ -4,6 +4,7 @@ lib, inputs, catppuccin, + nix-cachyos-kernel, ... }: { @@ -20,8 +21,20 @@ imports = [ catppuccin.homeModules.catppuccin ]; }; - boot.kernelPackages = pkgs.linuxPackages; boot.loader.systemd-boot.consoleMode = "max"; + # boot.kernelPackages = pkgs.linuxPackages; + + # let's use the CachyOS kernel instead! + nixpkgs.overlays = [ nix-cachyos-kernel.overlays.default ]; + nix.settings.substituters = [ + "https://attic.xuyh0120.win/lantian" + "https://cache.garnix.io" + ]; + nix.settings.trusted-public-keys = [ + "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + ]; + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; programs = { gamescope = { @@ -62,7 +75,7 @@ powerManagement.enable = false; nvidiaSettings = false; open = false; - package = pkgs.linuxPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.stable; }; services.sunshine = {