containers

system/containers/default.nix

@@ -1,27 +1,7 @@
-{ pkgs, lib, config, conf, ...}: {
-  environment.systemPackages = with pkgs; [
-    arion
-    docker-client
-  ];
-
-  virtualization = {
-    docker.enable = false;
-    podman.enable = true;
-    podman.dockerSocket.enable = true;
-    podman.defaultNetwork.dnsname.enable = true;
-
-    arion.projects.ollama = lib.mkIf config.containers.ollama.enable {
-      settings.services = {
-        ollama = {
-          service = {
-            image = "ollama/ollama:sha256:4325d935cd6e07cfa840eb193aad0594ba6cbc97ca9d0778f6716507cb3955ed";
-            useHostStore = true;
+{ config, lib, ...}: {
+  config = lib.mkIf config.containers.enable {
+    virtualization.oci-containers.containers.ollama = lib.mkIf config.containers.ollama.enable {
+      image = "ollama/ollama@sha256:4325d935cd6e07cfa840eb193aad0594ba6cbc97ca9d0778f6716507cb3955ed";
     };
   };
-      };
-    };
-  };
-
-  users.users.${conf.user}.extraGroups = ["podman"];
 }
-

system/containers/ollama.nix

@@ -1,5 +0,0 @@
-{...}: {
-  projects.ollama = {
-    
-  }
-}

system/env.nix

@@ -2,7 +2,7 @@
   environment.variables = {
     EDITOR = "hx";
     VISUAL = "hx";
-    FLAKE = conf.home + /nixos;
+    FLAKE = "${conf.home}/nixos";
     ELECTRON_OZONE_PLATFORM_HINT = "auto";
   };
 }

system/full.nix

@@ -1,4 +1,4 @@
-{lib, config, ...}: {
+{lib, config, conf, ...}: {
   imports = [
     ./audio.nix
     ./env.nix
@@ -18,6 +18,6 @@
     ./syncthing.nix
     ./wayland.nix
     ./zsh.nix
-  ] ++ lib.optional config.containers.enable ./containers
-  ;
+    ./containers
+  ];
 }