nix/os/devices: refactor expressions

nix/os/devices/disk.nix

@@ -1,31 +1,16 @@
-{ pkgs ? import <nixpkgs> {}
-, ownLib ? import ../lib/default.nix { }
+{ pkgs
+, ownLib
 , dir
 , rebuildarg
-, moreargs ? ""
-, diskId ? (import ((builtins.getEnv "PWD")+"/${dir}/hw.nix") {}).hardware.encryptedDisk.diskId
-, gitRoot ? "$(git rev-parse --show-toplevel)"
+, moreargs
+, diskId
+, gitRoot
 }:
 
 let
   mntRootVol="/mnt/${diskId}-root";
 
 in rec {
-  rebuild = pkgs.writeScript "script" ''
-    #!/usr/bin/env bash
-    set -xe
-
-    pushd ${gitRoot}/${dir}
-    export NIXOS_CONFIG="$PWD"/configuration.nix
-
-    [[ -e "''${NIXOS_CONFIG}" ]]
-
-    nixos-rebuild -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
-    if test -L result; then
-      rm result
-    fi
-  '';
-
   diskMount = pkgs.writeScript "script" ''
     #!/usr/bin/env bash
     set -xe