diff --git a/configuration.nix b/configuration.nix
index c3aa043..0bccbc4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -14,11 +14,12 @@
       ./hardware-configuration.nix
 
       ./roles/admin.nix
-      ./roles/dev.nix
       ./roles/base.nix
       ./roles/desktop.nix
-      ./roles/wireless.nix
+      ./roles/dev.nix
+      ./roles/mail.nix
       ./roles/vpn.nix
+      ./roles/wireless.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
diff --git a/roles/dev.nix b/roles/dev.nix
index a42a09a..c2b5048 100644
--- a/roles/dev.nix
+++ b/roles/dev.nix
@@ -4,20 +4,33 @@
 { config, lib, pkgs, ... }:
 
 let
+  moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
+  nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; } ;
+  ruststable = (
+    nixpkgs.latest.rustChannels.stable.rust.override {
+      extensions = [ "rust-src" "rls-preview" "rust-analysis" "rustfmt-preview" ];
+    }
+  );
   unstable = import <nixos-unstable> {};
-  mozilla = import <mozilla> {};
 
 in {
   environment.systemPackages = with pkgs; [
+    cmake
+    gcc
     go
+    nasm
+    openssl.dev
+    pkg-config
     python37
     python37Packages.pyls-black
     python37Packages.pyls-isort
     python37Packages.pyls-mypy
     rustup
+    ruststable
     sops
     tig
     unstable.gopls
     unstable.rust-analyzer
+    zlib
   ];
 }
diff --git a/roles/mail.nix b/roles/mail.nix
new file mode 100644
index 0000000..ec61376
--- /dev/null
+++ b/roles/mail.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+let
+  unstable = import <nixos-unstable> {};
+in {
+  environment.systemPackages = with pkgs; [
+      unstable.notmuch
+  ];
+}