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

Reviewed-on: #200

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1774152686,
+        "lastModified": 1774497795,
-        "narHash": "sha256-RlEgsdHr9IQm79SsXKNT8iU+ZjjIOPTJXcatMqgSfwk=",
+        "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "4c83dbe717272428562a33db817f492195e227ae",
+        "rev": "11af6f465a038233b8123022dcb7e293f3229f11",
         "type": "gitlab"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774198433,
+        "lastModified": 1774379316,
-        "narHash": "sha256-V98UvfIy4jeqhFDLBmEUXCAh2Enmq+1f7NRRlRXY6pE=",
+        "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "38539206d0637bc951f01192e32b4e64d91d0941",
+        "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1774018263,
+        "lastModified": 1774465523,
-        "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
+        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
+        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773821835,
+        "lastModified": 1774386573,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774149071,
+        "lastModified": 1774494762,
-        "narHash": "sha256-SYp8NyzwfCO3Guqmu9hPRHR1hwESlQia5nNz3lYo2qA=",
+        "narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "6a031966eab3bfaa19be9e261eed5b8a79c04b18",
+        "rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774154798,
+        "lastModified": 1774303811,
-        "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
+        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
+        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
         "type": "github"
       },
       "original": {

modules/fwupd.nix

@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  services.fwupd.enable = lib.mkDefault true;
+}

modules/kubernetes.nix

@@ -46,10 +46,10 @@
       kubernetes
     ];
 
-    # Enable containerd for Kubernetes
+    ## Enable containerd for Kubernetes
-    virtualisation.containerd.enable = true;
+    #virtualisation.containerd.enable = true;
 
-    # Enable kubelet
+    ## Enable kubelet
     #services.kubelet = {
     #  enable = true;
     #  extraFlags = {

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

systems/artemision/programs.nix

@@ -27,6 +27,7 @@
     fd
     file
     firefox
+
     # gestures replacement
     git
     glances
@@ -34,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

systems/palatine-hill/configuration.nix

@@ -17,7 +17,6 @@
     ./minio.nix
     ./networking.nix
     ./nextcloud.nix
-    ./ollama.nix
     #./plex
     ./postgresql.nix
     ./samba.nix
@@ -26,11 +25,9 @@
 
   programs.git.lfs.enable = false;
 
-  nixpkgs.config = {
+  nixpkgs.config.packageOverrides = pkgs: {
-    packageOverrides = pkgs: {
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
-  };
 
   boot = {
     loader.grub.device = "/dev/sda";
@@ -100,13 +97,6 @@
     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";

systems/palatine-hill/docker/minecraft.nix

@@ -80,74 +80,6 @@ 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";
       volumes = [
@@ -161,10 +93,11 @@ in
         CF_FILENAME_MATCHER = "1.11.2";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
-        DIFFICULTY = "hard";
+        DIFFICULTY = "peaceful";
         ENABLE_COMMAND_BLOCK = "true";
         INIT_MEMORY = "4G";
         MAX_MEMORY = "16G";
+        SEED = "-7146406535839057559";
       };
       extraOptions = defaultOptions;
       log-driver = "local";

systems/palatine-hill/ollama.nix

@@ -12,39 +12,45 @@ in
       package = pkgs.ollama;
       syncModels = true;
       loadModels = [
-        "gemma3"
-        "deepseek-r1:latest"
         "deepseek-r1:1.5b"
-        "qwen3"
+        "deepseek-r1:32b"
-        #"qwen3-coder-next"
+        "deepseek-r1:70b"
-        "qwen3-coder"
+        #"qwen3"
+        #"qwen3.5:latest"
+        "qwen3-coder-next"
         "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 = "q8_0";
+        OLLAMA_KV_CACHE_TYPE = "q4_0";
         # Ollama memory configuration
-        OLLAMA_MAX_LOADED_MODELS = "2";
+        OLLAMA_MAX_LOADED_MODELS = "3";
-        OLLAMA_MAX_QUEUE = "4";
+        OLLAMA_MAX_QUEUE = "512";
-        OLLAMA_NUM_PARALLEL = "2";
+        OLLAMA_NUM_PARALLEL = "1";
 
         # ROCm memory optimization
         #HIP_VISIBLE_DEVICES = "0";
         #ROCR_VISIBLE_DEVICES = "0";
 
         # context length for agents
-        OLLAMA_CONTEXT_LENGTH = "64000";
+        OLLAMA_CONTEXT_LENGTH = "128000";
       };
       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 = {

systems/selinunte/programs.nix

@@ -31,7 +31,6 @@
     grim
     htop
     hwloc
-    ipmiview
     iperf3
     # ipscan
     jp2a

users/alice/non-server.nix

@@ -63,8 +63,81 @@
         "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;
@@ -77,7 +150,7 @@
         agent = {
           default_model = {
             provider = "ollama";
-            model = "qwen2.5-coder:latest";
+            model = "glm-4.7-flash";
           };
           favorite_models = [ ];
           model_parameters = [ ];
@@ -89,13 +162,16 @@
         journal = {
           hour_format = "hour24";
         };
-        edit_preditions = {
+        edit_predictions = {
-          provider = "open_ai_compatible_api";
+          provider = "ollama";
-          open_ai_compatible_api = {
+          ollama = {
-            api_url = "http://localhost:11434/v1/completions";
+            #api_url = "http://192.168.76.2:11434/v1/completions";
-            model = "zeta:latest";
+            api_url = "http://192.168.76.2:11434";
-            prompt_format = "infer";
+            context_window = 128000;
+            model = "lennyerik/zeta";
+            prompt_format = "qwen";
             max_requests = 64;
+            max_output_tokens = 256;
           };
         };
         texlab = {
@@ -144,6 +220,8 @@
     # markdown
     nodePackages.markdownlint-cli
 
+    # insert essential rust dependencies
+
     # doom emacs dependencies
     yaml-language-server
     nodePackages.typescript-language-server
@@ -184,5 +262,6 @@
 
     # arch zed deps
     nixd
+    uv
   ];
 }