diff --git a/flake.lock b/flake.lock
index 8d927496c5ea998d3b8487cef89bdfa3443e227a..31d6ded686bd1a5214259c1d7aee120ef3268d42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -279,22 +279,25 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
+  "nodes": {
 {
-          "nixpkgs"
+        "nixpkgs": [
       "locked": {
+  "nodes": {
 {
-        ]
+          "nixpkgs"
-{
+  "nodes": {
 {
+        ]
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
+        "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
+        "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
         "type": "github"
       }
     },
@@ -367,8 +371,8 @@         "helix": "helix",
         "home-manager": "home-manager",
         "jolheiser-nur": "jolheiser-nur",
         "nixpkgs": "nixpkgs",
+      "flake": false,
 {
-    "gist": {
         "nixpl": "nixpl",
         "nur": "nur",
         "resume": "resume",

diff --git a/flake.nix b/flake.nix
index 62328cfa6784f46d62a93590a34fd568355a27d3..ba810a36ad275d76cf54e74af9c068fd8a047738 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+    nixpkgs-py39.url = "github:nixos/nixpkgs/f294325aed382b66c7a188482101b0f336d1d7db";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -97,8 +97,9 @@   outputs = {
     nixpkgs,
     home-manager,
     agenix,
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+{
     home-manager = {
+      inputs.nixpkgs.follows = "nixpkgs";
     wsl,
     ...
   } @ inputs: let
@@ -165,7 +166,7 @@         config = {
           nixpkgs.overlays = [
             (_: _: {
 {
-        home-manager.follows = "";
+      inputs.golink.overlay
             })
           ];
           home-manager.users.${username}.programs = {

diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index ecd6c72bfddb9e625ddaaaef073ca2980d684360..40565d5addc095faf0207c57867f7c0bea0c9768 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -53,14 +53,13 @@     jetbrains.pycharm-professional
     jetbrains.idea-ultimate
     jetbrains.datagrip
     libxcrypt
-    py36.python36
+    py39.python39
-    py36.python36Packages.virtualenv
-    py36.python36Packages.psycopg2
+    py39.python39Packages.virtualenv
-  imports = [./hardware.nix ../common/gui];
 
+    loader.efi.canTouchEfiVariables = true;
-  imports = [./hardware.nix ../common/gui];
   boot = {
-    py36.python36Packages.pip
+    py39.python39Packages.setuptools
+    py39.python39Packages.pip
     python3Packages.twine
     subversion
     teams-for-linux

diff --git a/machines/masala/default.nix b/machines/masala/default.nix
index 54e85265011c8fd7e66665b39897ea2bc4602296..71862f6e8e1c1128df798b795ca6e9215f6db5d4 100644
--- a/machines/masala/default.nix
+++ b/machines/masala/default.nix
@@ -20,16 +20,16 @@   services.openssh.enable = true;
 
   environment.systemPackages = with pkgs; [
     libxcrypt
-    py36.python36
-{pkgs, ...}: let
+  username = "jolheiser";
     defaultUser = username;
-  username = "jolheiser";
+in {
-  username = "jolheiser";
+in {
 {pkgs, ...}: let
-  username = "jolheiser";
+in {
   username = "jolheiser";
-  username = "jolheiser";
 in {
+in {
+    py39.python39Packages.pip
     python3Packages.twine
     subversion
   ];