From 2d41309466727559f5408013b499568a8e5cc928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Tue, 27 Jan 2026 16:58:54 +0100
Subject: [PATCH 1/3] Format and sort default package list

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 m/common/base/env.nix | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/m/common/base/env.nix b/m/common/base/env.nix
index 8d5aef0b..f8225aa4 100644
--- a/m/common/base/env.nix
+++ b/m/common/base/env.nix
@@ -2,11 +2,33 @@
 
 {
   environment.systemPackages = with pkgs; [
-    vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option
-    nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree
-    ncdu perf ldns pv
+    cmake
+    ethtool
+    file
+    freeipmi
+    git
+    gnumake
+    htop
+    ipmitool
+    ldns
+    lm_sensors
+    ncdu
+    nix-diff
+    nix-index
+    nixos-option
+    pciutils
+    perf
+    pv
+    ripgrep
+    tcpdump
+    tmux
+    tree
+    vim
+    wget
+
     # From jungle overlay
-    osumb nixgen
+    nixgen
+    osumb
   ];
 
   programs.direnv.enable = true;
-- 
2.51.2


From 3b56e905e55cc455a82d50080ffaecfff4ecc702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Tue, 27 Jan 2026 16:59:37 +0100
Subject: [PATCH 2/3] Add standalone home-manager to system packages

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 m/common/base/env.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/m/common/base/env.nix b/m/common/base/env.nix
index f8225aa4..2b67f5cc 100644
--- a/m/common/base/env.nix
+++ b/m/common/base/env.nix
@@ -8,6 +8,7 @@
     freeipmi
     git
     gnumake
+    home-manager
     htop
     ipmitool
     ldns
-- 
2.51.2


From 7a6e4232de0e181de97e099e600ffc3a964260e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Tue, 27 Jan 2026 16:59:37 +0100
Subject: [PATCH 3/3] Add nom and nixfmt-tree to system packages

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
---
 m/common/base/env.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/m/common/base/env.nix b/m/common/base/env.nix
index 2b67f5cc..5efc277d 100644
--- a/m/common/base/env.nix
+++ b/m/common/base/env.nix
@@ -16,6 +16,8 @@
     ncdu
     nix-diff
     nix-index
+    nix-output-monitor
+    nixfmt-tree
     nixos-option
     pciutils
     perf
-- 
2.51.2