2025-01-01

3 files changed, 6 insertions, 69 deletions

diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix
index f718135..875f737 100644
--- a/configurations/eonwe/default.nix
+++ b/configurations/eonwe/default.nix
@@ -193,34 +193,7 @@ with lib;
     cores = 30;
   };
 
-  # Required[1] for using ZFS kernel modules with "unsupported" kernels.
-  #
-  # [1]: https://github.com/NixOS/nixpkgs/pull/121113#issuecomment-830003344
-  # [1]: https://github.com/NixOS/nixpkgs/pull/230498#issuecomment-1551328615
-  nixpkgs.config.allowBroken = true;
-
   boot = {
-    kernelPackages = pkgs.linuxPackages_xanmod_latest;
-
-    kernelParams = [
-      # Silence benign MCE errors:
-      # ```
-      # mce: [Hardware Error]: CPU 1: Machine Check: 0 Bank 29: ffffffffffffffff
-      # mce: [Hardware Error]: TSC 0 MISC ff1fffffffffffff SYND ffffffffffffffff IPID ffffffffffffffff
-      # mce: [Hardware Error]: PROCESSOR 2:a60f12 TIME 1669988017 SOCKET 0 APIC 2 microcode a601201
-      # ```
-      "mce=nobootlog"
-      # This disables[1] User Mode Instruction Protection (UMIP)[2]. This is
-      # required for some games to run via Wine.
-      #
-      # [1]: https://docs.kernel.org/x86/cpuinfo.html
-      # [2]: https://en.wikichip.org/wiki/x86/umip
-      "clearcpuid=514"
-    ];
-
-    # https://wiki.archlinux.org/title/improving_performance#Watchdogs
-    blacklistedKernelModules = [ "sp5100_tco" ];
-
     # The boot drive is Samsung SSD 980 PRO 2TB.
     initrd.kernelModules = [ "nvme" ];
 
@@ -306,26 +279,9 @@ with lib;
     "/home/${my.username}".neededForBoot = true;
   };
 
-  systemd.mounts = [
-    {
-      type = "tmpfs";
-      what = "tmpfs";
-      where = "/var/tmp";
-      mountConfig.Options = [
-        "huge=within_size"
-        "mode=1777"
-        "noatime"
-        "nodev"
-        "nosuid"
-        "rw"
-        "size=25%"
-      ];
-    }
-  ];
-
   zramSwap = {
     enable = true;
-    memoryPercent = 25;
+    memoryPercent = 50;
   };
 
   my.extraGroups = [ "corectrl" ];
diff --git a/configurations/eonwe/ollama.nix b/configurations/eonwe/ollama.nix
index 806885b..45e6179 100644
--- a/configurations/eonwe/ollama.nix
+++ b/configurations/eonwe/ollama.nix
@@ -1,11 +1,11 @@
 {
-  config,
   lib,
   ...
 }:
 {
   ark.directories = [
-    config.services.ollama.home
+    "/var/lib/private/open-webui"
+    "/var/lib/private/ollama"
   ];
 
   hm.programs.firefox.profiles.default.bookmarks = [
@@ -32,9 +32,6 @@
       host = "0.0.0.0";
       port = 11434;
 
-      user = "ollama";
-      group = "ollama";
-
       acceleration = "rocm";
       rocmOverrideGfx = "11.0.0";
 
@@ -75,23 +72,4 @@
       openFirewall = true;
     };
   };
-
-  systemd.services.ollama.serviceConfig = {
-    StateDirectory = lib.mkForce config.services.ollama.home;
-    DynamicUser = lib.mkForce false;
-    User = config.services.ollama.user;
-    Group = config.services.ollama.group;
-  };
-
-  users = {
-    users.ollama = {
-      isSystemUser = true;
-      group = "ollama";
-      inherit (config.services.ollama) home;
-      uid = 241; # Reuses a removed ID from Nixpkgs.
-    };
-    groups.ollama.gid = 241;
-  };
-
-  my.extraGroups = [ "ollama" ];
 }
diff --git a/configurations/manwe/default.nix b/configurations/manwe/default.nix
index f9cb2be..89b111a 100644
--- a/configurations/manwe/default.nix
+++ b/configurations/manwe/default.nix
@@ -7,6 +7,9 @@ with lib;
 {
   imports = attrValues (modulesIn ./.);
 
+  # Something is broken there. Not sure why it affects me tho.
+  disabledModules = [ "services/networking/wireguard-networkd.nix" ];
+
   nixfiles.modules = {
     wireguard.server.enable = true;