From f570e87ec38460ff729320884b98135dcbfb3e90 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Thu, 14 Mar 2024 10:23:28 +0900
Subject: [PATCH] Testing updates to Podman

---
 nixos/common/services/podman.nix | 5 ++---
 nixos/users/albert/default.nix   | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/common/services/podman.nix b/nixos/common/services/podman.nix
index 7c3919c0..8cd8ff26 100644
--- a/nixos/common/services/podman.nix
+++ b/nixos/common/services/podman.nix
@@ -4,7 +4,6 @@
     boot.kernel.sysctl = { 
       "fs.inotify.max_user_watches" = 10485760;
       "fs.inotify.max_user_instances" = 1024;
-      "net.ipv4.ip_unprivileged_port_start" = 25;
     };
 
     virtualisation.podman = {
@@ -25,6 +24,6 @@
     ]; 
 
     # Add the docker telegraf listener
-    services.telegraf.extraConfig.inputs.podman = {};
-    users.users.telegraf.extraGroups = [ "docker" ];
+    services.telegraf.extraConfig.inputs.docker = {};
+    users.users.telegraf.extraGroups = [ "podman" ];
 }
diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix
index 8af1e663..1c32d494 100644
--- a/nixos/users/albert/default.nix
+++ b/nixos/users/albert/default.nix
@@ -1,4 +1,4 @@
-{ config, desktop, lib, unstable-pkgs, pkgs, ... }: 
+{ config, desktop, lib,  pkgs, ... }: 
 let
   ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
 in {
@@ -14,6 +14,7 @@ in {
       extraGroups = [ "networkmanager" "wheel" ] 
         ++ ifExists [ "video"     ] 
         ++ ifExists [ "docker"    ]
+        ++ ifExists [ "podman"    ]
         ++ ifExists [ "syncthing" ];
       # mkpasswd -m sha-512
       hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";