updates to add cachyos kernel and scheduler

This commit is contained in:
Chris Cochrun 2025-12-02 05:19:46 -06:00
parent c87278d2cc
commit b3b085181d
4 changed files with 229 additions and 71 deletions

13
cachix/cachix/chaotic.nix Normal file
View file

@ -0,0 +1,13 @@
{
nix = {
settings = {
substituters = [
"https://chaotic-nyx.cachix.org"
];
trusted-public-keys = [
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8"
];
};
};
}

269
flake.lock generated
View file

@ -129,9 +129,32 @@
"type": "gitlab"
}
},
"chaotic": {
"inputs": {
"flake-schemas": "flake-schemas",
"home-manager": "home-manager",
"jovian": "jovian",
"nixpkgs": "nixpkgs_6",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1764596563,
"narHash": "sha256-tH3AGDWlAN3ImVuBBCLmqaqD0EbkISiPCHGeMcd430k=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "0701ee838b0fb34a77b6dd4b35476b4bb09fbca9",
"type": "github"
},
"original": {
"owner": "chaotic-cx",
"ref": "nyxpkgs-unstable",
"repo": "nyx",
"type": "github"
}
},
"darkly": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1763015923,
@ -333,6 +356,20 @@
}
},
"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-schemas_2": {
"locked": {
"lastModified": 1721999734,
"narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
@ -462,15 +499,36 @@
"home-manager": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1764361670,
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
"lastModified": 1764194569,
"narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
"rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1764636297,
"narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827",
"type": "github"
},
"original": {
@ -480,6 +538,28 @@
"type": "github"
}
},
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1764275117,
"narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"niri": {
"inputs": {
"niri-stable": "niri-stable",
@ -492,11 +572,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1764405884,
"narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=",
"lastModified": 1764659906,
"narHash": "sha256-GV5/TfQCW37mZ5R2oyrklptgRdSZrOoXs5cpz1I/8Uk=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f",
"rev": "6e349f78f8df536aac24e04a64fdc79ae0e02ed3",
"type": "github"
},
"original": {
@ -525,11 +605,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1764399944,
"narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=",
"lastModified": 1764485473,
"narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "b35bcae35b3f9665043c335e55ed5828af77db85",
"rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c",
"type": "github"
},
"original": {
@ -542,7 +622,7 @@
"inputs": {
"extra-container": "extra-container",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_8",
"nixpkgs-unstable": "nixpkgs-unstable"
},
"locked": {
@ -582,6 +662,29 @@
"type": "github"
}
},
"nix-github-actions_2": {
"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"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1764440730,
@ -600,11 +703,11 @@
},
"nixos-unstable-small": {
"locked": {
"lastModified": 1764374374,
"narHash": "sha256-naS7hg/D1yLKSZoENx9gvsPLFiNEOTcqamJSu0OEvCA=",
"lastModified": 1764635402,
"narHash": "sha256-6rYcajRLe2C5ZYnV1HYskJl+QAkhvseWTzbdQiTN9OI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6a49303095abc094ee77dc243a9e351b642e8e75",
"rev": "5f53b0d46d320352684242d000b36dcfbbf7b0bc",
"type": "github"
},
"original": {
@ -693,11 +796,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1764316264,
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
@ -709,11 +812,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1764316264,
"narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=",
"lastModified": 1764560356,
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0",
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
"type": "github"
},
"original": {
@ -756,6 +859,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1744536153,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@ -771,7 +890,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1735264675,
"narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=",
@ -785,7 +904,7 @@
"url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
@ -865,6 +984,22 @@
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1743095683,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
@ -880,7 +1015,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1763622513,
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
@ -896,33 +1031,17 @@
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1763678758,
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
"owner": "NixOS",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@ -956,16 +1075,16 @@
"octotype": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_9",
"rust-overlay": "rust-overlay",
"nixpkgs": "nixpkgs_10",
"rust-overlay": "rust-overlay_2",
"systems": "systems_4"
},
"locked": {
"lastModified": 1763858355,
"narHash": "sha256-An7O8XKaD2MSWDz7hRr3BAGZDqgbYo2SpQFhypWJSYU=",
"lastModified": 1764463024,
"narHash": "sha256-mtiAnSesoc87D0Yl/9mCCRTm18lOQ3J6PlG1j1F82Jo=",
"owner": "mahlquistj",
"repo": "octotype",
"rev": "111180326f71347a8e1f72b54aa58a37a09f3646",
"rev": "f8589c1e21d408492ddb8862b116cbb7694a4a5e",
"type": "github"
},
"original": {
@ -1027,8 +1146,8 @@
},
"quickemu": {
"inputs": {
"flake-schemas": "flake-schemas",
"nixpkgs": "nixpkgs_11"
"flake-schemas": "flake-schemas_2",
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1735561406,
@ -1047,14 +1166,15 @@
"inputs": {
"affinity-nix": "affinity-nix",
"anipy-cli": "anipy-cli",
"chaotic": "chaotic",
"darkly": "darkly",
"emacs": "emacs",
"home-manager": "home-manager",
"home-manager": "home-manager_2",
"niri": "niri",
"nix-bitcoin": "nix-bitcoin",
"nixos-hardware": "nixos-hardware",
"nixos-unstable-small": "nixos-unstable-small",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_9",
"nixpkgs-stable": "nixpkgs-stable_3",
"octotype": "octotype",
"quickemu": "quickemu",
@ -1064,14 +1184,35 @@
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_10"
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1763778964,
"narHash": "sha256-qeOBcixYtZ4yUsBWO6kcjr7ylkrBib4kGDImHNKba9I=",
"lastModified": 1764211126,
"narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "7f3aa46dfa230ec2a4ca9281186a24771650ccd1",
"rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": "nixpkgs_11"
},
"locked": {
"lastModified": 1764383863,
"narHash": "sha256-KA5F0137hLvk576mfucWvFu8Z8g8MTm+6c3gw2mZcKI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4f5a90bf043a57add9b3288bbd25ed534bfaffb5",
"type": "github"
},
"original": {
@ -1084,7 +1225,7 @@
"inputs": {
"blobs": "blobs",
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_13",
"nixpkgs-24_11": "nixpkgs-24_11"
},
"locked": {
@ -1123,11 +1264,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1764254063,
"narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=",
"lastModified": 1764648840,
"narHash": "sha256-hIj3aKL+G8TXrqvz0wCnUKESN5MEyrD4YxaLLARnkPs=",
"owner": "danth",
"repo": "stylix",
"rev": "a1451bc40413870f0c7b576b751c1ca92055e323",
"rev": "71054adbc3629404b2f02e8385aec07f87980a2f",
"type": "github"
},
"original": {
@ -1352,11 +1493,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
"lastModified": 1764366786,
"narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=",
"lastModified": 1764655870,
"narHash": "sha256-YO31FdrzZUjOzjfgs4nvSH2scTtPUaw/eENi+LG+E74=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
"rev": "b362a3873710a42f7ac2d8ba03772d8290733934",
"rev": "6a5150c45c77c16ae4d79a8847a1cc1b2f26cc5c",
"type": "github"
},
"original": {

View file

@ -6,6 +6,7 @@
nixos-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
@ -39,7 +40,7 @@
outputs = inputs@{ nixpkgs, nixpkgs-stable, home-manager,
quickemu, nixos-hardware, emacs, nix-bitcoin, octotype,
simple-nixos-mailserver, anipy-cli, darkly, niri,
stylix, self, affinity-nix, ... }:
stylix, self, affinity-nix, chaotic, ... }:
let
system = "x86_64-linux";
username = "chris";
@ -125,6 +126,7 @@
niri.nixosModules.niri
nixos-hardware.nixosModules.framework-11th-gen-intel
nixos-hardware.nixosModules.common-hidpi
chaotic.nixosModules.default
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -144,6 +146,7 @@
niri.nixosModules.niri
nixos-hardware.nixosModules.common-gpu-amd
nixos-hardware.nixosModules.common-cpu-amd
chaotic.nixosModules.default
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

View file

@ -18,11 +18,12 @@ in
};
# Use the systemd-boot EFI boot loader.
boot = {
kernelPackages = pkgs.linuxPackages_zen;
kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
# initrd.kernelModules = [ "amdgpu" ];
# Use the cachyos kernel and better scheduler
boot.kernelPackages = pkgs.linuxPackages_cachyos;
boot.kernelParams = [ "mem_sleep_default=deep" "nvme.noacpi=1" ];
services.scx = {
enable = true;
scheduler = "scx_bpfland";
};
# The global useDHCP flag is deprecated, therefore explicitly set to false here.