From 71ea505c7d6161b22cdbdccbd4b04aea6beed18a Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Wed, 18 May 2022 16:01:33 -0400
Subject: [PATCH] Refactor

---
 nixos/server/devserver.nix | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/nixos/server/devserver.nix b/nixos/server/devserver.nix
index 5aff70a..b3b208b 100644
--- a/nixos/server/devserver.nix
+++ b/nixos/server/devserver.nix
@@ -3,19 +3,21 @@
   imports = [
     inputs.nixos-vscode-server.nixosModules.system
   ];
-  environment.systemPackages = with pkgs; [
-    nodejs-16_x # Need this for https://nixos.wiki/wiki/Vscode server
+  environment.systemPackages = [
     # https://old.reddit.com/r/NixOS/comments/uoklud/nix_development_container/i8hn64w/?context=2
-    (pkgs.writeScriptBin "fix-vscode-server" ''
-      #!${pkgs.stdenv.shell}
-      if [[ -d "$HOME/.vscode-server/bin" ]]; then
-        for versiondir in "$HOME"/.vscode-server/bin/*; do
-          echo "!! Fixing $versiondir/node"
-          ln -sf "${pkgs.nodejs-16_x}/bin/node" "$versiondir/node"
-        done
-      fi
-    '')
+    (pkgs.writeShellApplication {
+      name = "fix-vscode-server";
+      text = ''
+        if [[ -d "$HOME/.vscode-server/bin" ]]; then
+          for versiondir in "$HOME"/.vscode-server/bin/*; do
+            echo "!! Fixing $versiondir/node"
+            ln -sf "${pkgs.nodejs-16_x}/bin/node" "$versiondir/node"
+          done
+        fi
+      '';
+    })
   ];
+  # FIXME: This doesn't seem to work; hence the fix-vscode-server above.
   services.auto-fix-vscode-server.enable = true;
 
   # https://code.visualstudio.com/docs/setup/linux#_visual-studio-code-is-unable-to-watch-for-file-changes-in-this-large-workspace-error-enospc