diff --git a/nix/sources.json b/nix/sources.json
index b65fc027..20462723 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -24,15 +24,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
-        "branch": "release-20.09",
+        "branch": "master",
         "description": "Manage a user environment using Nix  [maintainer=@rycee] ",
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2aa20ae969f2597c4df10a094440a66e9d7f8c86",
-        "sha256": "0i5fxaxqm53zp767smrn250q1wjywf9c1jmg6vhp28973p7jysah",
+        "rev": "db00b39a9abec04245486a01b236b8d9734c9ad0",
+        "sha256": "12r8j34j6x26c7vr4na5nrm4sm8rg5m5im109j6xw0zfcpi9vjqi",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/2aa20ae969f2597c4df10a094440a66e9d7f8c86.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/db00b39a9abec04245486a01b236b8d9734c9ad0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -60,6 +60,7 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
+        "branch": "master",
         "ref": "nixos-20.09",
         "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver",
         "rev": "fb1cc04c0a517d4200237b02c3472bcaf9104afb",
@@ -69,15 +70,15 @@
         "url_template": "<repo>/-/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-20.09",
+        "branch": "nixos-unstable",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cce26cd83d20356ee96ac9cf1de748e87fcc50b5",
-        "sha256": "0ji00jz18fvppbi5y98gcalxq2mrsg7dhh9l64yf38jpb5rx3sd4",
+        "rev": "0a5f5bab0e08e968ef25cff393312aa51a3512cf",
+        "sha256": "161xisa5a7wi2h5hs0p1w7zbf095w21cs0wp0524kp7p6cpvvfyn",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/cce26cd83d20356ee96ac9cf1de748e87fcc50b5.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/0a5f5bab0e08e968ef25cff393312aa51a3512cf.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 114f87b0..7c75c55e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -7,7 +7,7 @@ let
       inherit (super) dino;
     };
 
-    discord = unstable.discord.override { nss = self.nss_latest; };
+    discord = unstable.discord.override { nss = self.nss; };
 
     ncmpcpp = unstable.ncmpcpp.override {
       visualizerSupport = true;
diff --git a/pkgs/vendor-reset/default.nix b/pkgs/vendor-reset/default.nix
index e520b6c7..ae75f0b7 100644
--- a/pkgs/vendor-reset/default.nix
+++ b/pkgs/vendor-reset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, pkgs }:
+{ stdenv, lib, fetchFromGitHub, kernel, pkgs }:
 
 let
   version = "0.1.1";
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
     "INSTALL_MOD_PATH=$(out)"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = [ licenses.gpl2Only ];
     platforms = [ "i686-linux" "x86_64-linux" ];
     description = "Vendor Reset kernel module";
diff --git a/profiles/common/nixos/packages.nix b/profiles/common/nixos/packages.nix
index 2fe84c06..c9c186aa 100644
--- a/profiles/common/nixos/packages.nix
+++ b/profiles/common/nixos/packages.nix
@@ -5,7 +5,7 @@
     smartmontools
     hddtemp
     lm_sensors
-    unstable.htop
+    htop
     cachix
     borgbackup
     ripgrep
diff --git a/profiles/gui/home/packages.nix b/profiles/gui/home/packages.nix
index 5d9fca52..38f66968 100644
--- a/profiles/gui/home/packages.nix
+++ b/profiles/gui/home/packages.nix
@@ -31,10 +31,10 @@ in {
     vlc
     ffmpeg-full
     thunderbird
-    unstable.syncplay
-    unstable.youtube-dl
-    unstable.mkchromecast
-    unstable.google-chrome
+    syncplay
+    youtube-dl
+    mkchromecast
+    google-chrome
     v4l-utils
     transmission-gtk
     lm_sensors
diff --git a/profiles/gui/nixos/dns.nix b/profiles/gui/nixos/dns.nix
index 2eabcd35..ba328e8a 100644
--- a/profiles/gui/nixos/dns.nix
+++ b/profiles/gui/nixos/dns.nix
@@ -34,8 +34,4 @@
       ];
     };
   };
-
-  systemd.services.dnscrypt-proxy2.serviceConfig = {
-    StateDirectory = "dnscrypt-proxy2";
-  };
 }
diff --git a/profiles/gui/nixos/mingetty.nix b/profiles/gui/nixos/mingetty.nix
index b249d61d..6d39c95d 100644
--- a/profiles/gui/nixos/mingetty.nix
+++ b/profiles/gui/nixos/mingetty.nix
@@ -25,7 +25,7 @@ let
     " ${c1}         .::::      ::::      ${c2}'::::.         "
   ];
 in {
-  services.mingetty = {
+  services.getty = {
     greetingLine = ''
       \e[H\e[2J
       \e[9;10]'' + lib.concatStringsSep "\n" nixos_logo + "\n\n"