From 84ba28eb8cb43fe53d1bb795468854456d322433 Mon Sep 17 00:00:00 2001
From: kiana-S <kiana.a.sheibani@gmail.com>
Date: Tue, 11 Jan 2022 20:43:40 -0500
Subject: [PATCH] Add vscodium and direnv to package list

---
 common/config/packages.nix               | 58 ++++++++++++++++++++++--
 common/home-manager/wayland/swaylock.nix |  0
 2 files changed, 55 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 common/home-manager/wayland/swaylock.nix

diff --git a/common/config/packages.nix b/common/config/packages.nix
index de26efd..11cb3bf 100644
--- a/common/config/packages.nix
+++ b/common/config/packages.nix
@@ -1,6 +1,44 @@
 { config, pkgs, ... }:
-{
+let
+  vscodium-extensions = with pkgs.vscode-extensions;
+    [
+      # Global dev tools (ghc, hlint, cargo) will not be
+      # installed by default; they must be managed
+      # per-package using nix-shell
+      
+      # Git extensions
+      pinage404.git-extension-pack
+      
+      # Haskell extensions
+      haskell.haskell
+      justusadam.language-haskell
+      hoovercj.haskell-linter
+      
+      # Nix extensions
+      pinage404.nix-extension-pack
+      
+      # Rust extensions
+      matklad.rust-analyzer
+      wcrichton.flowistry
+      tamasfe.even-better-toml
+      swellaby.vscode-rust-test-adapter
+      
+      # Other
+      hbenl.vscode-test-explorer
+      ms-python.python
+      ms-toolsai.jupyter
+    ];
+  vscodium-with-extensions = pkgs.vscode-with-extensions.override {
+    vscode = pkgs.vscodium;
+    vscodeExtensions = vscodium-extensions;
+  };
+
+  # nix-direnv with flake support
+  nix-direnv-with-flakes = pkgs.nix-direnv.override { enableFlakes = true; };
+in {
   environment.systemPackages = with pkgs; [
+    vscodium-with-extensions
+    
     ffmpeg
     jq 
     git
@@ -15,15 +53,29 @@
     screenfetch
 
     gcc
-    rustup
-    idris2
 
     wob
     grim
     slurp
     imv
+
+    direnv
+    nix-direnv-with-flakes
   ];
 
   programs.sway.enable = true;
   programs.sway.extraPackages = [];
+
+  # Necessary for VSCodium to store passwords
+  services.gnome.gnome-keyring.enable = true;
+
+
+  # direnv setup
+
+  nix.extraOptions = ''
+    keep-derivations = true
+    keep-outputs = true
+  '';
+
+  environment.pathsToLink = [ "/share/nix-direnv" ];
 }
diff --git a/common/home-manager/wayland/swaylock.nix b/common/home-manager/wayland/swaylock.nix
old mode 100755
new mode 100644