diff --git a/flake.nix b/flake.nix
index ec8d7345de77f3b2c491461658deab9efa7dcd5b..a4b4aeb4f23b807aea16bf09ee38238c402f789b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,6 +62,7 @@     };
   };
 
   outputs = {
+    self,
     nixpkgs,
     home-manager,
     agenix,
@@ -75,8 +76,8 @@     tclip,
     ...
   } @ inputs: let
     overlays = [
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 {
+    website,
         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
@@ -91,8 +92,12 @@         tclip = inputs.tclip.packages.${prev.system}.tclip;
       })
       golink.overlay
     ];
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+    commonConfig = {gui ? true}: {
+        nixpkgs.follows = "nixpkgs";
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+      pkgs,
+      ...
+    }: let
       userSecret = path: {
         file = path;
         owner = username;
diff --git a/machines/chai/hardware.nix b/machines/chai/hardware.nix
index fb41d6f39ffac40a83fbfff9ef4342c29031ad5c..cce8a8beffa8898f7aff21ac27f09c4527ff13e1 100644
--- a/machines/chai/hardware.nix
+++ b/machines/chai/hardware.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }: {