From 7c387dbed60f88dc4fbd99fb029a0a50fbc87d9a Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Sat, 5 Dec 2020 02:10:57 +0100
Subject: [PATCH] vscode: switch to home-manger module

---
 .../configuration/graphical-fullblown.nix     |  2 +-
 nix/home-manager/programs/vscode/default.nix  | 21 ++++++++++++-------
 nix/os/devices/167.233.1.14/pkg.nix           |  4 ++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index 9dd5e10..e368858 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -27,7 +27,7 @@ in {
     ../programs/pass.nix
     zshCurried
     ../programs/podman.nix
-    ../programs/vscode.nix
+    ../programs/vscode
   ];
 
   nixpkgs.config = {
diff --git a/nix/home-manager/programs/vscode/default.nix b/nix/home-manager/programs/vscode/default.nix
index 6e25019..6e54887 100644
--- a/nix/home-manager/programs/vscode/default.nix
+++ b/nix/home-manager/programs/vscode/default.nix
@@ -463,16 +463,21 @@ let
 in
 
 {
-  home.packages = [
-    (pkgs.vscode-with-extensions.override {
-      vscodeExtensions = []
-        ++ packagedExtensions
-        ++ marketPlaceExtensions
-        ;
-    })
-  ];
+  programs.vscode = {
+    enable = true;
+    extensions = []
+      ++ packagedExtensions
+      ++ marketPlaceExtensions
+      ;
+  };
 }
 
+# TODO: automate
+# rustup install stable
+# rustup component add rust-analysis --toolchain stable
+# rustup component add rust-src --toolchain stable
+# rustup component add rls --toolchain stable
+
 ### original list:
 # 74th.Theme-NaturalContrast-With-HC
 # AlanWalk.markdown-toc
diff --git a/nix/os/devices/167.233.1.14/pkg.nix b/nix/os/devices/167.233.1.14/pkg.nix
index 1bc1187..bad7478 100644
--- a/nix/os/devices/167.233.1.14/pkg.nix
+++ b/nix/os/devices/167.233.1.14/pkg.nix
@@ -13,6 +13,10 @@
     extraPackages = [
       # required by vscode's remote-ssh plugin
       pkgs.nodejs
+
+      # allow clipboard exchanges
+      pkgs.xsel
+      pkgs.xclip
     ];
   };