From 70de5227fdeac376ff7eec8ed4fe0f1fa5d37052 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sun, 29 Sep 2024 15:10:47 -0400
Subject: [PATCH] Temporarily use different nix repo

Pin kernel... adam :(

symlink zpool cache because eelco told me so
---
 flake.lock                  | 12 ++++++------
 flake.nix                   |  8 ++++++--
 hosts/gerg-desktop/boot.nix | 10 +++++++---
 hosts/gerg-desktop/zfs.nix  |  2 ++
 modules/nix.nix             |  6 +++++-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 694c866..e0b9944 100644
--- a/flake.lock
+++ b/flake.lock
@@ -573,16 +573,16 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1722083110,
-        "narHash": "sha256-ABBKwqQmCdHaKgz0OQ45flWU+IiicJdDV0xwtDd8gtw=",
-        "owner": "NixOS",
+        "lastModified": 1727439651,
+        "narHash": "sha256-cMfDBWlWjCy+B6W68xJg5CIC4zghOi6KG1QXnflT6uY=",
+        "owner": "yannham",
         "repo": "nix",
-        "rev": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569",
+        "rev": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "9f1e73ed372eb679aea2d4989ba01fe85f1e1569",
+        "owner": "yannham",
+        "ref": "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697",
         "repo": "nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6f43c4c..0a99280 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,9 +22,13 @@
     #nix itself
     nix = {
       type = "github";
-      owner = "NixOS";
+      #owner = "NixOS";
+      #repo = "nix";
+      #ref = "08deebddf26be28e5367983fdece18c484bbe410";
+
+      owner = "yannham";
       repo = "nix";
-      ref = "9f1e73ed372eb679aea2d4989ba01fe85f1e1569";
+      ref = "27b2fc43d4059cb9ad7cf75f492ea8cf9d41f697";
       inputs.nixpkgs.follows = "stable";
     };
     nixos-generators = {
diff --git a/hosts/gerg-desktop/boot.nix b/hosts/gerg-desktop/boot.nix
index fc62239..dc2d358 100644
--- a/hosts/gerg-desktop/boot.nix
+++ b/hosts/gerg-desktop/boot.nix
@@ -95,12 +95,16 @@ in
 
     kernelPackages = pkgs.linuxPackagesFor (
       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
       (pkgs.linuxManualConfig {
-        inherit (kernel) src;
+        inherit src;
         inherit (config.boot) kernelPatches;
-        version = "${kernel.version}-gerg";
+        version = "${version}-gerg";
         config = {
           CONFIG_RUST = "y";
           CONFIG_MODULES = "y";
diff --git a/hosts/gerg-desktop/zfs.nix b/hosts/gerg-desktop/zfs.nix
index e19b996..8cdd6cc 100644
--- a/hosts/gerg-desktop/zfs.nix
+++ b/hosts/gerg-desktop/zfs.nix
@@ -6,6 +6,8 @@
 {
   #link some stuff
   systemd.tmpfiles.rules = [
+
+    "L+ /etc/zfs/zpool.cache - - - - /persist/zfs/zpool.cache"
     "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.pub  - - - - /persist/ssh/ssh_host_ed25519_key.pub"
diff --git a/modules/nix.nix b/modules/nix.nix
index 992d515..96f2db1 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -26,7 +26,11 @@
     #
     # Use nix directly from master
     #
-    package = nix.packages.default;
+    package = nix.packages.default.overrideAttrs (old: {
+      meta = old.meta // {
+        mainProgram = "nix";
+      };
+    });
     #
     # Other nix settings
     #