From 292749e5c9b8904dc6fe2929af31c3a96536919d Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Sat, 9 Aug 2025 15:26:00 +0530 Subject: [PATCH] feat: disable unused stuff --- flake.lock | 6 ++-- home/programs/aichat.nix | 50 +++++++++++++++++--------------- modules/tuifeed.nix | 4 +-- nixos/ryu/services/llama.nix | 12 ++++---- nixos/ryu/services/minecraft.nix | 6 ++-- nixos/ryu/services/ollama.nix | 2 +- overlays.nix | 6 ++++ 7 files changed, 48 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index b644e8f9..2247fea6 100644 --- a/flake.lock +++ b/flake.lock @@ -1701,11 +1701,11 @@ "ik_llama": { "flake": false, "locked": { - "lastModified": 1754576781, - "narHash": "sha256-DeXIbHb5RtPn70Tg+s90oxq7EDxHRlB1wi8UuJ1v00E=", + "lastModified": 1754653098, + "narHash": "sha256-GyIIE9uSUv7Ipljk6lPJobtiHqEZNsl8bcO1MDq42DI=", "owner": "ikawrakow", "repo": "ik_llama.cpp", - "rev": "58f3bda0ae66e2ddf9e09ed7fe2b6242b0f8bb73", + "rev": "293f4aa433d1d38811d0f23328fa05289dbc30d6", "type": "github" }, "original": { diff --git a/home/programs/aichat.nix b/home/programs/aichat.nix index 757bed7f..e08d6a9b 100644 --- a/home/programs/aichat.nix +++ b/home/programs/aichat.nix @@ -45,33 +45,37 @@ { type = "openai-compatible"; name = "ryu"; - api_base = "https://ollama.ryu.darksailor.dev/v1"; + api_base = "https://llama.ryu.darksailor.dev/v1"; models = [ { - name = "RobinBially/nomic-embed-text-8k"; - type = "embedding"; - default_chunk_size = 8000; - } - { - name = "deepseek-r1:7b"; - type = "chat"; - } - { - name = "qwen3:30b-a3b"; - type = "chat"; - } - { - name = "deepseek-r1:14b"; - type = "chat"; - } - { - name = "qwen3:8b"; - type = "chat"; - } - { - name = "qwen3:14b"; + name = "gpt-oss-20b"; type = "chat"; } + # { + # name = "RobinBially/nomic-embed-text-8k"; + # type = "embedding"; + # default_chunk_size = 8000; + # } + # { + # name = "deepseek-r1:7b"; + # type = "chat"; + # } + # { + # name = "qwen3:30b-a3b"; + # type = "chat"; + # } + # { + # name = "deepseek-r1:14b"; + # type = "chat"; + # } + # { + # name = "qwen3:8b"; + # type = "chat"; + # } + # { + # name = "qwen3:14b"; + # type = "chat"; + # } ]; } { diff --git a/modules/tuifeed.nix b/modules/tuifeed.nix index 3df89d5f..f7258fa3 100644 --- a/modules/tuifeed.nix +++ b/modules/tuifeed.nix @@ -17,7 +17,7 @@ in { type = attrsOf str; default = {}; description = '' - Urls that will be fetched ~/.config/tuifeed/urls.yml + Sources that will be fetched ''; example = {}; }; @@ -29,7 +29,7 @@ in { "show-timestamp" = true; }; description = '' - Urls that will be fetched ~/.config/tuifeed/urls.yml + Options for article titles, such as showing the author and timestamp. ''; example = {}; }; diff --git a/nixos/ryu/services/llama.nix b/nixos/ryu/services/llama.nix index cb0aba52..6271bcf8 100644 --- a/nixos/ryu/services/llama.nix +++ b/nixos/ryu/services/llama.nix @@ -15,11 +15,11 @@ }; # package = pkgs.ik_llama; }; - # caddy = { - # virtualHosts."llama.ryu.darksailor.dev".extraConfig = '' - # import hetzner - # reverse_proxy localhost:${builtins.toString config.services.llama-cpp.port} - # ''; - # }; + caddy = { + virtualHosts."llama.ryu.darksailor.dev".extraConfig = '' + import hetzner + reverse_proxy localhost:${builtins.toString config.services.llama-cpp.port} + ''; + }; }; } diff --git a/nixos/ryu/services/minecraft.nix b/nixos/ryu/services/minecraft.nix index 10519bd4..e329f3c5 100644 --- a/nixos/ryu/services/minecraft.nix +++ b/nixos/ryu/services/minecraft.nix @@ -5,7 +5,7 @@ ... }: { sops = { - secrets."minecraft/craftmine".owner = "minecraft"; + secrets."minecraft/craftmine" = {}; templates = { "craftmine.env".content = '' CRAFTMINE_RCON_PASSWORD=${config.sops.placeholder."minecraft/craftmine"} @@ -22,7 +22,7 @@ }; in { minecraft-servers = { - enable = true; + enable = false; eula = true; openFirewall = true; environmentFile = config.sops.templates."craftmine.env".path; @@ -66,7 +66,7 @@ # }; craftmine-v2 = { inherit whitelist; - enable = true; + enable = false; jvmOpts = "-Xmx16G -Xms8G"; package = let getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless; diff --git a/nixos/ryu/services/ollama.nix b/nixos/ryu/services/ollama.nix index 7efe366a..a3d6d422 100644 --- a/nixos/ryu/services/ollama.nix +++ b/nixos/ryu/services/ollama.nix @@ -6,7 +6,7 @@ }: { services = { ollama = { - enable = true; + enable = false; host = "0.0.0.0"; # loadModels = ["deepseek-r1:7b" "deepseek-r1:14b" "RobinBially/nomic-embed-text-8k" "qwen3:8b" "qwen3:14b"]; port = 11434; diff --git a/overlays.nix b/overlays.nix index bc7758fb..7a0b7ee2 100644 --- a/overlays.nix +++ b/overlays.nix @@ -128,6 +128,12 @@ llama-cpp = prev.llama-cpp.overrideAttrs (oldAttrs: { src = inputs.llama-cpp; version = "b6116"; + cmakeFlags = + oldAttrs.cmakeFlags + ++ [ + "-DLLAMA_CUDA=ON" + "-DGGML_CUDA_FORCE_CUBLAS=ON" + ]; }); python312 = prev.python312.override { packageOverrides = final: prev: {