diff --git a/nixos/base.nix b/nixos/base.nix
index d695d21f..b4d32fb0 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -7,7 +7,6 @@
   ];
 
   nixpkgs.overlays = [
-    (import ./overlays.nix)
     (import ../dotfiles/config/xmonad/overlay.nix)
     (import ../dotfiles/config/taffybar/overlay.nix)
   ];
diff --git a/nixos/essential.nix b/nixos/essential.nix
index 1beafebf..10c3c223 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -74,6 +74,7 @@ in
     binutils
     gawk
     gitFull
+    git-sync
     htop
     ncdu
     lsof
diff --git a/nixos/extra.nix b/nixos/extra.nix
index 30b5c07a..22c2858e 100644
--- a/nixos/extra.nix
+++ b/nixos/extra.nix
@@ -1,11 +1,9 @@
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    # (import ../../Projects/waymonad/default.nix)
     asciidoctor
     gource
     gimp
-    android-studio
     texlive.combined.scheme-full
     tor
   ];
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 1b39b096..cef15172 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -127,7 +127,7 @@
     },
     "nixpkgs": {
       "locked": {
-        "narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
+        "narHash": "sha256-vBvIKuTZfH6H62RTomwSLCg0HwTsTzGsd0WCfxsuB7U=",
         "path": "./nixpkgs",
         "type": "path"
       },
@@ -138,8 +138,8 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
-        "path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
+        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
+        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
         "type": "path"
       },
       "original": {
@@ -149,8 +149,8 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
-        "path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
+        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
+        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
         "type": "path"
       },
       "original": {
@@ -160,8 +160,8 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "narHash": "sha256-ejJE3m7ymOKpPE6NBDlWla1FitMw04hB8JAUeW9WIn8=",
-        "path": "/nix/store/z30j15qd7l90y8c9fb3nd2703g65dskp-source",
+        "narHash": "sha256-eRDWIO61MIEZs/ftS1dp5fqdJQr3yTcfzBrYcC3k31M=",
+        "path": "/nix/store/cbpvh4ldqsjfvvlmxcq81kn3y2dnvwkw-source",
         "type": "path"
       },
       "original": {
@@ -188,7 +188,7 @@
         ]
       },
       "locked": {
-        "narHash": "sha256-U7h6ZMV1jhGFdVNOFPz3RhHYHE5quT0ksi8b8pW0rYY=",
+        "narHash": "sha256-6YDz7kCm5jMrSqWMNw9OS3N66v84ZOe5LCl1iFLoPtE=",
         "path": "../dotfiles/config/taffybar/taffybar",
         "type": "path"
       },
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 3623ef08..297d15a6 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -32,7 +32,7 @@
   let forAll = ({ ... }: {
     nix = {
       extraOptions = ''
-        experimental-features = nix-command flakes
+        experimental-features = nix-command flakes ca-references
       '';
       registry.nixpkgs.flake = nixpkgs;
     };
diff --git a/nixos/machines/ivanm-dfinity-razer.nix b/nixos/machines/ivanm-dfinity-razer.nix
index 8dc1d3a6..66223d24 100644
--- a/nixos/machines/ivanm-dfinity-razer.nix
+++ b/nixos/machines/ivanm-dfinity-razer.nix
@@ -63,6 +63,7 @@
   networking.hostName = "ivanm-dfinity-razer";
 
   nix.maxJobs = lib.mkDefault 12;
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   system.stateVersion = "18.03";
 }
diff --git a/nixos/machines/ryzen-shine.nix b/nixos/machines/ryzen-shine.nix
index 907d1632..e8c3160f 100644
--- a/nixos/machines/ryzen-shine.nix
+++ b/nixos/machines/ryzen-shine.nix
@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, ... }:
 
 {
@@ -51,5 +48,5 @@
   # High-DPI console
   console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 
-  system.stateVersion = "20.03"; # Did you read the comment?
+  system.stateVersion = "20.03";
 }
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index 71e3cbe2..ec11db89 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit 71e3cbe2e975752eae72a1023f705bb5ad7dbb54
+Subproject commit ec11db896633f328e978622c4d2e6474e31d304f
diff --git a/nixos/overlays.nix b/nixos/overlays.nix
deleted file mode 100644
index b5d83487..00000000
--- a/nixos/overlays.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-self: super:
-{
-}
diff --git a/nixos/patch-strongswan.patch b/nixos/patch-strongswan.patch
deleted file mode 100644
index b2932764..00000000
--- a/nixos/patch-strongswan.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 71c28adfc1da51bb112ba1c83909d4292f2353cf Mon Sep 17 00:00:00 2001
-From: Ivan Malison <IvanMalison@gmail.com>
-Date: Fri, 14 Jun 2019 16:03:58 -0700
-Subject: [PATCH] Remove dumbass restriction on length of used PSK
-
----
- src/charon-nm/nm/nm_service.c | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
-index fb9044d29..ccad2f635 100644
---- a/src/charon-nm/nm/nm_service.c
-+++ b/src/charon-nm/nm/nm_service.c
-@@ -409,16 +409,6 @@ static gboolean connect_(NMVpnServicePlugin *plugin, NMConnection *connection,
- 		{
- 			user = identification_create_from_string((char*)str);
- 			str = nm_setting_vpn_get_secret(vpn, "password");
--			if (auth_class == AUTH_CLASS_PSK &&
--				strlen(str) < 20)
--			{
--				g_set_error(err, NM_VPN_PLUGIN_ERROR,
--							NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
--							"pre-shared key is too short.");
--				gateway->destroy(gateway);
--				user->destroy(user);
--				return FALSE;
--			}
- 			priv->creds->set_username_password(priv->creds, user, (char*)str);
- 		}
- 	}
--- 
-2.21.0
-