gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temporarily use different nix repo

Browse source 
Pin kernel... adam :(

symlink zpool cache because eelco told me so
This commit is contained in:
Gerg-L 2024-09-29 15:10:47 -04:00
parent fb8fe4b396
commit 70de5227fd
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
5 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -573,16 +573,16 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1722083110, "lastModified": 1727439651,
"narHash": "sha256-ABBKwqQmCdHaKgz0OQ45flWU+IiicJdDV0xwtDd8gtw=", "narHash": "sha256-cMfDBWlWjCy+B6W68xJg5CIC4zghOi6KG1QXnflT6uY=",
"owner": "NixOS", "owner": "yannham",
"repo": "nix", "repo": "nix",
"rev": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569", "rev": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "yannham",
"ref": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569", "ref": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }

8
flake.nix
View file

@ -22,9 +22,13 @@
#nix itself #nix itself
nix = { nix = {
type = "github"; type = "github";
owner = "NixOS"; #owner = "NixOS";
#repo = "nix";
#ref = "08deebddf26be28e5367983fdece18c484bbe410";
owner = "yannham";
repo = "nix"; repo = "nix";
ref = "9f1e73ed372eb679aea2d4989ba01fe85f1e1569"; ref = "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697";
inputs.nixpkgs.follows = "stable"; inputs.nixpkgs.follows = "stable";
}; };
nixos-generators = { nixos-generators = {

10
hosts/gerg-desktop/boot.nix
View file

@ -95,12 +95,16 @@ in
kernelPackages = pkgs.linuxPackagesFor ( kernelPackages = pkgs.linuxPackagesFor (
let let
inherit (config.boot.zfs.package.latestCompatibleLinuxPackages) kernel; version = "6.10.11";
src = pkgs.fetchurl {
url = "mirror://kernel/linux/kernel/v${builtins.head (lib.splitVersion version)}.x/linux-${version}.tar.xz";
hash = "sha256-+02gRvjBhRWfRTfe2IejCsxp2RxVWg/3+rxFIPWaMJY=";
};
in in
(pkgs.linuxManualConfig { (pkgs.linuxManualConfig {
inherit (kernel) src; inherit src;
inherit (config.boot) kernelPatches; inherit (config.boot) kernelPatches;
version = "${kernel.version}-gerg"; version = "${version}-gerg";
config = { config = {
CONFIG_RUST = "y"; CONFIG_RUST = "y";
CONFIG_MODULES = "y"; CONFIG_MODULES = "y";

2
hosts/gerg-desktop/zfs.nix
View file

@ -6,6 +6,8 @@
{ {
#link some stuff #link some stuff
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache"
"L+ /etc/secureboot - - - - /persist/secureboot" "L+ /etc/secureboot - - - - /persist/secureboot"
"L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key" "L+ /etc/ssh/ssh_host_ed25519_key - - - - /persist/ssh/ssh_host_ed25519_key"
"L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub" "L+ /etc/ssh/ssh_host_ed25519_key.pub - - - - /persist/ssh/ssh_host_ed25519_key.pub"

6
modules/nix.nix
View file

@ -26,7 +26,11 @@
# #
# Use nix directly from master # Use nix directly from master
# #
package = nix.packages.default; package = nix.packages.default.overrideAttrs (old: {
meta = old.meta // {
mainProgram = "nix";
};
});
# #
# Other nix settings # Other nix settings
# #