From 3e4d388c607d657fab10fdae6d2791eda5288be9 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Thu, 11 Nov 2021 11:18:32 -0500
Subject: [PATCH] gnome keyring

---
 features/desktopish/guiapps.nix |  5 ++++-
 features/desktopish/vscode.nix  | 14 ++++++++++++++
 flake.nix                       |  8 +-------
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 features/desktopish/vscode.nix

diff --git a/features/desktopish/guiapps.nix b/features/desktopish/guiapps.nix
index 015231f..4a6b586 100644
--- a/features/desktopish/guiapps.nix
+++ b/features/desktopish/guiapps.nix
@@ -1,4 +1,8 @@
 { pkgs, ... }: {
+  imports = [
+    ./vscode.nix
+  ];
+
   # Apps I use on desktops and laptops
   environment.systemPackages = with pkgs; [
     brave
@@ -8,7 +12,6 @@
     simplescreenrecorder
     obs-studio
 
-    vscode
     vlc
     qbittorrent
 
diff --git a/features/desktopish/vscode.nix b/features/desktopish/vscode.nix
new file mode 100644
index 0000000..96d1a01
--- /dev/null
+++ b/features/desktopish/vscode.nix
@@ -0,0 +1,14 @@
+{ pkgs, inputs, ... }: {
+  imports = [
+    inputs.nixos-vscode-server.nixosModules.system
+  ];
+  services.auto-fix-vscode-server.enable = true;
+
+  # https://unix.stackexchange.com/q/659901/14042
+  services.gnome.gnome-keyring.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    vscode
+    nodejs-14_x # Need this for https://nixos.wiki/wiki/Vscode server
+  ];
+}
diff --git a/flake.nix b/flake.nix
index c531b46..49cc991 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,7 +71,7 @@
           [
             inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
             ./features/server/harden.nix
-            ./features/server/devserver.nix
+            # ./features/server/devserver.nix
             ./features/server/unlaptop.nix
             ./features/server/wakeonlan.nix
             ./features/kde.nix
@@ -95,12 +95,6 @@
             ./features/protonvpn.nix
             #./features/ema/emanote.nix
           ];
-        thebeast = mkComputer
-          ./hosts/thebeast.nix
-          [
-            ./features/server/devserver.nix
-            ./features/ema/emanote.nix
-          ];
       };
 
       # non-NixOS systems