From a85607d1c08e652d1c93a7d092f39fb7f6ff6f73 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Tue, 28 Jan 2025 17:28:39 -0500
Subject: [PATCH] fix kernel

---
 flake.lock                                | 36 +++++++++++------------
 nixosConfigurations/gerg-desktop/boot.nix |  7 +++--
 nixosConfigurations/gerg-desktop/zfs.nix  |  2 --
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/flake.lock b/flake.lock
index 012828b..1545d92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -387,11 +387,11 @@
     },
     "master": {
       "locked": {
-        "lastModified": 1737953565,
-        "narHash": "sha256-1H7l7juo+2vKKTIct/aMri7xaYsmQuyRPRKC2zqgH2M=",
+        "lastModified": 1738062650,
+        "narHash": "sha256-7zzGA17LnRQltAf1lNqqmpxhgmgTaVgDLgn1lygfy3o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f4505608dbb00b3e4be2e6aca4654fcdeffac9db",
+        "rev": "8fe793656cf86f14e1549568eae010761660459f",
         "type": "github"
       },
       "original": {
@@ -427,11 +427,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1737899779,
-        "narHash": "sha256-WM5sSMwECm3Q88yj79dIk8KfiXuwq1Q3GHO1DPGFIyE=",
+        "lastModified": 1737961008,
+        "narHash": "sha256-GYzjvr6qsy1KQY0jdtkTloeKAAsF1Ls5jpPved3l1PY=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "76c58ab72d04df8ba83357c2df3c2842371c8356",
+        "rev": "af9d81d77c8b81856a2d56048c8cb48e98bb929e",
         "type": "github"
       },
       "original": {
@@ -443,11 +443,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1737845778,
-        "narHash": "sha256-HQQ9g1jbh2KcVXiubxBpTS8P+KgTMVFbGPgGnXYtTSI=",
+        "lastModified": 1737934383,
+        "narHash": "sha256-aMMwHoHpaKbCaPoDd18N9gCCzA/IRPTrrRQmAWFQO54=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b8e947ed4ed04f9aeef471f579451bbf2bb2993d",
+        "rev": "1759b7844a2d468310b6d0ceca899fec6f2d4b84",
         "type": "github"
       },
       "original": {
@@ -638,11 +638,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1737717945,
-        "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
+        "lastModified": 1737879851,
+        "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ecd26a469ac56357fd333946a99086e992452b6a",
+        "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304",
         "type": "github"
       },
       "original": {
@@ -663,11 +663,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1737951680,
-        "narHash": "sha256-rsl3k0YuvHxONb/r59qWizbU5k1YhRAwu+zuztRiXfM=",
+        "lastModified": 1738027094,
+        "narHash": "sha256-nNqG9PeLwpJYNJh+OBYTp5FeLX9gDtvhLHyKt5+e0to=",
         "owner": "Gerg-L",
         "repo": "nvim-flake",
-        "rev": "aeea8d1bc0e67b389734aab6a9953fc3c96c7817",
+        "rev": "800a954d141922a08dcaaeef28de48c4f57bcf85",
         "type": "github"
       },
       "original": {
@@ -829,11 +829,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1737951414,
-        "narHash": "sha256-BSE7KclfVdQzu8SnYnFrgfGBWND6MqWZ7jW6mz+aySk=",
+        "lastModified": 1738062977,
+        "narHash": "sha256-zW1zK0jl5mU27WawATAeFOiALa/NjBnN2KRa+3TU01k=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "c54e245b9af38b432cb17cc918f3128c44abdf21",
+        "rev": "b81153eab0ef97b43a9bd25707a2ebdf8572ee62",
         "type": "github"
       },
       "original": {
diff --git a/nixosConfigurations/gerg-desktop/boot.nix b/nixosConfigurations/gerg-desktop/boot.nix
index 4a7153b..40f592f 100644
--- a/nixosConfigurations/gerg-desktop/boot.nix
+++ b/nixosConfigurations/gerg-desktop/boot.nix
@@ -40,6 +40,8 @@ in
         };
       };
       systemd = {
+        # For linuxManualConfig to work:
+        strip = lib.mkForce false;
         network = {
           enable = true;
           networks.enp11s0 = {
@@ -95,13 +97,12 @@ in
       timeout = lib.mkForce 5;
       efi.efiSysMountPoint = "/efi22";
     };
-
     kernelPackages = pkgs.linuxPackagesFor (
       let
-        version = "6.10.11";
+        version = "6.12.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=";
+          hash = "sha256-R1Fy/b2HoVPxI6V5Umcudzvbba9bWKQX0aXkGfz+7Ek=";
         };
       in
       (pkgs.linuxManualConfig {
diff --git a/nixosConfigurations/gerg-desktop/zfs.nix b/nixosConfigurations/gerg-desktop/zfs.nix
index 47fbcc5..e379cd4 100644
--- a/nixosConfigurations/gerg-desktop/zfs.nix
+++ b/nixosConfigurations/gerg-desktop/zfs.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
 }:
 {
   #link some stuff
@@ -23,7 +22,6 @@
     supportedFilesystems.ntfs = true;
 
     zfs = {
-      package = pkgs.zfs_unstable;
       devNodes = "/dev/disk/by-id/";
       forceImportAll = true;
     };