From 292667cf5a1ddd9b84bd5bf41188a975ecba6b4a Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Thu, 4 Dec 2025 15:34:05 +0100
Subject: [PATCH 1/2] diagram.nvim

---
 home-manager/nixvim/default.nix | 5 ++++-
 home-manager/nixvim/images.nix  | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/home-manager/nixvim/default.nix b/home-manager/nixvim/default.nix
index caa804b..40d1666 100644
--- a/home-manager/nixvim/default.nix
+++ b/home-manager/nixvim/default.nix
@@ -54,7 +54,10 @@ in
   home.sessionVariables = {
     EDITOR = "nvim";
   };
-  home.packages = with pkgs; [ nixfmt-rfc-style ]; # nixd config option to set nixpkgs-fmt should work, but it doesn't
+  home.packages = with pkgs; [
+    nixfmt-rfc-style
+    plantuml
+  ]; # nixd config option to set nixpkgs-fmt should work, but it doesn't
   programs.nixvim = merged;
   xdg.desktopEntries = {
     neovim = {
diff --git a/home-manager/nixvim/images.nix b/home-manager/nixvim/images.nix
index 6a9b650..64b91f6 100644
--- a/home-manager/nixvim/images.nix
+++ b/home-manager/nixvim/images.nix
@@ -2,6 +2,7 @@
 {
   plugins = {
     image.enable = true;
+    diagram.enable = true;
     clipboard-image = {
       # todo change based on graphical settings
       clipboardPackage = pkgs.wl-clipboard;

From e8ab4e200377fddf5de1caf4be504e11caca08cb Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:52:48 +0100
Subject: [PATCH 2/2] list home manager pkgs too

---
 modules/misc/packages-list.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/misc/packages-list.nix b/modules/misc/packages-list.nix
index 040ca43..cc9b0ad 100644
--- a/modules/misc/packages-list.nix
+++ b/modules/misc/packages-list.nix
@@ -3,7 +3,8 @@
   environment.etc."current-system-packages".text =
     let
       packages = builtins.map (p: "${p.name}") config.environment.systemPackages;
-      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique packages);
+      homePackages = builtins.map (p: "${p.name}") config.home-manager.users.${config.mainUser.name}.home.packages;
+      sortedUnique = builtins.sort builtins.lessThan (pkgs.lib.lists.unique (packages ++ homePackages));
       formatted = builtins.concatStringsSep "\n" sortedUnique;
     in
     formatted;