From 2e2389e366f5ab3e81ef335dadc2c61f66ad741d Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sun, 18 Aug 2024 16:13:32 +0200
Subject: [PATCH] fix(fuji-wsl): use nix-ld instead of vscode-server

---
 configs/common.nix           |  2 --
 flake.lock                   | 26 +-------------------------
 flake.nix                    |  6 ------
 systems/fuji-wsl/default.nix |  7 ++++---
 4 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/configs/common.nix b/configs/common.nix
index 31be0ba..63169fe 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -129,8 +129,6 @@ in {
   programs = {
     direnv.enable = true;
 
-    nix-ld.enable = true;
-
     command-not-found.enable = false;
     nix-index = {
       enable = true;
diff --git a/flake.lock b/flake.lock
index 41e30e8..62e83eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -401,8 +401,7 @@
         "nixpkgs": "nixpkgs",
         "systems": "systems_4",
         "ukubot-rs": "ukubot-rs",
-        "vscode-extensions": "vscode-extensions",
-        "vscode-server": "vscode-server"
+        "vscode-extensions": "vscode-extensions"
       }
     },
     "rust-overlay": {
@@ -533,29 +532,6 @@
         "type": "github"
       }
     },
-    "vscode-server": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713958148,
-        "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
-        "owner": "nix-community",
-        "repo": "nixos-vscode-server",
-        "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-vscode-server",
-        "type": "github"
-      }
-    },
     "zig": {
       "inputs": {
         "flake-compat": [
diff --git a/flake.nix b/flake.nix
index 0f790ad..01ef327 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,12 +110,6 @@
       inputs.flake-compat.follows = "";
     };
 
-    vscode-server = {
-      url = "github:nix-community/nixos-vscode-server";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-
     # ==== uku3lig stuff ====
     api-rs = {
       url = "github:uku3lig/api-rs";
diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix
index 9a93cc4..1a15afa 100644
--- a/systems/fuji-wsl/default.nix
+++ b/systems/fuji-wsl/default.nix
@@ -2,15 +2,16 @@
   config,
   pkgs,
   nixos-wsl,
-  vscode-server,
   ...
 }: {
   imports = [
     nixos-wsl.nixosModules.default
-    vscode-server.nixosModules.default
   ];
 
-  services.vscode-server.enable = true;
+  programs.nix-ld = {
+    enable = true;
+    package = pkgs.nix-ld-rs;
+  };
 
   wsl = {
     enable = true;