From 598cbb4750d5622c3c04410a88a8d1ff20057bd9 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sun, 26 Jan 2025 19:39:50 +0100 Subject: [PATCH] --wip-- [skip ci] --- flake.nix | 8 +++++--- modules/hm/vim.nix | 13 ++++++++++++- secrets/ollama.age | Bin 0 -> 651 bytes secrets/secrets.nix | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 secrets/ollama.age 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 0000000000000000000000000000000000000000..63017101fbd7634b79b1d269422cd635fd80678c GIT binary patch literal 651 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSHtTeZD3si72@ifiw zGA=IFkEn8VF3k_}ugGytuLy8)OUiN14fSz0_e>8CFEB{YF6Z*DvIz7lGI0uy2rN%G zHb~dE(04O2^DlEW2#LzJOg1t1DK6E{aW_lPGeNh_Bq=q+%~8S6wJNuw+`H1hDBP$j zz`4q~*tys*u*4mrJ^LI*gVqIGRn)-&B-J@ zMB60GqQKG8Njobq#nUw)%+0{5Fdf~t4EI3CU`K_d&}@HG3(G=dcQbQ+SMB0FH?J(8 z9N+NLNQ1D_iu@|SeB-3b9GAo-BLl9;w1_Ids-nm=|KcFS$epB#Q$jNWTnr1d4b3tlO>!%o zGn@(vl3h#;gED<0G90;lA~P*3^wR^pjPtxw{mipXwB5Wty#vfGEkYdAjDpe(4Yi%U z(wsc}0vx$?b#)a=EsOP?Gm_lOihL`5D=OVG{R%^q&GNl1TzuTKEHW!fy#vw;%Z(C~ z3SGIBJ#Er1SI>#nW1i9=CGkVCVC`Nl)A?--Clz^&$ zeW$UXtln&>eD?lr;eg{4ntN`g4$=0g!6r Awg3PC literal 0 HcmV?d00001 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 ]; }