From af6f476a6054179d0e6c9ebab2c537b3741af785 Mon Sep 17 00:00:00 2001
From: "Jill \"oatmealine\" Monoids" <oatmealine@disroot.org>
Date: Thu, 19 Jan 2023 15:17:35 +0100
Subject: [PATCH] fix vscode server stuff

---
 flake.lock                     | 39 +++++++++++++++++++++++++++++++---
 flake.nix                      |  5 ++++-
 hosts/dark-firepit/default.nix |  2 ++
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1cd38cd..30329e7 100755
--- a/flake.lock
+++ b/flake.lock
@@ -357,6 +357,20 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1655361562,
+        "narHash": "sha256-chPaIIhmdL6jdZWpf/K6yQCsuBNOYuMqbJsNpLfrdTE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0b59d075675dc28bf9ebab466033280096c8d4fe",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1659219666,
         "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
@@ -371,7 +385,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1659102345,
         "narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
@@ -434,13 +448,14 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
+        "vscode-server": "vscode-server",
         "watch-party": "watch-party"
       }
     },
     "rust-overlay": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1659179790,
@@ -456,10 +471,28 @@
         "type": "github"
       }
     },
+    "vscode-server": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1662442857,
+        "narHash": "sha256-e2ex4mO4q6UBoJvPSRdYBX1vIvpulqs6SNxvdSsL6uE=",
+        "owner": "msteen",
+        "repo": "nixos-vscode-server",
+        "rev": "c54b714db58ad05d064f394d6603751ee6bd04f6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "msteen",
+        "repo": "nixos-vscode-server",
+        "type": "github"
+      }
+    },
     "watch-party": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index e691c91..06f617f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -50,9 +50,11 @@
       url = "github:hyprwm/hyprpicker";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    vscode-server.url = "github:msteen/nixos-vscode-server";
   };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nix-minecraft, hyprland, hyprpaper, hyprpicker, ... }:
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, hyprland, hyprpaper, hyprpicker, ... }:
     let
       system = "x86_64-linux";
 
@@ -75,6 +77,7 @@
       overlays = mapModules ./overlays import;
       nixosModules = (mapModulesRec ./modules import) ++ [
         hyprland.nixosModules.default
+        vscode-server.nixosModule
       ];
       nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; });
       devShell."${system}" = import ./shell.nix { inherit pkgs; };
diff --git a/hosts/dark-firepit/default.nix b/hosts/dark-firepit/default.nix
index ac79f5c..a457b7a 100644
--- a/hosts/dark-firepit/default.nix
+++ b/hosts/dark-firepit/default.nix
@@ -110,6 +110,8 @@ in {
     variant = "qwerty";
   };
 
+  services.vscode-server.enable = true;
+
   modules = {
     shell.fish.enable = true;
     security.isLocalMachine = false;