Merge branch 'master' of github.com:/kropatz/nix-config

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 = {

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;

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;