1 files changed, 62 insertions, 15 deletions

diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix
index 5ec1e96..f3f1185 100644
--- a/hosts/caladan/default.nix
+++ b/hosts/caladan/default.nix
@@ -1,11 +1,15 @@
 { config, inputs, outputs, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "amdgpu" "zfs" ];
-    kernelPackages = pkgs.master.linuxPackages_6_14;
-    kernelParams = [
-      "amdgpu.ppfeaturemask=0xfffd3fff"
-      "split_lock_detect=off"
-    ];
+    kernel.sysctl = {
+      "kernel.hostname" = "caladan.bitgnome.net";
+      "kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/
+    };
+    kernelPackages = pkgs.linuxPackages_6_18;
+    #kernelParams = [
+    #  "amdgpu.ppfeaturemask=0xfffd3fff"
+    #  "split_lock_detect=off"
+    #];
     loader = {
       efi = {
         canTouchEfiVariables = true;
@@ -16,40 +20,47 @@
         extraInstallCommands = ''
           ${pkgs.rsync}/bin/rsync -av --delete /efiboot/efi1/ /efiboot/efi2
         '';
+        memtest86.enable = true;
       };
       timeout = 3;
     };
     supportedFilesystems = [ "zfs" ];
-    zfs.package = pkgs.master.zfs;
+    zfs.package = pkgs.zfs_unstable;
   };
 
   environment.systemPackages = [
     pkgs.angband
-    #pkgs.assaultcube
+    pkgs.assaultcube
+    pkgs.beyond-all-reason
     pkgs.bsdgames
     pkgs.bzflag
     pkgs.extremetuxracer
     pkgs.fastfetch
     #pkgs.frozen-bubble
     pkgs.hedgewars
+    #pkgs.igir
     pkgs.kobodeluxe
+    pkgs.linux-firmware
+    pkgs.linuxKernel.packages.linux_6_18.turbostat
     pkgs.mailutils
-    pkgs.moc
+    #pkgs.moc
     pkgs.nethack
-    #pkgs.openttd
-    pkgs.qbittorrent-nox
+    pkgs.openttd
+    pkgs.piper
+    #pkgs.qbittorrent-nox
     pkgs.rdiff-backup
-    #pkgs.scorched3d
+    pkgs.scorched3d
     pkgs.signal-desktop
     pkgs.superTux
     pkgs.superTuxKart
     pkgs.umoria
     pkgs.vial
-    pkgs.warzone2100
-    #pkgs.wine9_22.wineWowPackages.stagingFull
+    pkgs.vice
+    #pkgs.warzone2100
+    pkgs.wayback-x11
     pkgs.wpa_supplicant
     pkgs.xonotic-sdl
-    #pkgs.xpilot-ng
+    pkgs.xpilot-ng
   ];
 
   imports = [
@@ -66,9 +77,11 @@
     ../common/optional/misc.nix
     ../common/optional/multimedia.nix
     ../common/optional/pipewire.nix
+    ../common/optional/printer.nix
     ../common/optional/sdr.nix
     ../common/optional/services/chrony.nix
     ../common/optional/services/openssh.nix
+    #../common/optional/services/wayland.nix
     ../common/optional/services/xorg.nix
     ../common/optional/sound.nix
     ../common/optional/wdt.nix
@@ -82,7 +95,6 @@
       address = "192.168.1.1";
       interface = "wlp15s0";
     };
-    domain = "bitgnome.net";
     hostId = "8981d1e5";
     hostName = "caladan";
     interfaces = {
@@ -94,6 +106,9 @@
     };
     nameservers = [ "192.168.1.1" ];
     nftables.enable = true;
+    search = [
+      "bitgnome.net"
+    ];
     useDHCP = false;
     wireless = {
       enable = true;
@@ -121,6 +136,35 @@
     ];
   };
 
+  programs = {
+    nix-ld = {
+      enable = true;
+      libraries = [
+        pkgs.alsa-lib
+        pkgs.at-spi2-core
+        pkgs.cairo
+        pkgs.cups
+        pkgs.dbus
+        pkgs.fontconfig
+        pkgs.freetype
+        pkgs.glib
+        pkgs.libgbm
+        pkgs.libx11
+        pkgs.libxcb
+        pkgs.libxext
+        pkgs.libxfixes
+        pkgs.libxkbcommon
+        pkgs.libxrandr
+        pkgs.nspr
+        pkgs.nss
+        pkgs.pango
+        pkgs.vulkan-loader
+        pkgs.xorg.libXcomposite
+        pkgs.xorg.libXdamage
+      ];
+    };
+  };
+
   services.openssh.settings.X11Forwarding = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
 
@@ -168,4 +212,7 @@
 
   };
 
+  users.users.root.openssh.authorizedKeys.keys = [
+    (builtins.readFile ../common/users/nipsy/keys/id_att.pub)
+  ];
 }