diff --git a/flake.nix b/flake.nix
index 4b1fd35..07965ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -164,6 +164,7 @@
         inherit system;
         config.allowUnfree = true;
       };
+      packages = pkgs;
 
       topology = import nix-topology {
         inherit pkgs;
diff --git a/nix/devshell.nix b/nix/devshell.nix
index 1ce4022..93e4db1 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -23,7 +23,7 @@ in
       rage
       nix
       nix-diff
-      nixpkgs-update
+      nix-update
     ];
     commands = [
       {
diff --git a/pkgs/scripts/clone-term.nix b/pkgs/scripts/clone-term.nix
index 79e623a..8709801 100644
--- a/pkgs/scripts/clone-term.nix
+++ b/pkgs/scripts/clone-term.nix
@@ -10,7 +10,7 @@ writeShellApplication {
   runtimeInputs = [ps procps xdotool jq];
   text = ''
 
-    if [[ $XDG_CURRENT_DESKTOP == sway ]]; then
+    if [[ ''${XDG_CURRENT_DESKTOP-} == sway ]]; then
       PAREN=$(swaymsg -t get_tree | jq '.. | select(.type?) | select(.focused==true).pid')
     else
       PAREN=$(xdotool getwindowfocus getwindowpid)