From 8fad2f678d5b9d9f4b571fb6375f07a74879670a Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 3 Mar 2023 15:24:10 +0000 Subject: [PATCH] golink --- flake.lock | 39 +++++++++++++++++++++++++++++++++++++- flake.nix | 9 +++++++++ modules/default.nix | 1 + modules/golink/default.nix | 9 +++++++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 modules/golink/default.nix diff --git a/flake.lock b/flake.lock index d8119de..12fe4e3 100644 --- a/flake.lock +++ b/flake.lock @@ -44,6 +44,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1649676176, "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", @@ -58,6 +73,27 @@ "type": "github" } }, + "golink": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675902276, + "narHash": "sha256-Yx99VgZsUKD945MjRHvyzwmzNSb/UGSwG/yQA8/oYN8=", + "owner": "tailscale", + "repo": "golink", + "rev": "7fd2d35ba633d5390fbaf50bac6b0821ab041d85", + "type": "github" + }, + "original": { + "owner": "tailscale", + "repo": "golink", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -124,7 +160,7 @@ }, "i3utils": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -178,6 +214,7 @@ "root": { "inputs": { "agenix": "agenix", + "golink": "golink", "home-manager": "home-manager", "hyprland": "hyprland", "i3utils": "i3utils", diff --git a/flake.nix b/flake.nix index d56ec78..ca3b44e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,9 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; + + golink.url = "github:tailscale/golink"; + golink.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { @@ -22,6 +25,7 @@ home-manager, i3utils, hyprland, + golink, ... }: let system = "x86_64-linux"; @@ -30,6 +34,9 @@ (import nixpkgs { inherit system; config.allowUnfree = true; + overlays = [ + golink.overlay + ]; }) // { i3utils = i3utils.packages.${system}.default; @@ -68,6 +75,8 @@ }; } + golink.nixosModules.default + home-manager.nixosModules.home-manager { home-manager = { diff --git a/modules/default.nix b/modules/default.nix index d4d3058..211b0e0 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -5,6 +5,7 @@ ./dungflix ./monitoring ./synapse + ./golink ]; }; diff --git a/modules/golink/default.nix b/modules/golink/default.nix new file mode 100644 index 0000000..4fce572 --- /dev/null +++ b/modules/golink/default.nix @@ -0,0 +1,9 @@ +{ + ... +}: { + services.golink = { + enable = true; + + tailscaleAuthKeyFile = "/tmp/.ts_auth"; + }; +}