From ce69197c3a6d0df60a728306a645fcbb78b01157 Mon Sep 17 00:00:00 2001
From: Karel Kočí <cynerd@email.cz>
Date: Tue, 29 Sep 2026 10:15:40 +0200
Subject: nixos: move and update some packages between nmodules

---
 nixos/modules/desktop.nix |  2 +-
 nixos/modules/develop.nix |  7 -------
 nixos/modules/devmin.nix  | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index a321577..007f1df 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -93,7 +93,7 @@ in {
             zathura
             pdfgrep
 
-            libreoffice-qt6-fresh
+            libreoffice-qt
             hunspell
             hunspellDicts.en_US-large
             hunspellDicts.en_GB-large
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 8b413a9..7c00f1b 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -154,10 +154,6 @@ in {
       ubootTools
       tftp-hpa
 
-      # Network
-      iperf3
-      inetutils
-
       # Gtk
       cambalache
 
@@ -176,9 +172,6 @@ in {
       # Writing documentation
       docstrfmt
 
-      # SHV
-      (shvcli.withPlugins [python3Packages.shvcli-ell])
-
       # Images
       imagemagick
 
diff --git a/nixos/modules/devmin.nix b/nixos/modules/devmin.nix
index 767cf2c..e317af1 100644
--- a/nixos/modules/devmin.nix
+++ b/nixos/modules/devmin.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit (lib) mkOption mkIf types;
@@ -14,7 +15,17 @@ in {
   };
 
   config = mkIf config.cynerd.devmin {
-    environment.enableDebugInfo = true;
+    environment = {
+      enableDebugInfo = true;
+      systemPackages = with pkgs; [
+      # Network
+      iperf3
+      inetutils
+
+        # SHV
+        (shvcli.withPlugins [python3Packages.shvcli-ell])
+      ];
+    };
 
     users.groups.develop = {};
     users.users.cynerd.extraGroups = [
-- 
cgit v1.3.1