diff --git a/flake.lock b/flake.lock index 374a65c..6ec8be7 100644 --- a/flake.lock +++ b/flake.lock @@ -44,6 +44,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1781883168, + "narHash": "sha256-raAojJGk0aWdscfFn/9ikZ6V5oUuAZcAz5kjAZ2QN3E=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "daed450e9b1a4fadfef68fb4fa5e2f3391fedb34", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1781879636, + "narHash": "sha256-vNTtJIee7GrrUY93UwQ/x2yFkwI4IpHPiyc3kXfVflo=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "5e818fcbf2eb8de573c9270295ce9f5215973303", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "cf": { "locked": { "lastModified": 1756852014, @@ -128,6 +160,22 @@ } }, "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-compat_3": { "flake": false, "locked": { "lastModified": 1627913399, @@ -164,6 +212,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -280,6 +346,28 @@ "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_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1781896647, + "narHash": "sha256-xlHqfEa3ZwgD477tn3wF1DEv7KgppmDaSLss44dbjmQ=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "8bf6af7fd57d129ec00d06e399e01cb6f97a97e8", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1767983141, @@ -362,20 +450,35 @@ }, "nixpkgs": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1781836206, + "narHash": "sha256-BGjXqZOcLbkjwt8smyUskR8hNl7piTg8ccpQdSTw09s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "d4fea6b6bfce7b55c6df36fb973205b89d7fe761", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-linuxeol": { "locked": { "lastModified": 1776914381, @@ -392,6 +495,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "ntfsplus": { "inputs": { "linux-ntfs": "linux-ntfs", @@ -415,7 +534,7 @@ }, "peerix": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -488,11 +607,12 @@ "claude-code": "claude-code", "home-manager": "home-manager", "lanzaboote": "lanzaboote", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-flatpak": "nix-flatpak", "nix-skills": "nix-skills", "nix-sweep": "nix-sweep", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-linuxeol": "nixpkgs-linuxeol", "ntfsplus": "ntfsplus", "peerix": "peerix", diff --git a/flake.nix b/flake.nix index 63302a9..8309b57 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,7 @@ url = "github:sudosubin/nix-skills"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; bun2nix = { url = "github:nix-community/bun2nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/acer.nix b/hosts/acer.nix index 53930d1..31d16d2 100644 --- a/hosts/acer.nix +++ b/hosts/acer.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, nixpkgs-linuxeol, ... }: +{ config, lib, pkgs, nixpkgs-linuxeol, ... }: rec { # Identity @@ -23,8 +23,8 @@ rec { # Kernel # boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_7_0; - boot.zfs.package = pkgs.zfs_2_4; + boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; + boot.zfs.package = config.boot.kernelPackages.zfs_cachyos; # Swap swapDevices = [ diff --git a/lib/mkNixosSystem.nix b/lib/mkNixosSystem.nix index d8f10e9..d074f5d 100644 --- a/lib/mkNixosSystem.nix +++ b/lib/mkNixosSystem.nix @@ -13,6 +13,7 @@ nix-skills, nixpkgs-linuxeol, bun2nix, + nix-cachyos-kernel, ... }: hardwareConfig: hostConfig: @@ -32,6 +33,7 @@ nixpkgs.lib.nixosSystem { claude-code.overlays.default acer-wmi-ext.overlays.default nix-skills.overlays.default + nix-cachyos-kernel.overlays.pinned ] ++ (import ../overlays/pkgs.nix { inherit bun2nix; }); nix.settings = { substituters = [ "https://claude-code.cachix.org" ];