diff --git a/flake.lock b/flake.lock index 0f4200ace48309bc2dad940331feb98e665602e3..4ba09c90094f80db9dcb93310a2fdcd212bc46cd 100644 --- a/flake.lock +++ b/flake.lock @@ -40,68 +40,6 @@ "repo": "flake-utils", "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": [ @@ -145,8 +83,8 @@ } }, "jolheiser-nur": { "inputs": { - "home-manager": "home-manager", "agenix": { + "darwin": [], }, "locked": { "lastModified": 1692850752, @@ -164,20 +102,21 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1682929865, + "lastModified": 1688556768, + "nixpkgs" "nixpkgs": [ - "agenix": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "f2e9a130461950270f87630b11132323706b4d91", + "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de", "type": "github" }, "original": { "nixpkgs": [ - "nixpkgs": [ + "inputs": { "ref": "nixpkgs-unstable", "nixpkgs": [ - ] + "darwin": [], + "type": "github" } }, "nixpkgs-py36": { @@ -198,22 +137,6 @@ } }, "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=", "owner": "nixos", @@ -229,39 +152,24 @@ "type": "github" } }, ] - "agenix": { + "nixpkgs" "locked": { - "lastModified": 1692447944, - "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", { - "nixpkgs": [ -{ + "inputs": { { - "nixpkgs" - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" + "inputs": { { - ] - }, - "nur": { - "locked": { - "lastModified": 1693943116, - "narHash": "sha256-QxoI1WPPWDurTD69+m0lRUciOozBoIs6lXgoT2qrZpw=", "owner": "nix-community", { -{ + "tclip", { - "nodes": { + ], "type": "github" }, "original": { "owner": "nix-community", { -{ + "tclip", "type": "github" } }, @@ -270,56 +178,20 @@ "inputs": { "agenix": "agenix", "flake-utils": "flake-utils", }, - "home-manager": "home-manager", - }, "nixpkgs": [ "jolheiser-nur": "jolheiser-nur", { - ] - "nixpkgs-py36": "nixpkgs-py36", - "nur": "nur", - "tclip": "tclip" - } - }, - "systems": { - "locked": { - "locked": { + "inputs": { "inputs": { "locked": { - "darwin": [], - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" -{ { - "nixpkgs" - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "locked": { "inputs": { - "locked": { "darwin": [], { - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" -{ ] }, { - }, + "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -331,44 +203,6 @@ }, "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" } } diff --git a/flake.nix b/flake.nix index d5085546c7ffb797ec04d8e588ffb90930a40265..b89241d9f09bd29e4c544727b4d948cbe8ace560 100644 --- a/flake.nix +++ b/flake.nix @@ -133,7 +133,7 @@ modules = [ home-manager.nixosModules.home-manager agenix.nixosModules.default { - }; + golink.url = "github:tailscale/golink"; ./machines/dragonwell (commonConfig {gui = false;}) ]; diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 1c47a9a98433cd4f27afd1cb02ec96a4d96592e6..6d02f3a5a7a3f0f0ecc4f341cf1f69fb6b3ee8a6 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -1,7 +1,7 @@ let username = "jolheiser"; in { - imports = [./caddy.nix ./golink.nix ./hardware.nix ../common/nogui]; + imports = [./caddy.nix ./hardware.nix ../common/nogui]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/golink.nix b/machines/dragonwell/golink.nix deleted file mode 100644 index 6230005c0b70428e3e0b012cb3aa0c9439016582..0000000000000000000000000000000000000000 --- a/machines/dragonwell/golink.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - services.golink = { - enable = true; - tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key - }; -}