From f4a0e8385bdf6f966f62d741ea02179c728e7d6a Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 6 Sep 2025 18:04:58 +0800
Subject: [PATCH] Revert "modules.packages: split mumax and lammps"

This reverts commit fcb5071e84d695653298f843f155f8ac58bd0a7c.
---
 modules/packages/default.nix | 19 +------------------
 modules/packages/desktop.nix | 10 ++++++++++
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/packages/default.nix b/modules/packages/default.nix
index 5d65769f..90b8b25f 100644
--- a/modules/packages/default.nix
+++ b/modules/packages/default.nix
@@ -17,7 +17,7 @@ inputs:
       };
     }
     // (builtins.listToAttrs (builtins.map (n: inputs.lib.nameValuePair n simpleSubmodule)
-      [ "vasp" "mathematica" "lumerical" "flatpak" "android-studio" "lammps" "mumax" ]));
+      [ "vasp" "mathematica" "lumerical" "flatpak" "android-studio" ]));
   config = inputs.lib.mkMerge
   [
     {
@@ -59,22 +59,5 @@ inputs:
       { services.flatpak = { enable = true; uninstallUnmanaged = true; }; })
     (inputs.lib.mkIf (inputs.config.nixos.packages.android-studio != null)
       { nixos.packages.packages._packages = with inputs.pkgs; [ androidStudioPackages.stable.full ]; })
-    (inputs.lib.mkIf (inputs.config.nixos.packages.lammps != null)
-    {
-      nixos.packages.packages._packages = with inputs.pkgs;
-      [
-        (if inputs.config.nixos.system.nixpkgs.cuda != null
-          then (lammps.override { stdenv = cudaPackages.backendStdenv; }).overrideAttrs (prev:
-          {
-            cmakeFlags = prev.cmakeFlags ++
-              [ "-DPKG_GPU=on" "-DGPU_API=cuda" "-DCMAKE_POLICY_DEFAULT_CMP0146=OLD" ];
-            nativeBuildInputs = prev.nativeBuildInputs ++ [ cudaPackages.cudatoolkit ];
-            buildInputs = prev.buildInputs ++ [ mpi ];
-          })
-          else lammps-mpi)
-      ];
-    })
-    (inputs.lib.mkIf (inputs.config.nixos.packages.mumax != null && inputs.config.nixos.system.nixpkgs.cuda != null)
-      { nixos.packages.packages._packages = [ inputs.pkgs.localPackages.mumax ]; })
   ];
 }
diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix
index d27904a6..5693fe5e 100644
--- a/modules/packages/desktop.nix
+++ b/modules/packages/desktop.nix
@@ -72,6 +72,16 @@ inputs:
             wannier90 = wannier90.overrideAttrs { buildFlags = [ "dynlib" ]; };
           })
           pkgs-2311.hdfview numbat qalculate-qt
+          (if inputs.config.nixos.system.nixpkgs.cuda != null then localPackages.mumax else emptyDirectory)
+          (if inputs.config.nixos.system.nixpkgs.cuda != null
+            then (lammps.override { stdenv = cudaPackages.backendStdenv; }).overrideAttrs (prev:
+            {
+              cmakeFlags = prev.cmakeFlags ++
+                [ "-DPKG_GPU=on" "-DGPU_API=cuda" "-DCMAKE_POLICY_DEFAULT_CMP0146=OLD" ];
+              nativeBuildInputs = prev.nativeBuildInputs ++ [ cudaPackages.cudatoolkit ];
+              buildInputs = prev.buildInputs ++ [ mpi ];
+            })
+            else lammps-mpi)
           # virtualization
           virt-viewer bottles wineWowPackages.stagingFull genymotion playonlinux
           # media