From 4a4b523259d2777639f58596d8c2db312b59a9cd Mon Sep 17 00:00:00 2001 From: Jelle Spreeuwenberg Date: Wed, 2 Sep 2026 23:25:33 +0200 Subject: [PATCH] updates --- modules/capabilities/ai.nix | 5 +++-- modules/capabilities/podman.nix | 24 +++++++++++++++++++----- modules/hosts/orion/default.nix | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/capabilities/ai.nix b/modules/capabilities/ai.nix index 94ceb7d..8145c80 100644 --- a/modules/capabilities/ai.nix +++ b/modules/capabilities/ai.nix @@ -1,11 +1,14 @@ { inputs, config, ... }: let hmModules = config.flake.modules.homeManager; + nixosModules = config.flake.modules.nixos; in { flake.modules.nixos.ai = { pkgs, ... }: { + imports = [ nixosModules.podman ]; + home-manager.sharedModules = [ hmModules.ai ]; nixpkgs.overlays = [ inputs.llm-agents.overlays.shared-nixpkgs ]; @@ -27,8 +30,6 @@ in flake.modules.homeManager.ai = { pkgs, ... }: { - imports = [ hmModules.podman ]; - services.podman = { volumes = { grounded-docs-config = { }; diff --git a/modules/capabilities/podman.nix b/modules/capabilities/podman.nix index bf6bc2a..ab5e9d4 100644 --- a/modules/capabilities/podman.nix +++ b/modules/capabilities/podman.nix @@ -1,8 +1,22 @@ -{ ... }: +{ config, ... }: +let + homeModules = config.flake.modules.homeManager; +in { - flake.modules.homeManager.podman = { - services.podman = { - enable = true; - }; + flake.modules.nixos.podman = { + home-manager.sharedModules = [ homeModules.podman ]; + + virtualisation.podman.enable = true; }; + + flake.modules.homeManager.podman = + { osConfig, pkgs, ... }: + { + services.podman = { + enable = true; + package = osConfig.virtualisation.podman.package; + }; + + home.packages = [ pkgs.podman-tui ]; + }; } diff --git a/modules/hosts/orion/default.nix b/modules/hosts/orion/default.nix index 078b05c..3d1ae76 100644 --- a/modules/hosts/orion/default.nix +++ b/modules/hosts/orion/default.nix @@ -22,7 +22,7 @@ in nixosModules.caddy nixosModules.server-firewall nixosModules.sudo-ssh-agent-auth - nixosModules.vps-insights + # nixosModules.vps-insights nixosModules.vaultwarden nixosModules.radicale nixosModules.actual