aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hosts/arrakis/default.nix4
-rw-r--r--hosts/caladan/default.nix6
-rw-r--r--hosts/common/optional/ebooks.nix2
-rw-r--r--hosts/darkstar/default.nix4
-rw-r--r--hosts/fangorn/default.nix4
-rw-r--r--hosts/ginaz/default.nix4
-rw-r--r--hosts/jupiter/default.nix4
-rw-r--r--hosts/kaitain/default.nix4
-rw-r--r--hosts/neptune/default.nix4
-rw-r--r--hosts/richese/default.nix4
-rw-r--r--hosts/saturn/default.nix4
-rw-r--r--hosts/uranus/default.nix4
12 files changed, 24 insertions, 24 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index de07f5f..93f399b 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -7,7 +7,7 @@
"net.netfilter.nf_log_all_netns" = 1;
#"net.ipv4.conf.all.proxy_arp" = 1;
};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi = {
canTouchEfiVariables = true;
@@ -22,7 +22,7 @@
timeout = 3;
};
supportedFilesystems = [ "zfs" ];
- zfs.package = pkgs.zfs;
+ zfs.package = pkgs.zfs_unstable;
};
environment.etc."nftables-vpn.conf".text = ''
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 3087cd3..4db64cf 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -5,7 +5,7 @@
"kernel.hostname" = "caladan.bitgnome.net";
"kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/
};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
#kernelParams = [
# "amdgpu.ppfeaturemask=0xfffd3fff"
# "split_lock_detect=off"
@@ -24,7 +24,7 @@
timeout = 3;
};
supportedFilesystems = [ "zfs" ];
- zfs.package = pkgs.zfs;
+ zfs.package = pkgs.zfs_unstable;
};
environment.systemPackages = [
@@ -43,7 +43,7 @@
#pkgs.moc
pkgs.nethack
pkgs.openttd
- pkgs.linuxKernel.packages.linux_6_16.turbostat
+ pkgs.linuxKernel.packages.linux_6_17.turbostat
pkgs.qbittorrent-nox
pkgs.rdiff-backup
pkgs.scorched3d
diff --git a/hosts/common/optional/ebooks.nix b/hosts/common/optional/ebooks.nix
index f755076..1805b7a 100644
--- a/hosts/common/optional/ebooks.nix
+++ b/hosts/common/optional/ebooks.nix
@@ -2,7 +2,7 @@
{
environment.systemPackages = [
pkgs.libgourou
- pkgs.master.calibre
+ pkgs.calibre
];
services.udisks2.enable = true;
diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix
index 60e3aed..5ee2137 100644
--- a/hosts/darkstar/default.nix
+++ b/hosts/darkstar/default.nix
@@ -5,7 +5,7 @@
"kernel.hostname" = "darkstar.bitgnome.net";
"net.ipv4.ip_forward" = true;
};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi = {
canTouchEfiVariables = true;
@@ -20,7 +20,7 @@
timeout = 3;
};
supportedFilesystems = [ "zfs" ];
- zfs.package = pkgs.zfs;
+ zfs.package = pkgs.zfs_unstable;
};
environment.systemPackages = [
diff --git a/hosts/fangorn/default.nix b/hosts/fangorn/default.nix
index f05bd13..e0f0f2d 100644
--- a/hosts/fangorn/default.nix
+++ b/hosts/fangorn/default.nix
@@ -1,6 +1,6 @@
{ config, inputs, lib, outputs, pkgs, ... }: {
boot = {
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -9,7 +9,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix
index 79ba3ca..9ee5950 100644
--- a/hosts/ginaz/default.nix
+++ b/hosts/ginaz/default.nix
@@ -1,14 +1,14 @@
{ config, inputs, outputs, pkgs, ... }: {
boot = {
initrd.kernelModules = [ "amdgpu" "zfs" ];
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
timeout = 3;
};
supportedFilesystems = [ "zfs" ];
- zfs.package = pkgs.zfs;
+ zfs.package = pkgs.zfs_unstable;
};
environment.systemPackages = [
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index f570a38..c023564 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -4,7 +4,7 @@
#kernel.sysctl = {
# "net.ipv4.ip_forward" = true;
#};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -13,7 +13,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/kaitain/default.nix b/hosts/kaitain/default.nix
index 72859b0..157945f 100644
--- a/hosts/kaitain/default.nix
+++ b/hosts/kaitain/default.nix
@@ -1,7 +1,7 @@
{ config, inputs, lib, outputs, pkgs, ... }: {
boot = {
initrd.kernelModules = [ "zfs" ];
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -10,7 +10,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/neptune/default.nix b/hosts/neptune/default.nix
index a9f5240..7ce3ad8 100644
--- a/hosts/neptune/default.nix
+++ b/hosts/neptune/default.nix
@@ -4,7 +4,7 @@
#kernel.sysctl = {
# "net.ipv4.ip_forward" = true;
#};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -13,7 +13,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 48451c0..d3fc348 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,12 +1,12 @@
{ config, inputs, lib, outputs, pkgs, ... }: {
boot = {
initrd.kernelModules = [ "zfs" ];
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader.grub.enable = true;
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/saturn/default.nix b/hosts/saturn/default.nix
index 696d544..133b09a 100644
--- a/hosts/saturn/default.nix
+++ b/hosts/saturn/default.nix
@@ -4,7 +4,7 @@
#kernel.sysctl = {
# "net.ipv4.ip_forward" = true;
#};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -13,7 +13,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
index 718549e..102d5a4 100644
--- a/hosts/uranus/default.nix
+++ b/hosts/uranus/default.nix
@@ -4,7 +4,7 @@
#kernel.sysctl = {
# "net.ipv4.ip_forward" = true;
#};
- kernelPackages = pkgs.linuxPackages_6_16;
+ kernelPackages = pkgs.linuxPackages_6_17;
loader = {
efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
@@ -13,7 +13,7 @@
supportedFilesystems = [ "zfs" ];
zfs = {
devNodes = "/dev/disk/by-label";
- package = pkgs.zfs;
+ package = pkgs.zfs_unstable;
};
};