diff --git a/configurations/sway.nix b/configurations/sway.nix
index a78e3d8b..a88d2b6a 100644
--- a/configurations/sway.nix
+++ b/configurations/sway.nix
@@ -31,7 +31,7 @@ in
           "home-docked" = {
             outputs = [
               { criteria = "Unknown 0x2036 0x00000000"; position = "0,0"; mode = "2560x1440"; scale = 1.0; }
-              { criteria = "Dell Inc. DELL U2718Q FN84K01T095L"; position = "2560,0"; mode = "3840x2160"; scale = 1.25; }
+              { criteria = "Dell Inc. DELL U2718Q FN84K01T095L"; position = "2560,0"; mode = "3840x2160"; scale = 1.0; }
             ];
           };
           "work-undocked" = {
@@ -42,7 +42,7 @@ in
           "work-docked" = {
             outputs = [
               { criteria = "Chimei Innolux Corporation 0x14D3 0x00000000"; position = "0,0"; mode = "1920x1080"; scale = 1.0; }
-              { criteria = "Dell Inc. DELL U2718Q FN84K83Q1KHL"; position = "1920,0"; mode = "3840x2160"; scale = 1.25; }
+              { criteria = "Dell Inc. DELL U2718Q FN84K83Q1KHL"; position = "1920,0"; mode = "3840x2160"; scale = 1.0; }
             ];
           };
         };
@@ -79,9 +79,9 @@ in
           ];
           output = {
             "Unknown 0x2036 0x00000000" = { position = "0,0"; mode = "2560x1440"; scale = "1.0"; };
-            "Dell Inc. DELL U2718Q FN84K01T095L" = { position = "2560,0"; mode = "3840x2160"; scale = "1.25"; };
+            "Dell Inc. DELL U2718Q FN84K01T095L" = { position = "2560,0"; mode = "3840x2160"; scale = "1.0"; };
             "Chimei Innolux Corporation 0x14D3 0x00000000" = { position = "0,0"; mode = "1920x1080"; scale = "1.0"; };
-            "Dell Inc. DELL U2718Q FN84K83Q1KHL" = { position = "1920,0"; mode = "3840x2160"; scale = "1.25"; };
+            "Dell Inc. DELL U2718Q FN84K83Q1KHL" = { position = "1920,0"; mode = "3840x2160"; scale = "1.0"; };
           };
           startup = [
             {
diff --git a/flake.lock b/flake.lock
index 4fabae54..18607313 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1623461602,
-        "narHash": "sha256-s4oIoOhSeL8OrxLJpSi9m/vmecDHGWuLTidgW4rl+Ys=",
+        "lastModified": 1624007741,
+        "narHash": "sha256-WfCRbtkbGjq2QB4t7HDLoBGd+t46jfvQ+0OosVJsETo=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2ff3bbb43a068dd2322b55dbb585c240c5062558",
+        "rev": "022d0216b6f1b8aeabd832bc78f62ff07f5af9dd",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1623343236,
-        "narHash": "sha256-Cl/0/WW3AWjkO7gphw9FqUr4P7T98KKyFCX3Vxv22Sk=",
+        "lastModified": 1623967045,
+        "narHash": "sha256-D8tZULncqU2Drn4vmG1vgMdhnZ5ONV5aEuHIxaA/kyE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "666eee4f72979b0ebbd2e065a3846d7a8a16895c",
+        "rev": "2f6d5c90f4497dc3cfc043c0fd1b77272ebaeeaa",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1623364030,
-        "narHash": "sha256-zamIk2U9RM87cM5kxIk6RTlwGUtdTJ5EkZr+xISb16s=",
+        "lastModified": 1623861389,
+        "narHash": "sha256-v/fDk4hD3mcBFsl6hiT9h6UxRWmwO4Dbvg6jwFGScbY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6a1ca229f5d811fc3fce512206d1eeb2ba7182c4",
+        "rev": "75dc3bbdd4f51d5c647491f8c39ca653c0657523",
         "type": "github"
       },
       "original": {
diff --git a/modules/accentor.nix b/modules/accentor.nix
index abc89290..2c3b8dc6 100644
--- a/modules/accentor.nix
+++ b/modules/accentor.nix
@@ -7,7 +7,7 @@ let
       owner = "accentor";
       repo = "web";
       rev = "develop";
-      sha256 = "1ggmmyznpqqcjnq3gsighlvq9cxydyr9j6wcl18bi337mpagl1bi";
+      sha256 = "0rkwily1lvpbyhf5hnmh8pd57x5cgxxq191spdlh9ldx1yq5fbwb";
     };
     yarnNix = ./accentor/yarn.nix;
     buildPhase = ''
diff --git a/modules/accentor/yarn.nix b/modules/accentor/yarn.nix
index 6d231344..8cac12a8 100644
--- a/modules/accentor/yarn.nix
+++ b/modules/accentor/yarn.nix
@@ -3530,11 +3530,11 @@
       };
     }
     {
-      name = "eslint_plugin_vue___eslint_plugin_vue_7.10.0.tgz";
+      name = "eslint_plugin_vue___eslint_plugin_vue_7.11.0.tgz";
       path = fetchurl {
-        name = "eslint_plugin_vue___eslint_plugin_vue_7.10.0.tgz";
-        url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.10.0.tgz";
-        sha1 = "251749aa99e089e085275f011042c6e74189f89a";
+        name = "eslint_plugin_vue___eslint_plugin_vue_7.11.0.tgz";
+        url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz";
+        sha1 = "c19b098899b7e3cd692beffbbe73611064ef1ea6";
       };
     }
     {
@@ -7082,11 +7082,11 @@
       };
     }
     {
-      name = "postcss___postcss_7.0.35.tgz";
+      name = "postcss___postcss_7.0.36.tgz";
       path = fetchurl {
-        name = "postcss___postcss_7.0.35.tgz";
-        url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz";
-        sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24";
+        name = "postcss___postcss_7.0.36.tgz";
+        url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz";
+        sha1 = "056f8cffa939662a8f5905950c07d5285644dfcb";
       };
     }
     {
@@ -7122,11 +7122,11 @@
       };
     }
     {
-      name = "prettier___prettier_2.3.0.tgz";
+      name = "prettier___prettier_2.3.1.tgz";
       path = fetchurl {
-        name = "prettier___prettier_2.3.0.tgz";
-        url = "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz";
-        sha1 = "b6a5bf1284026ae640f17f7ff5658a7567fc0d18";
+        name = "prettier___prettier_2.3.1.tgz";
+        url = "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz";
+        sha1 = "76903c3f8c4449bc9ac597acefa24dc5ad4cbea6";
       };
     }
     {
@@ -9114,11 +9114,11 @@
       };
     }
     {
-      name = "vue_template_compiler___vue_template_compiler_2.6.13.tgz";
+      name = "vue_template_compiler___vue_template_compiler_2.6.14.tgz";
       path = fetchurl {
-        name = "vue_template_compiler___vue_template_compiler_2.6.13.tgz";
-        url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.13.tgz";
-        sha1 = "a735b8974e013ce829e7f77e08e4ee5aecbd3005";
+        name = "vue_template_compiler___vue_template_compiler_2.6.14.tgz";
+        url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz";
+        sha1 = "a2f0e7d985670d42c9c9ee0d044fed7690f4f763";
       };
     }
     {
@@ -9130,11 +9130,11 @@
       };
     }
     {
-      name = "vue___vue_2.6.13.tgz";
+      name = "vue___vue_2.6.14.tgz";
       path = fetchurl {
-        name = "vue___vue_2.6.13.tgz";
-        url = "https://registry.yarnpkg.com/vue/-/vue-2.6.13.tgz";
-        sha1 = "94b2c1b31fddf1dfcc34f28ec848ba8f01ea4c5b";
+        name = "vue___vue_2.6.14.tgz";
+        url = "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz";
+        sha1 = "e51aa5250250d569a3fbad3a8a5a687d6036e235";
       };
     }
     {
diff --git a/modules/emacs.nix b/modules/emacs.nix
index ffa9cc60..99f2da6e 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -3,7 +3,7 @@
 let
   emacsPkg = pkgs.emacsWithPackagesFromUsePackage {
     config = ./emacs/init.el;
-    package = pkgs.emacsPgtkGcc;
+    package = pkgs.emacsPgtk;
     alwaysEnsure = true;
     extraEmacsPackages = epkgs: [
       # mu4e is included in the mu package and should be used from there
diff --git a/modules/nix.nix b/modules/nix.nix
index f368b58b..dbcd0909 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -4,7 +4,10 @@ let
     programs.direnv = {
       enable = true;
       enableZshIntegration = true;
-      enableNixDirenvIntegration = true;
+      nix-direnv = {
+        enable = true;
+        enableFlakes = true;
+      };
     };
   };
   baseNixIndex = {
@@ -85,7 +88,6 @@ in
     nixpkgs.overlays = [
       (self: super: {
         nix = super.nixUnstable;
-        nix-direnv = super.nix-direnv.override { enableFlakes = true; };
       })
     ];