From eefe177991393b14968590439a0e029e94b92589 Mon Sep 17 00:00:00 2001
From: jolheiser <john.olheiser@gmail.com>
Date: Tue, 5 Sep 2023 14:50:57 -0500
Subject: [PATCH] chore: tidy flake and add tclip/golink

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 flake.nix | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 07a543e..b89241d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,19 +3,27 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    home-manager.url = "github:nix-community/home-manager";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs = {
-      nixpkgs.follows = "nixpkgs";
-      darwin.follows = "";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        darwin.follows = "";
+      };
     };
     flake-utils.url = "github:numtide/flake-utils";
 
-    nur.url = "github:nix-community/nur";
+    nur.url = "github:nix-community/NUR";
     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,17 +33,22 @@
     agenix,
     jolheiser-nur,
     nixpkgs-py36,
+    golink,
+    tclip,
     ...
   } @ inputs: let
-    overlays = final: prev: {
-      nur = import inputs.nur {
-        nurpkgs = prev;
-        pkgs = prev;
-        repoOverrides = {
-          jolheiser = import jolheiser-nur {pkgs = prev;};
+    overlays = [
+      (final: prev: {
+        nur = import inputs.nur {
+          nurpkgs = prev;
+          pkgs = prev;
+          repoOverrides = {
+            jolheiser = import jolheiser-nur {pkgs = prev;};
+          };
         };
-      };
-    };
+      })
+      golink.overlay
+    ];
     commonConfig = {gui ? true}: {
       config,
       pkgs,
@@ -47,7 +60,7 @@
       };
     in {
       config = {
-        nixpkgs.overlays = [overlays];
+        nixpkgs.overlays = overlays;
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
@@ -119,6 +132,7 @@
           modules = [
             home-manager.nixosModules.home-manager
             agenix.nixosModules.default
+            golink.nixosModule.default
             ./machines/dragonwell
             (commonConfig {gui = false;})
           ];