From 85721481b476d4b7c3f35a2926d800141496e2a4 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Thu, 26 Mar 2026 11:31:21 -0400 Subject: [PATCH] ollama stuff --- modules/kubernetes.nix | 25 --------------- systems/artemision/programs.nix | 10 ++++++ systems/palatine-hill/configuration.nix | 14 ++------- systems/palatine-hill/ollama.nix | 13 +++----- users/alice/non-server.nix | 41 ++++++++++++++++++++----- 5 files changed, 49 insertions(+), 54 deletions(-) diff --git a/modules/kubernetes.nix b/modules/kubernetes.nix index 6e2cded..9c959cf 100644 --- a/modules/kubernetes.nix +++ b/modules/kubernetes.nix @@ -49,30 +49,5 @@ # 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 - #''; }; } diff --git a/systems/artemision/programs.nix b/systems/artemision/programs.nix index af32a7d..810fadb 100644 --- a/systems/artemision/programs.nix +++ b/systems/artemision/programs.nix @@ -27,6 +27,16 @@ fd file firefox + + # Cinnamon desktop utilities + cinnamon + cinnamon-control-center + nemo + nemo-terminal + eom + gnome-terminal + xdg-utils + xdg-user-dirs # gestures replacement git glances diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index bb726bc..c41c3e8 100644 --- 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 @@ -26,10 +25,8 @@ 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 = { @@ -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"; diff --git a/systems/palatine-hill/ollama.nix b/systems/palatine-hill/ollama.nix index d9bc296..0db30c4 100644 --- a/systems/palatine-hill/ollama.nix +++ b/systems/palatine-hill/ollama.nix @@ -15,16 +15,11 @@ in "deepseek-r1:1.5b" "deepseek-r1:32b" "deepseek-r1:70b" - "qwen3" - #"qwen3-coder-next" + #"qwen3" + #"qwen3.5:latest" "qwen3-coder-next" "lennyerik/zeta" - "qwen2.5-coder:14b" - "qwen2.5-coder:32b" "nomic-embed-text:latest" - "llama4:scout" - "mistral:7b" - "minimax-m2.7:cloud" "lfm2:24b" "glm-4.7-flash" ]; @@ -33,9 +28,9 @@ in FLASH_ATTENTION = "1"; OLLAMA_KV_CACHE_TYPE = "q8_0"; # Ollama memory configuration - OLLAMA_MAX_LOADED_MODELS = "3"; + OLLAMA_MAX_LOADED_MODELS = "2"; OLLAMA_MAX_QUEUE = "512"; - OLLAMA_NUM_PARALLEL = "3"; + OLLAMA_NUM_PARALLEL = "1"; # ROCm memory optimization #HIP_VISIBLE_DEVICES = "0"; diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix index d529c27..0ab7d5e 100644 --- a/users/alice/non-server.nix +++ b/users/alice/non-server.nix @@ -63,8 +63,27 @@ "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; + keep_alive = "15m"; + }; + }; colorize_brackets = true; hard_tabs = false; vim_mode = true; @@ -77,7 +96,7 @@ agent = { default_model = { provider = "ollama"; - model = "qwen2.5-coder:latest"; + model = "lfm2:24b"; }; favorite_models = [ ]; model_parameters = [ ]; @@ -89,13 +108,16 @@ journal = { hour_format = "hour24"; }; - edit_preditions = { - provider = "open_ai_compatible_api"; - open_ai_compatible_api = { - api_url = "http://localhost:11434/v1/completions"; - model = "zeta:latest"; - prompt_format = "infer"; + 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"; max_requests = 64; + max_output_tokens = 256; }; }; texlab = { @@ -144,6 +166,8 @@ # markdown nodePackages.markdownlint-cli + # insert essential rust dependencies + # doom emacs dependencies yaml-language-server nodePackages.typescript-language-server @@ -163,7 +187,7 @@ languagetool # latex - texlive.combined.scheme-medium + texlive.combined.scheme-full # dependencies for nix-dotfiles/hydra-check-action nodejs_20 @@ -184,5 +208,6 @@ # arch zed deps nixd + uv ]; }