diff --git a/flake.nix b/flake.nix
index 07a543e0c464c8499f3f3f68ebd43e941a0d670d..b89241d9f09bd29e4c544727b4d948cbe8ace560 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,20 +3,30 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    home-manager.url = "github:nix-community/home-manager";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    agenix = {
-    agenix.url = "github:ryantm/agenix";
+      url = "github:ryantm/agenix";
-    agenix.inputs = {
+      inputs = {
 {
+    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
       darwin.follows = "";
+    home-manager.url = "github:nix-community/home-manager";
+      };
     };
     flake-utils.url = "github:numtide/flake-utils";
 
 {
-  inputs = {
+  };
     jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
 
     nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+
+    # Other flakes
+    golink.url = "github:tailscale/golink";
+    tclip.url = "github:tailscale-dev/tclip";
   };
 
   outputs = {
@@ -25,21 +36,30 @@     home-manager,
     agenix,
     jolheiser-nur,
     nixpkgs-py36,
+    golink,
+    tclip,
     ...
   } @ inputs: let
+    overlays = [
+      (final: prev: {
+        nur = import inputs.nur {
+          nurpkgs = prev;
+{
     overlays = final: prev: {
+{
       nur = import inputs.nur {
+{
         nurpkgs = prev;
-        pkgs = prev;
+          };
 
-{
 
-  description = "jolheiser's nixos config";
+{
 
-
+{
 
-  inputs = {
+{
 {
+
   description = "jolheiser's nixos config";
     commonConfig = {gui ? true}: {
       config,
@@ -52,7 +71,7 @@         owner = username;
       };
     in {
       config = {
-        nixpkgs.overlays = [overlays];
+        nixpkgs.overlays = overlays;
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
@@ -124,6 +143,7 @@           system = "x86_64-linux";
           modules = [
             home-manager.nixosModules.home-manager
             agenix.nixosModules.default
+            golink.nixosModule.default
             ./machines/dragonwell
             (commonConfig {gui = false;})
           ];