diff --git a/flake.nix b/flake.nix index 1f1c677..75b5162 100644 --- a/flake.nix +++ b/flake.nix @@ -121,6 +121,8 @@ # Some basic defaults ./modules/nixos/basics + + { age.secrets.ollama = { file = ./secrets/ollama.age; owner = "bertof"; }; } ]; @@ -257,8 +259,8 @@ ./modules/nixos/s3_cache_write.nix { age.secrets.s3_thor = { file = ./secrets/s3_thor.age; owner = "bertof"; }; } - ./modules/nixos/cuda_support.nix - ./modules/nixos/ollama.nix + # ./modules/nixos/cuda_support.nix + # ./modules/nixos/ollama.nix ./modules/nixos/pro_audio.nix ./modules/nixos/kdeconnect.nix ./modules/nixos/steam.nix @@ -291,7 +293,7 @@ ./modules/nixos/s3_cache_write.nix { age.secrets.s3_sif = { file = ./secrets/s3_sif.age; owner = "bertof"; }; } - ./modules/nixos/ollama.nix + # ./modules/nixos/ollama.nix ./modules/nixos/pro_audio.nix ./modules/nixos/kdeconnect.nix ./modules/nixos/steam.nix diff --git a/modules/hm/vim.nix b/modules/hm/vim.nix index 3f77f8c..7d97f59 100644 --- a/modules/hm/vim.nix +++ b/modules/hm/vim.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, nixosConfig, ... }: let vp = pkgs.vimPlugins; in @@ -403,8 +403,19 @@ in plugin = vp.ollama-nvim; type = "lua"; config = '' + function readAll(file) + local f = assert(io.open(file, "rb")) + local content = f:read("*all") + f:close() + return content + end + local url = readAll("${nixosConfig.age.secrets.ollama.path}") + + print(vim.inspect(url)) + local ollama = require("ollama") ollama:setup({ + url = url, model = "codegemma:7b" }) ''; diff --git a/secrets/ollama.age b/secrets/ollama.age new file mode 100644 index 0000000..6301710 Binary files /dev/null and b/secrets/ollama.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 402f98e..89c744a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -56,4 +56,5 @@ in "s3_odin.age".publicKeys = devUsers ++ [ odin ]; "s3_sif.age".publicKeys = devUsers ++ [ sif ]; "s3_thor.age".publicKeys = devUsers ++ [ thor ]; + "ollama.age".publicKeys = devUsers ++ [ sif thor ]; }