jan-leila/nix-config
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jan-leila:0a7bbdbc8f63213a784b4e95a0e14cf24a6ef709
Branches Tags
jan-leila:main
..
compare: jan-leila:3fcd8f0244ad2df3389db26560acfec6bb1c81a6
Branches Tags
jan-leila:main

3 commits
0a7bbdbc8f ... 3fcd8f0244

Author SHA1 Message Date
Leyla Becker
3fcd8f0244 Merge remote-tracking branch 'origin' 2025-05-26 00:35:02 -05:00
Leyla Becker
60f8b0265a fixed ollama on defiant 2025-05-25 17:42:53 -05:00
Leyla Becker
089fbb8717 changed formatting for ollama.nix to wrap all of configurations in its enable option 2025-05-25 13:49:03 -05:00
1 changed files with 35 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

40
modules/nixos-modules/ollama.nix
View file

@ -7,7 +7,8 @@
services.ollama.exposePort = lib.mkEnableOption "should we expose ollama on tailscale"; services.ollama.exposePort = lib.mkEnableOption "should we expose ollama on tailscale";
}; };
config = lib.mkMerge [ config = lib.mkIf config.services.ollama.enable (
lib.mkMerge [
{ {
services.ollama = { services.ollama = {
# TODO: these should match whats set in the users file # TODO: these should match whats set in the users file
@ -15,7 +16,17 @@
user = "ollama"; user = "ollama";
}; };
} }
(lib.mkIf config.host.impermanence.enable (lib.mkIf config.services.ollama.enable { (lib.mkIf config.services.ollama.exposePort (let
ports = [
config.services.ollama.port
];
in {
networking.firewall.interfaces.${config.services.tailscale.interfaceName} = {
allowedTCPPorts = ports;
allowedUDPPorts = ports;
};
}))
(lib.mkIf config.host.impermanence.enable {
environment.persistence."/persist/system/root" = { environment.persistence."/persist/system/root" = {
enable = true; enable = true;
hideMounts = true; hideMounts = true;
@ -25,17 +36,16 @@
user = config.services.ollama.user; user = config.services.ollama.user;
group = config.services.ollama.group; group = config.services.ollama.group;
} }
]; {
}; directory = "/var/lib/private/ollama";
networking.firewall.interfaces.${config.services.tailscale.interfaceName} = let user = config.services.ollama.user;
ports = [ group = config.services.ollama.group;
config.services.ollama.port mode = "0700";
]; defaultPerms.mode = "0700";
in }
lib.mkIf config.services.ollama.exposePort { ];
allowedTCPPorts = ports; };
allowedUDPPorts = ports; })
}; ]
})) );
];
} }