diff --git a/flake.lock b/flake.lock
index 5802fe66..43348b05 100644
--- a/flake.lock
+++ b/flake.lock
@@ -379,7 +379,8 @@
         "pre-commit-hooks": "pre-commit-hooks",
         "riscv-overlay": "riscv-overlay",
         "sops-nix": "sops-nix",
-        "systems": "systems"
+        "systems": "systems",
+        "vscode-server": "vscode-server"
       }
     },
     "sops-nix": {
@@ -419,6 +420,29 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "vscode-server": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729422940,
+        "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 251bbbe7..05419e9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,11 @@
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
     systems.url = "github:nix-systems/default";
+    vscode-server = {
+      url = "github:nix-community/nixos-vscode-server";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
diff --git a/programs/editors/vscode/default.nix b/programs/editors/vscode/default.nix
index 35a3637d..3dc9e6c2 100644
--- a/programs/editors/vscode/default.nix
+++ b/programs/editors/vscode/default.nix
@@ -1,8 +1,12 @@
-{...}: {
+{vscode-server, ...}: {
+  imports = [
+    "${vscode-server}/modules/vscode-server/home.nix"
+  ];
   programs.vscode = {
     enable = true;
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;
     mutableExtensionsDir = false;
   };
+  services.vscode-server.enable = true;
 }