devices.srv1: add users

devices/srv1/default.nix

@@ -66,7 +66,7 @@ inputs:
           setupFirewall = true;
         };
       };
-      user.users = [ "chn" ];
+      user.users = [ "chn" "xll" "zem" "yjq" "gb" "wp" "hjp" "wm" ];
     };
   };
 }

devices/srv1/node0/default.nix

@@ -25,7 +25,7 @@ inputs:
           publicKey = "Br+ou+t9M9kMrnNnhTvaZi2oNFRygzebA1NqcHWADWM=";
           wireguardIp = "192.168.83.9";
         };
-        nfs = { root = "/"; exports = "/home"; accessLimit = "192.168.178.0/24"; };
+        nfs = { root = "/"; exports = [ "/home" ]; accessLimit = "192.168.178.0/24"; };
       };
       packages.packages._prebuildPackages =
         [ inputs.topInputs.self.nixosConfigurations.srv1-node1.pkgs.localPackages.vasp.intel ];

modules/packages/default.nix

@@ -24,19 +24,9 @@ inputs:
               excludePythonPackages))
             (builtins.concatLists (builtins.map (packageFunction: packageFunction pythonPackages)
               (_pythonPackages ++ extraPythonPackages)))))
-        (inputs.pkgs.callPackage ({ stdenv }: stdenv.mkDerivation
-        {
-          name = "prebuild-packages";
-          propagateBuildInputs = inputs.lib.lists.subtractLists excludePrebuildPackages
-            (_prebuildPackages ++ extraPrebuildPackages);
-          phases = [ "installPhase" ];
-          installPhase =
-          ''
-            runHook preInstall
-            mkdir -p $out
-            runHook postInstall
-          '';
-        }) {})
+        (inputs.pkgs.writeTextDir "share/prebuild-packages"
+          (builtins.concatStringsSep "\n" (builtins.map builtins.toString
+            (inputs.lib.lists.subtractLists excludePrebuildPackages (_prebuildPackages ++ extraPrebuildPackages)))))
       ];
   };
 }

modules/services/nfs.nix

@@ -18,7 +18,7 @@ inputs:
       nfs.server =
       {
         enable = true;
-        exports = "${nfs.root} ${nfs.accessLimit}(rw,no_root_squash,fsid=0,sync,crossmnt)"
+        exports = "${nfs.root} ${nfs.accessLimit}(rw,no_root_squash,fsid=0,sync,crossmnt)\n"
           + builtins.concatStringsSep "\n" (builtins.map
             (export: "${export} ${nfs.accessLimit}(rw,no_root_squash,sync,crossmnt)")
             nfs.exports);

modules/system/fileSystems/nfs.nix

@@ -1,6 +1,5 @@
 inputs:
 {
-  imports = inputs.localLib.findModules ./.;
   options.nixos.system.fileSystems.mount.nfs = let inherit (inputs.lib) mkOption types; in mkOption
   {
     type = types.nullOr (types.attrsOf types.nonEmptyStr); default = null;

packages/sbatch-tui/src/main.cpp

@@ -138,10 +138,10 @@ int main()
           state.job_name, state.output_file, state.vasp_version_entries[state.vasp_version_selected]
         );
     else state.submit_command =
-      "sbatch --ntasks={}\n--cpus-per-task={}\n--hint=nomultithread\n--job-name='{}'\n--output='{}'"
-      "\n--wrap=\"vasp-intel srun vasp-{}\""_f
+      "sbatch --ntasks={}\n--cpus-per-task={}\n--export=ALL,OMP_NUM_THREADS={}\n--hint=nomultithread\n--job-name='{}'\n"
+      "--output='{}'\n--wrap=\"vasp-intel srun --mpi=pmix vasp-{}\""_f
       (
-        state.mpi_threads, state.openmp_threads, state.job_name, state.output_file,
+        state.mpi_threads, state.openmp_threads, state.openmp_threads, state.job_name, state.output_file,
         state.vasp_version_entries[state.vasp_version_selected]
       );