From eeb39db53356eb40eb45994eb668950ae358b795 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sun, 16 Feb 2025 19:56:54 +0000
Subject: [PATCH] Add quadlet-nix

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 flake.lock                                    | 49 ++++++++++---------
 flake.nix                                     | 14 +++++-
 .../common/configs/system/podman/default.nix  |  4 +-
 .../configs/user/console/podman/default.nix   | 10 +++-
 4 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index c2646ca..36fba9b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -151,7 +151,9 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "treefmt-nix": "treefmt-nix"
+        "treefmt-nix": [
+          "treefmt-nix"
+        ]
       },
       "locked": {
         "lastModified": 1739724221,
@@ -168,6 +170,27 @@
         "type": "github"
       }
     },
+    "quadlet-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739316033,
+        "narHash": "sha256-yHBsu5I2GOTaMzqEYXfDWzEH+pTpNKp/Ew/8x+cVCZg=",
+        "owner": "SEIAROTg",
+        "repo": "quadlet-nix",
+        "rev": "31e4175bdc1cee453f66cada21f9dd6eb90e507f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SEIAROTg",
+        "ref": "main",
+        "repo": "quadlet-nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "ags": "ags",
@@ -177,10 +200,11 @@
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nur": "nur",
+        "quadlet-nix": "quadlet-nix",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "systems": "systems",
-        "treefmt-nix": "treefmt-nix_2"
+        "treefmt-nix": "treefmt-nix"
       }
     },
     "sops-nix": {
@@ -245,27 +269,6 @@
       }
     },
     "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 10c9322..a6e156c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,10 @@
       repo = "NUR";
       ref = "master";
 
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        treefmt-nix.follows = "treefmt-nix";
+      };
     };
 
     flake-utils = {
@@ -83,6 +86,15 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    quadlet-nix = {
+      type = "github";
+      owner = "SEIAROTg";
+      repo = "quadlet-nix";
+      ref = "main";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     astal = {
       type = "github";
       owner = "aylur";
diff --git a/hosts/common/configs/system/podman/default.nix b/hosts/common/configs/system/podman/default.nix
index dfe8e1b..b6d3b00 100644
--- a/hosts/common/configs/system/podman/default.nix
+++ b/hosts/common/configs/system/podman/default.nix
@@ -1,5 +1,7 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+  imports = [ inputs.quadlet-nix.nixosModules.quadlet ];
+
   virtualisation = {
     containers.enable = true;
     oci-containers.backend = "podman";
diff --git a/hosts/common/configs/user/console/podman/default.nix b/hosts/common/configs/user/console/podman/default.nix
index 3e90625..b3eebe7 100644
--- a/hosts/common/configs/user/console/podman/default.nix
+++ b/hosts/common/configs/user/console/podman/default.nix
@@ -2,14 +2,22 @@
   user ? throw "user argument is required",
   home ? throw "home argument is required",
 }:
-{ lib, pkgs, ... }:
+{
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
 {
   home-manager.users.${user} = {
+    imports = [ inputs.quadlet-nix.homeManagerModules.quadlet ];
+
     services.podman.enable = true;
 
     home = {
       packages = with pkgs; [
         podman-compose
+        kompose
         dive
       ];