diff --git a/flake.lock b/flake.lock
index 52456a9..361399c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -37,10 +55,59 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1682134069,
+        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "vscode-server": "vscode-server"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "vscode-server": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1770124655,
+        "narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=",
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixos-vscode-server",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 429fbb0..285847e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,10 @@
   description = "Planned Disorder";
 
   inputs = {
+    vscode-server = {
+      url = "github:nix-community/nixos-vscode-server";
+    };
+
     nixpkgs = {
       url = "github:nixos/nixpkgs/nixos-25.11";
     };
diff --git a/outputs.nix b/outputs.nix
index 2ae11ec..cbead01 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,10 +1,11 @@
-{ nixpkgs, home-manager, ... }:
+{ vscode-server, nixpkgs, home-manager, ... }:
 
 {
   nixosConfigurations = {
     "gandalf" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        vscode-server.nixosModules.default
         home-manager.nixosModules.home-manager
         ./systems/gandalf
       ];
@@ -12,6 +13,7 @@
     "frodo" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        vscode-server.nixosModules.default
         home-manager.nixosModules.home-manager
         ./systems/frodo
       ];
@@ -19,6 +21,7 @@
     "legolas" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        vscode-server.nixosModules.default
         home-manager.nixosModules.home-manager
         ./systems/legolas
       ];
@@ -26,6 +29,7 @@
     "work" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
+        vscode-server.nixosModules.default
         home-manager.nixosModules.home-manager
         ./systems/work
       ];
diff --git a/systems/work/default.nix b/systems/work/default.nix
index c0989e4..30e69a8 100644
--- a/systems/work/default.nix
+++ b/systems/work/default.nix
@@ -31,6 +31,8 @@
 
   programs.nix-ld.enable = true;
 
+  services.vscode-server.enable = true;
+
   networking.hostName = "laptop-armel";
 
   home-manager.users.avravels.home.git.userName = "Armel van Ravels";