feat: switch from qwen-coder to GLM-4.7-Flash MLX, remove Ollama entirely

devenv.nix

@@ -790,8 +790,6 @@ in {
           ".#checks.''${CURRENT_SYSTEM}.sketchybar-entrypoint" \
           ".#checks.''${CURRENT_SYSTEM}.onepassword-guard" \
           ".#checks.''${CURRENT_SYSTEM}.onepassword-config-output" \
-          ".#checks.''${CURRENT_SYSTEM}.ollama-options" \
-          ".#checks.''${CURRENT_SYSTEM}.ollama-custom-options" \
           ".#checks.''${CURRENT_SYSTEM}.vane-options" \
           ".#checks.''${CURRENT_SYSTEM}.vane-custom-options" \
           ".#checks.''${CURRENT_SYSTEM}.openclaw-options" \

flake.nix

@@ -149,7 +149,6 @@
           configuration
           ./modules
           ./modules/nixos/base.nix
-          ./modules/services/ollama/nixos.nix
           ./modules/services/openclaw
           inputs.nix-openclaw.nixosModules.openclaw-gateway
           ./os/microvm.nix
@@ -175,7 +174,6 @@
           configuration
           ./modules
           ./modules/nixos/base.nix
-          ./modules/services/ollama/nixos.nix
           ./modules/services/openclaw
           inputs.nix-openclaw.nixosModules.openclaw-gateway
           ./os/microvm.nix
@@ -207,7 +205,7 @@
         };
       in
         {
-          inherit (pkgs) rtk yaks vane;
+          inherit (pkgs) rtk yaks vane glm47-flash-4bit glm47-flash-6bit glm47-flash-8bit qwen-embed;
           inherit (inputs.devenv.packages.${system}) devenv;
           installer = pkgs.callPackage ./packages/installer {};
         }
@@ -261,7 +259,6 @@
           nix-homebrew.darwinModules.nix-homebrew
           ./modules
           ./modules/roles/homebrew.nix
-          ./modules/services/ollama/darwin.nix
           ./modules/services/vane/darwin.nix
           ./os/darwin.nix
           ./modules/home-manager/aerospace.nix
@@ -272,7 +269,7 @@
       };
 
       # Darwin server - headless macOS server for VM hosting
-      # Uses Lume for macOS VMs, with Ollama for local LLMs
+      # Uses Lume for macOS VMs
       "darwin-server" = nix-darwin.lib.darwinSystem {
         specialArgs = {inherit inputs mkUser;};
         modules = [
@@ -284,7 +281,6 @@
           configuration
           ./modules
           ./modules/services/lume/darwin.nix
-          ./modules/services/ollama/darwin.nix
           ./os/darwin.nix
           ./targets/darwin-server
           home-manager.darwinModules.home-manager
@@ -342,7 +338,6 @@
         modules = [
           ./library/archetypes/headless-server-darwin.nix
           ./modules/services/lume/darwin.nix
-          ./modules/services/ollama/darwin.nix
           ./os/darwin.nix
           ./targets/darwin-server
           home-manager.darwinModules.home-manager
@@ -367,7 +362,6 @@
           nix-homebrew.darwinModules.nix-homebrew
           ./modules
           ./modules/roles/homebrew.nix
-          ./modules/services/ollama/darwin.nix
           ./modules/services/vane/darwin.nix
           ./modules/services/searxng/darwin.nix
           ./modules/services/higgs/darwin.nix
@@ -423,7 +417,6 @@
           ./modules/nixos/desktop.nix
           ./modules/nixos/gaming.nix
           ./modules/nixos/streaming.nix
-          ./modules/services/ollama/nixos.nix
           ./modules/services/openclaw
           inputs.nix-openclaw.nixosModules.openclaw-gateway
           ./os/nixos.nix
@@ -576,7 +569,6 @@
           ./modules/nixos/desktop.nix
           ./modules/nixos/gaming.nix
           ./modules/nixos/streaming.nix
-          ./modules/services/ollama/nixos.nix
           ./modules/services/openclaw
           inputs.nix-openclaw.nixosModules.openclaw-gateway
           ./os/nixos.nix
@@ -712,7 +704,6 @@
             role-composition
             role-packages
             role-cascades
-            llm-host-shared-models
             no-dead-development-option
             module-coverage
             skills-manifest
@@ -739,8 +730,6 @@
             sketchybar-entrypoint
             aerospace-options
             aerospace-custom-options
-            ollama-options
-            ollama-custom-options
             vane-options
             vane-custom-options
             vane-opnix-url-options

modules/common/options.nix

@@ -126,13 +126,6 @@ with lib; {
           description = "Pi coding agent with rtk";
         };
       };
-      llm-host = {
-        enable = mkOption {
-          type = types.bool;
-          default = false;
-          description = "Local LLM hosting (ollama)";
-        };
-      };
 
       assistant = {
         enable = mkOption {
@@ -483,7 +476,7 @@ with lib; {
             model = mkOption {
               type = types.nullOr types.str;
               default = null;
-              description = "Model for this agent (e.g., ollama/qwen3.5:2b)";
+              description = "Model for this agent (e.g., higgs/glm47-flash-4bit)";
             };
             prompt = mkOption {
               type = types.str;
@@ -755,44 +748,6 @@ with lib; {
       };
     };
 
-    ollama = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable Ollama local LLM service";
-      };
-
-      host = mkOption {
-        type = types.str;
-        default = "127.0.0.1";
-        description = "Host address for Ollama to bind to (use 0.0.0.0 for network access)";
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = 11434;
-        description = "Port for Ollama API";
-      };
-
-      models = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = "List of models to pre-pull on service start";
-      };
-
-      acceleration = mkOption {
-        type = types.nullOr (types.enum ["cuda" "rocm" "metal"]);
-        default = null;
-        description = "GPU acceleration type (null for auto-detection)";
-      };
-
-      environmentFile = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        description = "Path to environment file with additional Ollama configuration";
-      };
-    };
-
     vane = {
       enable = mkOption {
         type = types.bool;
@@ -1204,7 +1159,7 @@ with lib; {
             };
             provider = mkOption {
               type = types.str;
-              description = "Provider ID (e.g., 'anthropic', 'openai', 'ollama')";
+              description = "Provider ID (e.g., 'anthropic', 'openai', 'higgs')";
             };
             modelId = mkOption {
               type = types.str;
@@ -1406,6 +1361,11 @@ with lib; {
               type = types.str;
               description = "Model path or HuggingFace ID";
             };
+            package = mkOption {
+              type = types.nullOr types.package;
+              default = null;
+              description = "Nix package providing the model (overrides path with store path)";
+            };
             name = mkOption {
               type = types.nullOr types.str;
               default = null;

modules/common/shell.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+{pkgs, ...}: let
   # Create proper executable scripts in the nix store
   switch-nix-script = pkgs.writeShellScriptBin "switch-nix" (builtins.readFile ./scripts/switch-nix);
   nix-cloud-init-script = pkgs.writeShellScriptBin "nix-cloud-init" (builtins.readFile ./scripts/nix-cloud-init);
@@ -17,15 +13,6 @@ in {
   programs.zsh.interactiveShellInit = ''
     export SHELL=${pkgs.zsh}/bin/zsh
 
-    ${
-      if config.myConfig.ollama.enable
-      then ''
-        # Ollama configuration (set because myConfig.ollama is enabled)
-        export OLLAMA_HOST="http://${config.myConfig.ollama.host}:${toString config.myConfig.ollama.port}"
-      ''
-      else ""
-    }
-
     # Source switch-nix function
     if [ -f ${switch-nix-script}/bin/switch-nix ]; then
       . ${switch-nix-script}/bin/switch-nix

modules/home-manager/higgs.nix

@@ -33,7 +33,10 @@ with lib; let
 
   modelsConfig = map (m:
     clean {
-      path = m.path;
+      path =
+        if m.package != null
+        then "${m.package}"
+        else m.path;
       name = m.name;
       mlx_profile = m.mlxProfile;
       batch = m.batch;

modules/home-manager/shell.nix

@@ -11,10 +11,13 @@
   programs.zsh = {
     enable = true;
     initContent = ''
-      # Source switch-nix function (same source as system-wide install)
-      if [ -f /etc/nix-cloud-init/switch-nix ]; then
-        . /etc/nix-cloud-init/switch-nix
-      fi
+        # pipx-installed CLI tools
+        export PATH="$PATH:$HOME/.local/bin"
+
+        # Source switch-nix function (same source as system-wide install)
+        if [ -f /etc/nix-cloud-init/switch-nix ]; then
+          . /etc/nix-cloud-init/switch-nix
+        fi
 
       # Docker functions
       drm() { docker rm $(docker ps -q -a); }

modules/roles/default.nix

@@ -21,7 +21,6 @@ in {
     ./pi.nix
     ./assistant.nix
     ./email-backup.nix
-    ./llm-host.nix
     ./microvm-host.nix
     ./tailscale.nix
     # Note: homebrew.nix is imported separately by configurations that use nix-homebrew

modules/services/higgs/darwin.nix

@@ -28,6 +28,7 @@ in {
         ];
         RunAtLoad = true;
         KeepAlive = true;
+        WatchPaths = ["${darwinHomeDir}/.config/higgs/config.toml"];
         StandardOutPath = "/tmp/higgs.log";
         StandardErrorPath = "/tmp/higgs.err";
         EnvironmentVariables = {