aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.nix4
-rw-r--r--hosts/ginaz/default.nix6
-rw-r--r--overlays/default.nix14
3 files changed, 12 insertions, 12 deletions
diff --git a/flake.nix b/flake.nix
index 5feb63e..36cb07c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# specific nixpkgs commit for EOL kernel and ZFS
- nixpkgs-kerneol.url ="github:NixOS/nixpkgs/853901a31bddc8bdc9edde693f649f0e50edcfc5";
+ #nixpkgs-kerneol.url ="github:NixOS/nixpkgs/853901a31bddc8bdc9edde693f649f0e50edcfc5";
# per https://nixos-and-flakes.thiscute.world/nixos-with-flakes/downgrade-or-upgrade-packages
#my-nixpkgs.url = "github:nipsy/nixpkgs/update_reaper_7.61";
@@ -57,7 +57,7 @@
home-manager,
#my-nixpkgs,
nixos-hardware,
- nixpkgs-kerneol,
+ #nixpkgs-kerneol,
nixpkgs-master,
#nixpkgs-pr545346,
nixpkgs-stable,
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 878f0ba..5907386 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -2,7 +2,7 @@
boot = {
#blacklistedKernelModules = [ "nouveau" ];
initrd.kernelModules = [ "amdgpu" "zfs" ];
- kernelPackages = pkgs.kerneol.linuxPackages_7_0;
+ kernelPackages = pkgs.linuxPackages_6_18;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot = {
@@ -14,7 +14,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
forceImportRoot = false;
- package = pkgs.kerneol.zfs_2_4;
+ package = pkgs.zfs_2_4;
};
};
@@ -66,7 +66,7 @@
overlays = [
#inputs.nvidia-patch.overlays.default
outputs.overlays.additions
- outputs.overlays.kerneol-packages
+ #outputs.overlays.kerneol-packages
outputs.overlays.master-packages
outputs.overlays.modifications
outputs.overlays.stable-packages
diff --git a/overlays/default.nix b/overlays/default.nix
index 25e4c7e..ea0eb82 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -75,13 +75,13 @@
# When applied, the kerneol nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.kerneol'
- kerneol-packages = final: _prev: {
- kerneol = import inputs.nixpkgs-kerneol {
- inherit (final);
- config.allowUnfree = true;
- localSystem = final.stdenv.hostPlatform;
- };
- };
+ #kerneol-packages = final: _prev: {
+ # kerneol = import inputs.nixpkgs-kerneol {
+ # inherit (final);
+ # config.allowUnfree = true;
+ # localSystem = final.stdenv.hostPlatform;
+ # };
+ #};
# When applied, the master nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.master'