diff --git a/modules/software.nix b/modules/software.nix
index e7fe81b..195eded 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -33,10 +33,7 @@
     git
     direnv
     lorri
-    nixfmt
     podman-compose
-    shellcheck
-    shfmt
     gnumake
     gitAndTools.pre-commit
     # Rice
@@ -74,6 +71,11 @@
     unzip
     unrar
     # Programming tools
+    ## Shell
+    shellcheck
+    shfmt
+    # Nix
+    nixfmt
     ## Python
     nodePackages.pyright
     black