diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index 9646b669..5d8a67f4 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -4,10 +4,7 @@ extraConfig = { config.gaming.enable = true; - config.containers = { - enable = true; - ollama.enable = true; - }; + config.ollama.enable = true; config.hyprlandOverrides = { settings = { diff --git a/system/containers/default.nix b/system/containers/default.nix deleted file mode 100644 index c6b2df7d..00000000 --- a/system/containers/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, lib, ...}: { - config = lib.mkIf config.containers.enable { - virtualization.oci-containers.containers.ollama = lib.mkIf config.containers.ollama.enable { - image = "ollama/ollama@sha256:4325d935cd6e07cfa840eb193aad0594ba6cbc97ca9d0778f6716507cb3955ed"; - }; - }; -} diff --git a/system/full.nix b/system/full.nix index 854733a2..3852050b 100644 --- a/system/full.nix +++ b/system/full.nix @@ -18,6 +18,5 @@ ./syncthing.nix ./wayland.nix ./zsh.nix - ./containers - ]; + ] ++ (lib.optional config.ollama.enable ./ollama.nix); } diff --git a/system/ollama.nix b/system/ollama.nix new file mode 100644 index 00000000..6dfac9f1 --- /dev/null +++ b/system/ollama.nix @@ -0,0 +1,6 @@ +{...}: { + services.ollama = { + enable = true; + acceleration = "rocm"; + }; +} diff --git a/system/options.nix b/system/options.nix index 95ee29f1..c9d3d518 100644 --- a/system/options.nix +++ b/system/options.nix @@ -1,8 +1,7 @@ {lib, ...}: { options.gaming.enable = lib.mkEnableOption "Enable gaming"; - options.containers.enable = lib.mkEnableOption "Enable podman"; - options.containers.ollama.enable = lib.mkEnableOption "Run Ollama container"; + options.ollama.enable = lib.mkEnableOption "Install Ollama for local LLMs"; options.hyprlandOverrides = lib.mkOption { # type = lib.types.attributeSet;