aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2026-09-29 10:15:40 +0200
committerKarel Kočí <cynerd@email.cz>2026-10-01 09:42:53 +0200
commitce69197c3a6d0df60a728306a645fcbb78b01157 (patch)
tree39a2a3f720b59885c51c1f64d53da071187efe70 /nixos
parent35ae408f83567d72993e58f6de10307ed00f9e66 (diff)
downloadnixos-personal-ce69197c3a6d0df60a728306a645fcbb78b01157.tar.gz
nixos-personal-ce69197c3a6d0df60a728306a645fcbb78b01157.tar.bz2
nixos-personal-ce69197c3a6d0df60a728306a645fcbb78b01157.zip
nixos: move and update some packages between nmodules
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/desktop.nix2
-rw-r--r--nixos/modules/develop.nix7
-rw-r--r--nixos/modules/devmin.nix13
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 = [