AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test cache CI with kernel patching

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-06-15 23:17:03 +03:00
parent 75b6aad7a9
commit f30e2a1056
3 changed files with 65 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
flake.lock generated
View File

@ -392,11 +392,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github"
},
"original": {
@ -503,11 +503,11 @@
]
},
"locked": {
"lastModified": 1686604884,
"narHash": "sha256-AkfxSmGGvNMtyXt1us9Lm8cMeIwqxpkSTeNeBQ00SL8=",
"lastModified": 1686852570,
"narHash": "sha256-Hzufya/HxjSliCwpuLJCGY0WCQajzcpsnhFGa+TCkCM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b01eb1eb3b579c74e6a4189ef33cc3fa24c40613",
"rev": "4e09c83255c5b23d58714d56672d3946faf1bcef",
"type": "github"
},
"original": {
@ -544,11 +544,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1686588433,
"narHash": "sha256-qWuFScv2cokEaH1As3iH5J7fQeYoww6GghrtB96sS0g=",
"lastModified": 1686859678,
"narHash": "sha256-I9+z7lVqGvQVa9L8LBZ1ka7fdpyuzBDUUYsJGeN1jCw=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "528cfc28891431be116bcaed7e72d4f8497ed009",
"rev": "302ec1372c40cd4130101920c2f6c38cad6fc9dc",
"type": "github"
},
"original": {
@ -674,11 +674,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1686565198,
"narHash": "sha256-j6SUl8YNJKLH6XFWH1JOa3VXvRy/Eou5Ar1rBJIyXIQ=",
"lastModified": 1686829784,
"narHash": "sha256-szRWXTvKIeWquR4MM35MMGLbn17/csXrKdVY5YQWZfo=",
"owner": "nixos",
"repo": "nix",
"rev": "041486b11674e0480ad85f63d262c33a09276ef1",
"rev": "e672d52f7caae591e4d07747a312f2bef538bbea",
"type": "github"
},
"original": {
@ -697,11 +697,11 @@
]
},
"locked": {
"lastModified": 1684692304,
"narHash": "sha256-Vxm1X653raqWrVaTplxmsrJqwCIBAPxS8gCxSYADGXU=",
"lastModified": 1686821103,
"narHash": "sha256-oR351MnEaWRg27r1aF+qBoimbIMPzhjpc2w3M7p7MeM=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "936c78f734260784b8df29535e7ef83fa9563fd7",
"rev": "f01de15b12e4270b567999a94aee2335e4e84ca9",
"type": "github"
},
"original": {
@ -737,11 +737,11 @@
]
},
"locked": {
"lastModified": 1683638468,
"narHash": "sha256-tQEaGZfZ2Hpw+XIVEHaJ8FaF1yNQyMDDhUyIQ7LTIEg=",
"lastModified": 1686740472,
"narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "219067a5e3cf4b9581c8b4fcfc59ecd5af953d07",
"rev": "e11c61073b777e025993c5ef63ddbf776a9cca15",
"type": "github"
},
"original": {
@ -759,11 +759,11 @@
]
},
"locked": {
"lastModified": 1686533269,
"narHash": "sha256-+WfulXhk/HTtgfF3494PsGqVKVnUCrgFvhbrLIlzjK0=",
"lastModified": 1686792204,
"narHash": "sha256-nuNalSaeb77kb1M1p9UnWE2/ckE6z25zLyKBb62Ykhs=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "2ab8025db79ad29e3589beb92b1467a5d33acbb8",
"rev": "b03bae8a54cd3a92d1458bd3a34132582539cd05",
"type": "github"
},
"original": {
@ -795,11 +795,11 @@
]
},
"locked": {
"lastModified": 1685943944,
"narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=",
"lastModified": 1686644215,
"narHash": "sha256-FYa25w7gt8FqzWLl4UuwLLG7BiKZiAW/PFGbXWW6UAc=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "122dcc32cadf14c5015aa021fae8882c5058263a",
"rev": "f17fb67fc81a9f3b166cee711089466ba6617154",
"type": "github"
},
"original": {
@ -859,11 +859,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1686615599,
"narHash": "sha256-tDlC9DXUR5KF/L4YTSkxUaP5TUb2NGpyRacvoeFdlNM=",
"lastModified": 1686858960,
"narHash": "sha256-YO8CVbKQPOUZcpbNHVF2WWKrs+AByCbdggUYc6qAvzs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ff88800ebe72b1be9a4c728a76cdfb1b663e0559",
"rev": "95c729c030b3011c5c89107ac9fa30f7249135fe",
"type": "github"
},
"original": {
@ -923,11 +923,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github"
},
"original": {
@ -971,11 +971,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1686501370,
"narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github"
},
"original": {
@ -1003,11 +1003,11 @@
},
"nur": {
"locked": {
"lastModified": 1686696247,
"narHash": "sha256-gZL5rk1iySrvKbdw8NU5BaSDWuWA5O7ZWw+j+vxXjc4=",
"lastModified": 1686858300,
"narHash": "sha256-puBTBN6pJXAZ7oI2MHHyj+GCnipqZwTF9PvGtouBXKA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c3677b051af4921de6e184749035d08859e4ed62",
"rev": "b3d13e358b2ec4caf73562492128a483b84970da",
"type": "github"
},
"original": {
@ -1056,11 +1056,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1686307272,
"narHash": "sha256-Sb/2lMKiMkvUo8sAomgLnwZhMMG6Fz9t1AaKR3eqOTo=",
"lastModified": 1686767705,
"narHash": "sha256-+c4AFsx/1MeLpUyYh9jr7UwGqY0yf58N8ZKFWp125ak=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "e5c0ad9101080b834fd4c2169bd0ec3242f66fa2",
"rev": "7d902ff3a5093a8664b3a1f4bbdfe3726f0f142f",
"type": "github"
},
"original": {
@ -1152,11 +1152,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1686608841,
"narHash": "sha256-7GsBVxeyEojOhDOBJcSDwALkfzqklC1GXvJPZ0cKEJQ=",
"lastModified": 1686838518,
"narHash": "sha256-MqwA95DbSSCmk1mgL12TEdc1rQ7uyqxUDGLikrfj9yw=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "ea6e291028dc8109850c5cd8b577dd15f7ad5426",
"rev": "c063e239e617477b89a320349bfbf6c1a243c642",
"type": "gitlab"
},
"original": {
@ -1304,11 +1304,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1686573751,
"narHash": "sha256-5vnFxEMvn4wzT+XKR5Jo8VSn1hXrdf/mWuTmdHhRFBs=",
"lastModified": 1686753331,
"narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "6e8fb5509f2c94d09d4efa0f9b1f40b37bf73863",
"rev": "7e7633abf09b362d0bad9e3fc650fd692369291d",
"type": "gitlab"
},
"original": {

34
flake.nix
View File

@ -116,9 +116,7 @@
];
channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs;
channels.unstable.patches = patchesPath [ ] ++ sharedPatches;
channels.unstable-zfs.input = nixpkgs;
channels.unstable-zfs.patches = patchesPath [ "zen-kernels.patch" ] ++ sharedPatches;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" ] ++ sharedPatches;
hostDefaults.system = "x86_64-linux";
hostDefaults.channelName = "unstable";
@ -135,38 +133,14 @@
];
specialArgs = { inherit inputs; };
};
in (genAttrs hostnames mkHost) // {
AMD-Workstation = {
system = builtins.readFile (./machines/AMD-Workstation/system);
modules = __attrValues self.customModules ++ [
(import (./machines/AMD-Workstation))
{ device = "AMD-Workstation"; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule
];
specialArgs = { inherit inputs; };
channelName = "unstable-zfs";
};
Dell-Laptop = {
system = builtins.readFile (./machines/Dell-Laptop/system);
modules = __attrValues self.customModules ++ [
(import (./machines/Dell-Laptop))
{ device = "Dell-Laptop"; mainuser = "ataraxia"; }
inputs.vscode-server.nixosModule
];
specialArgs = { inherit inputs; };
channelName = "unstable-zfs";
};
};
in (genAttrs hostnames mkHost);
outputsBuilder = channels: let
pkgs = channels.unstable-zfs;
pkgs = channels.unstable;
# FIXME: nixos-rebuild with --flake flag doesn't work with doas
rebuild = pkgs.writeShellScriptBin "rebuild" ''
if [[ -z $1 ]]; then
echo "Usage: $(basename $0) {switch|boot|test}"
elif [[ $1 = "iso" ]]; then
shift
nix build .#nixosConfigurations.Flakes-ISO.config.system.build.isoImage "$@"
else
# doas nix-shell -p git --run "nixos-rebuild --flake . $@"
\sudo nixos-rebuild --flake . $@
@ -191,7 +165,7 @@
name = "aliases";
packages = with pkgs; [
rebuild update-vscode upgrade upgrade-hyprland
nixfmt nixpkgs-fmt statix vulnix deadnix
nixfmt nixpkgs-fmt statix vulnix deadnix git
];
};
ci = pkgs.mkShell {

16
patches/zen-kernels.patch
View File

@ -0,0 +1,16 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 2e0a9cf..a4421eb 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.3.4"; #lqx
+ version = "6.3.8"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx
+ sha256 = "1slqnqnfpws1m3l716lvw87kdf3mb87ka3iyjsyrzn9d4ysjd7m7"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {