From 371a0f7779faf902fc2e98fc21d5911f04fd067a Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 5 Sep 2023 15:13:35 -0500 Subject: [PATCH] feat: dragonwell golink Signed-off-by: jolheiser --- flake.lock | 190 +++++++++++++++++++++++++++++--- flake.nix | 2 +- machines/dragonwell/default.nix | 2 +- machines/dragonwell/golink.nix | 6 + 4 files changed, 184 insertions(+), 16 deletions(-) create mode 100644 machines/dragonwell/golink.nix diff --git a/flake.lock b/flake.lock index 4ba09c9..0f4200a 100644 --- a/flake.lock +++ b/flake.lock @@ -40,6 +40,68 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "golink": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1689362244, + "narHash": "sha256-piiuj6YPz6TDnhKJiDgbDPQWZ7S938a4WDevTJqE32o=", + "owner": "tailscale", + "repo": "golink", + "rev": "3d62a353ac8b5467b433ad96d686d3388ad01e34", + "type": "github" + }, + "original": { + "owner": "tailscale", + "repo": "golink", + "type": "github" + } + }, + "gomod2nix": { + "inputs": { + "nixpkgs": [ + "tclip", + "nixpkgs" + ], + "utils": [ + "tclip", + "utils" + ] + }, + "locked": { + "lastModified": 1677459247, + "narHash": "sha256-JbakfAiPYmCCV224yAMq/XO0udN5coWv/oazblMKdoY=", + "owner": "tweag", + "repo": "gomod2nix", + "rev": "3cbf3a51fe32e2f57af4c52744e7228bab22983d", + "type": "github" + }, + "original": { + "owner": "tweag", + "repo": "gomod2nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -83,7 +145,7 @@ }, "jolheiser-nur": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1692850752, @@ -101,18 +163,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688556768, - "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", + "lastModified": 1682929865, + "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", + "rev": "f2e9a130461950270f87630b11132323706b4d91", "type": "github" }, "original": { - "owner": "NixOS", + "id": "nixpkgs", "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "nixpkgs-py36": { @@ -132,6 +193,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1688556768, + "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1693060755, "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", @@ -147,18 +224,33 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1692447944, + "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nur": { "locked": { - "lastModified": 1693176358, - "narHash": "sha256-Su8FA5siaU8lotg8j9cbRqfFgSh01Ao+TFwNOM737IY=", + "lastModified": 1693943116, + "narHash": "sha256-QxoI1WPPWDurTD69+m0lRUciOozBoIs6lXgoT2qrZpw=", "owner": "nix-community", - "repo": "nur", - "rev": "854b37902d9432ed96ad0ad432bb006ddc7d65cc", + "repo": "NUR", + "rev": "4794cc1b71814c2a2dd657228716a4f6a9112ada", "type": "github" }, "original": { "owner": "nix-community", - "repo": "nur", + "repo": "NUR", "type": "github" } }, @@ -166,11 +258,13 @@ "inputs": { "agenix": "agenix", "flake-utils": "flake-utils", + "golink": "golink", "home-manager": "home-manager_2", "jolheiser-nur": "jolheiser-nur", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-py36": "nixpkgs-py36", - "nur": "nur" + "nur": "nur", + "tclip": "tclip" } }, "systems": { @@ -187,6 +281,74 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tclip": { + "inputs": { + "gomod2nix": "gomod2nix", + "nixpkgs": "nixpkgs_4", + "utils": "utils" + }, + "locked": { + "lastModified": 1693326365, + "narHash": "sha256-5XfKv+mEE2p2WxzYFDAJIHf+Xsp+9jzowWHgshq34Pc=", + "owner": "tailscale-dev", + "repo": "tclip", + "rev": "08405a1feb29758e744bec1e8a485a5da1d5a7e2", + "type": "github" + }, + "original": { + "owner": "tailscale-dev", + "repo": "tclip", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b89241d..d508554 100644 --- a/flake.nix +++ b/flake.nix @@ -132,7 +132,7 @@ modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default - golink.nixosModule.default + golink.nixosModules.default ./machines/dragonwell (commonConfig {gui = false;}) ]; diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 6d02f3a..1c47a9a 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,7 +1,7 @@ let username = "jolheiser"; in { - imports = [./caddy.nix ./hardware.nix ../common/nogui]; + imports = [./caddy.nix ./golink.nix ./hardware.nix ../common/nogui]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/golink.nix b/machines/dragonwell/golink.nix new file mode 100644 index 0000000..6230005 --- /dev/null +++ b/machines/dragonwell/golink.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + services.golink = { + enable = true; + tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key + }; +}