Merge pull request 'remove qwen3.5-coder-next' (#200 ) from feature/ollama-local into main

Reviewed-on: #200
remove qwen3.5-coder-next
2026-03-27 01:38:11 -04:00 · 2026-03-27 01:24:59 -04:00 · 2026-03-26 22:03:23 -04:00 · 2026-03-26 21:58:32 -04:00 · 2026-03-26 21:57:49 -04:00 · 2026-03-26 21:42:13 -04:00
7 changed files with 88 additions and 12 deletions
--- a/modules/kubernetes.nix
+++ b/modules/kubernetes.nix
@@ -46,8 +46,33 @@
      kubernetes
    ];

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

+    ## Enable kubelet
+    #services.kubelet = {
+    #  enable = true;
+    #  extraFlags = {
+    #    "pod-infra-container-image" = "registry.k8s.io/pause:3.9";
+    #  };
+    #};
+
+    ## Enable kubeadm for cluster initialization
+    #environment.etc."kubeadm.yaml".text = ''
+    #  apiVersion: kubeadm.k8s.io/v1beta3
+    #  kind: InitConfiguration
+    #  localAPIEndpoint:
+    #    advertiseAddress: 127.0.0.1
+    #    bindPort: 6443
+    #  ---
+    #  apiVersion: kubeadm.k8s.io/v1beta3
+    #  kind: ClusterConfiguration
+    #  clusterName: ${config.services.kubernetes.clusterName}
+    #  controlPlaneEndpoint: ${config.services.kubernetes.controlPlaneEndpoint}
+    #  networking:
+    #    serviceSubnet: 10.96.0.0/12
+    #    podSubnet: 10.244.0.0/16
+    #    dnsDomain: cluster.local
+    #'';
  };
 }
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -1,6 +1,7 @@
 {
  lib,
  pkgs,
+  config,
  ...
 }:
 {
@@ -17,6 +18,7 @@
    ./stylix.nix
    ./wifi.nix
    ./zerotier.nix
+    ../palatine-hill/ollama.nix
  ];

  time.timeZone = "America/New_York";
@@ -39,6 +41,19 @@
  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
@@ -35,12 +35,8 @@
    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,7 +17,6 @@
    ./minio.nix
    ./networking.nix
    ./nextcloud.nix
-    ./ollama.nix
    #./plex
    ./postgresql.nix
    ./samba.nix
--- a/systems/palatine-hill/ollama.nix
+++ b/systems/palatine-hill/ollama.nix
@@ -25,13 +25,14 @@ in
        "nemotron-cascade-2:30b"
        "magistral"
        "devstral-small-2"
+        "starcoder2:15b"
      ];
      models = vars.primary_ollama;
      environmentVariables = {
        FLASH_ATTENTION = "1";
-        OLLAMA_KV_CACHE_TYPE = "q8_0";
+        OLLAMA_KV_CACHE_TYPE = "q4_0";
        # Ollama memory configuration
-        OLLAMA_MAX_LOADED_MODELS = "2";
+        OLLAMA_MAX_LOADED_MODELS = "3";
        OLLAMA_MAX_QUEUE = "512";
        OLLAMA_NUM_PARALLEL = "1";

--- a/systems/selinunte/programs.nix
+++ b/systems/selinunte/programs.nix
@@ -31,7 +31,6 @@
    grim
    htop
    hwloc
-    ipmiview
    iperf3
    # ipscan
    jp2a
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -85,7 +85,32 @@
            #keep_alive = "15m";
            available_models = [
              {
-                name = "glm-4.7-flash";
+                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";
              }
@@ -94,6 +119,22 @@
                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";
+              }
+
            ];
          };
        };
@@ -200,7 +241,7 @@
    languagetool

    # latex
-    texlive.combined.scheme-full
+    texlive.combined.scheme-medium

    # dependencies for nix-dotfiles/hydra-check-action
    nodejs_20
Author	SHA1	Message	Date
ahuston-0	e45e7960da	Merge pull request 'remove qwen3.5-coder-next' (#200 ) from feature/ollama-local into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 9s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m42s Details Reviewed-on: #200	2026-03-27 01:38:11 -04:00
ahuston-0	0d5bf7e46d	remove qwen3.5-coder-next All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 14s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 6m57s Details	2026-03-27 01:24:59 -04:00
ahuston-0	83c7ef00ad	Merge pull request 'automated: Update `flake.lock`' (#186 ) from update-flake-lock into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 8s Details Check Nix flake / Perform Nix flake checks (push) Successful in 23m3s Details Reviewed-on: #186	2026-03-26 22:03:23 -04:00
github-actions[bot]	1fbe15c0a0	automated: Update `flake.lock` All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 15s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m38s Details 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-26 21:58:32 -04:00
ahuston-0	a923f4fd82	Merge pull request 'feature/zed-models' (#199 ) from feature/zed-models into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 8s Details Check Nix flake / Perform Nix flake checks (push) Successful in 3m57s Details Reviewed-on: #199	2026-03-26 21:57:49 -04:00
ahuston-0	802bf1ca4c	add ollama back to artemision All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 6s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 15m11s Details	2026-03-26 21:42:13 -04:00
ahuston-0	b5e45398d8	3 parallel models	2026-03-26 21:42:13 -04:00