automated: Update flake.lock

Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
2026-03-22 12:14:34 +00:00
10 changed files with 127 additions and 151 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1774497795,
-        "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=",
+        "lastModified": 1774152686,
+        "narHash": "sha256-RlEgsdHr9IQm79SsXKNT8iU+ZjjIOPTJXcatMqgSfwk=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "11af6f465a038233b8123022dcb7e293f3229f11",
+        "rev": "4c83dbe717272428562a33db817f492195e227ae",
        "type": "gitlab"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774379316,
-        "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
+        "lastModified": 1774135471,
+        "narHash": "sha256-TVeIGOxnfSPM6JvkRkXHpJECnj1OG2dXkWMSA4elzzQ=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
+        "rev": "856b01ebd1de3f53c3929ce8082d9d67d799d816",
        "type": "github"
      },
      "original": {
@@ -417,11 +417,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1774465523,
-        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
+        "lastModified": 1774018263,
+        "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
+        "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
        "type": "github"
      },
      "original": {
@@ -502,11 +502,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1774386573,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "lastModified": 1773821835,
+        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774494762,
-        "narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=",
+        "lastModified": 1774149071,
+        "narHash": "sha256-SYp8NyzwfCO3Guqmu9hPRHR1hwESlQia5nNz3lYo2qA=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf",
+        "rev": "6a031966eab3bfaa19be9e261eed5b8a79c04b18",
        "type": "github"
      },
      "original": {
@@ -616,11 +616,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774303811,
-        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
+        "lastModified": 1774154798,
+        "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
+        "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
        "type": "github"
      },
      "original": {
--- a/modules/fwupd.nix
+++ b/modules/fwupd.nix
@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  services.fwupd.enable = lib.mkDefault true;
-}
--- a/modules/kubernetes.nix
+++ b/modules/kubernetes.nix
@@ -46,10 +46,10 @@
      kubernetes
    ];

-    ## Enable containerd for Kubernetes
-    #virtualisation.containerd.enable = true;
+    # Enable containerd for Kubernetes
+    virtualisation.containerd.enable = true;

-    ## Enable kubelet
+    # Enable kubelet
    #services.kubelet = {
    #  enable = true;
    #  extraFlags = {
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -1,7 +1,6 @@
 {
  lib,
  pkgs,
-  config,
  ...
 }:
 {
@@ -18,7 +17,6 @@
    ./stylix.nix
    ./wifi.nix
    ./zerotier.nix
-    ../palatine-hill/ollama.nix
  ];

  time.timeZone = "America/New_York";
@@ -41,19 +39,6 @@
  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];

  services = {
-    ollama = {
-      package = lib.mkForce pkgs.ollama-rocm;
-      models = lib.mkForce "${config.services.ollama.home}/models";
-      loadModels = lib.mkForce [
-        "deepseek-r1:1.5b"
-        "lennyerik/zeta"
-        "nomic-embed-text:latest"
-        "glm-4.7-flash"
-        "magistral"
-        "devstral-small-2"
-        "starcoder2:7b"
-      ];
-    };
    flatpak.enable = true;
    calibre-web = {
      # temp disable this
--- a/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -27,7 +27,6 @@
    fd
    file
    firefox
-
    # gestures replacement
    git
    glances
@@ -35,8 +34,12 @@
    grim
    htop
    hwloc
+    ipmiview
    iperf3
    # ipscan
+    javaPackages.compiler.temurin-bin.jdk-25
+    javaPackages.compiler.temurin-bin.jdk-21
+    javaPackages.compiler.temurin-bin.jdk-17
    jp2a
    jq
    kdePackages.kdenlive
--- a/systems/palatine-hill/configuration.nix
+++ b/systems/palatine-hill/configuration.nix
@@ -17,6 +17,7 @@
    ./minio.nix
    ./networking.nix
    ./nextcloud.nix
+    ./ollama.nix
    #./plex
    ./postgresql.nix
    ./samba.nix
@@ -25,8 +26,10 @@

  programs.git.lfs.enable = false;

-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+  nixpkgs.config = {
+    packageOverrides = pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    };
  };

  boot = {
@@ -97,6 +100,13 @@
    smartd.enable = true;
    calibre-server.enable = false;

+    # Kubernetes example configuration
+    # To enable Kubernetes, uncomment the following:
+    # kubernetes = {
+    #   enable = true;
+    #   clusterName = "palatine-hill-cluster";
+    #   controlPlaneEndpoint = "localhost:6443";
+    # };
  };

  nix.gc.options = "--delete-older-than 150d";
--- a/systems/palatine-hill/docker/minecraft.nix
+++ b/systems/palatine-hill/docker/minecraft.nix
@@ -80,8 +80,76 @@ in
    #  log-driver = "local";
    #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
    #};
+    prominence-ii = {
+      image = "itzg/minecraft-server:java25";
+      volumes = [
+        "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
+        "${minecraft_path}/prominence-ii/data:/data"
+      ];
+      hostname = "pii";
+      environment = defaultEnv // {
+        VERSION = "1.20.1";
+        CF_SLUG = "prominence-2-hasturian-era";
+        CF_FILENAME_MATCHER = "3.9.14hf";
+        MEMORY = "8G";
+        USE_AIKAR_FLAGS = "false";
+        USE_MEOWICE_FLAGS = "true";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
+        ENABLE_COMMAND_BLOCK = "true";
+        CF_FORCE_INCLUDE_FILES = ''
+          emi
+        '';
+      };
+      extraOptions = defaultOptions;
+      log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    };
+    stoneblock-4 = {
+      image = "itzg/minecraft-server:java25";
+      volumes = [
+        "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
+        "${minecraft_path}/stoneblock-4/data:/data"
+      ];
+      hostname = "stoneblock-4";
+      environment = defaultEnv // {
+        VERSION = "1.21.1";
+        CF_SLUG = "ftb-stoneblock-4";
+        CF_FILENAME_MATCHER = "1.6.0";
+        MEMORY = "8G";
+        USE_AIKAR_FLAGS = "false";
+        USE_MEOWICE_FLAGS = "true";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
+        ENABLE_COMMAND_BLOCK = "true";
+      };
+      extraOptions = defaultOptions;
+      log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    };
+    submerged-2 = {
+      image = "itzg/minecraft-server:java25";
+      volumes = [
+        "${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
+        "${minecraft_path}/submerged-2/data:/data"
+      ];
+      hostname = "submerged-2";
+      environment = defaultEnv // {
+        VERSION = "1.21.1";
+        CF_SLUG = "submerged-2";
+        CF_FILENAME_MATCHER = "B6.1";
+        USE_AIKAR_FLAGS = "false";
+        USE_MEOWICE_FLAGS = "true";
+        USE_MEOWICE_GRAALVM_FLAGS = "true";
+        DIFFICULTY = "hard";
+        ENABLE_COMMAND_BLOCK = "true";
+      };
+      extraOptions = defaultOptions;
+      log-driver = "local";
+      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    };
    cobblemon-overclocked = {
-      image = "itzg/minecraft-server:java21";
+      image = "itzg/minecraft-server:java25";
      volumes = [
        "${minecraft_path}/cobblemon-overclocked/modpacks:/modpacks:ro"
        "${minecraft_path}/cobblemon-overclocked/data:/data"
@@ -93,11 +161,10 @@ in
        CF_FILENAME_MATCHER = "1.11.2";
        USE_AIKAR_FLAGS = "false";
        USE_MEOWICE_FLAGS = "true";
-        DIFFICULTY = "peaceful";
+        DIFFICULTY = "hard";
        ENABLE_COMMAND_BLOCK = "true";
        INIT_MEMORY = "4G";
        MAX_MEMORY = "16G";
-        SEED = "-7146406535839057559";
      };
      extraOptions = defaultOptions;
      log-driver = "local";
--- a/systems/palatine-hill/ollama.nix
+++ b/systems/palatine-hill/ollama.nix
@@ -12,45 +12,39 @@ in
      package = pkgs.ollama;
      syncModels = true;
      loadModels = [
+        "gemma3"
+        "deepseek-r1:latest"
        "deepseek-r1:1.5b"
-        "deepseek-r1:32b"
-        "deepseek-r1:70b"
-        #"qwen3"
-        #"qwen3.5:latest"
-        "qwen3-coder-next"
+        "qwen3"
+        #"qwen3-coder-next"
+        "qwen3-coder"
        "lennyerik/zeta"
+        "llama3.1:8b"
+        "qwen2.5-coder:1.5b-base"
        "nomic-embed-text:latest"
-        "lfm2:24b"
-        "glm-4.7-flash"
-        "nemotron-cascade-2:30b"
-        "magistral"
-        "devstral-small-2"
-        "starcoder2:15b"
      ];
      models = vars.primary_ollama;
      environmentVariables = {
        FLASH_ATTENTION = "1";
-        OLLAMA_KV_CACHE_TYPE = "q4_0";
+        OLLAMA_KV_CACHE_TYPE = "q8_0";
        # Ollama memory configuration
-        OLLAMA_MAX_LOADED_MODELS = "3";
-        OLLAMA_MAX_QUEUE = "512";
-        OLLAMA_NUM_PARALLEL = "1";
+        OLLAMA_MAX_LOADED_MODELS = "2";
+        OLLAMA_MAX_QUEUE = "4";
+        OLLAMA_NUM_PARALLEL = "2";

        # ROCm memory optimization
        #HIP_VISIBLE_DEVICES = "0";
        #ROCR_VISIBLE_DEVICES = "0";

        # context length for agents
-        OLLAMA_CONTEXT_LENGTH = "128000";
+        OLLAMA_CONTEXT_LENGTH = "64000";
      };
      openFirewall = true;
-      host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
    };
    open-webui = {
      enable = true;
      port = 21212;
      openFirewall = true;
-      host = "0.0.0.0"; # don't want to make this available via load-balancer yet, so making it available on the local network
    };
  };
  users.users.ollama = {
--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -31,6 +31,7 @@
    grim
    htop
    hwloc
+    ipmiview
    iperf3
    # ipscan
    jp2a
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -63,81 +63,8 @@
        "latex"
        "terraform"
        "log"
-        "context7-mcp-server"
-        "github-mcp-server"
      ];
      userSettings = {
-        context_servers = {
-          nixos = {
-            command = "nix";
-            args = [
-              "run"
-              "github:utensils/mcp-nixos"
-              "--"
-            ];
-          };
-        };
-        language_models = {
-          ollama = {
-            api_url = "http://192.168.76.2:11434";
-            context_window = 128000;
-            # global keep alive doesnt work
-            #keep_alive = "15m";
-            available_models = [
-              {
-                name = "deepseek-r1:1.5b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "deepseek-r1:32b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "deepseek-r1:70b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "qwen3-coder-next";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "lennyerik/zeta";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "nomic-embed-text:latest";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "lfm2:24b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "glm-4.7-flash";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "nemotron-cascade-2:30b";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-              {
-                name = "magistral";
-                max_tokens = 128000;
-                keep_alive = "15m";
-              }
-
-            ];
-          };
-        };
        colorize_brackets = true;
        hard_tabs = false;
        vim_mode = true;
@@ -150,7 +77,7 @@
        agent = {
          default_model = {
            provider = "ollama";
-            model = "glm-4.7-flash";
+            model = "qwen2.5-coder:latest";
          };
          favorite_models = [ ];
          model_parameters = [ ];
@@ -162,16 +89,13 @@
        journal = {
          hour_format = "hour24";
        };
-        edit_predictions = {
-          provider = "ollama";
-          ollama = {
-            #api_url = "http://192.168.76.2:11434/v1/completions";
-            api_url = "http://192.168.76.2:11434";
-            context_window = 128000;
-            model = "lennyerik/zeta";
-            prompt_format = "qwen";
+        edit_preditions = {
+          provider = "open_ai_compatible_api";
+          open_ai_compatible_api = {
+            api_url = "http://localhost:11434/v1/completions";
+            model = "zeta:latest";
+            prompt_format = "infer";
            max_requests = 64;
-            max_output_tokens = 256;
          };
        };
        texlab = {
@@ -220,8 +144,6 @@
    # markdown
    nodePackages.markdownlint-cli

-    # insert essential rust dependencies
-
    # doom emacs dependencies
    yaml-language-server
    nodePackages.typescript-language-server
@@ -262,6 +184,5 @@

    # arch zed deps
    nixd
-    uv
  ];
 }