Home

dotnix @main - refs - log -
-
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
feat: dragonwell golink Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmT3i+8ACgkQuFOtpdp7 v3owLRAAl5Pfbsm0HDUslXnLJEtYSrU1P0weoCyPr14wByGFSJwx7WTSjewlXEPm yPypULx7RdTTLk4w1XZNld8PPyYGib6Zi5qeAP0zjTkWvUT4FaX5b/PPJeflHytt GEsWeIzKhCW3XgocWAUW5L5XW1r70evMfAlyW9kYMk2jH2c32ievNzWzz6gWKFgz x7T5kJS3NxMyZ3oJkoc9VHhpRrzg8AD/UrEmoSTV7ylZjoAqwqiwr7ylwttVCcZO Lq8sm4Hs8spfwc85ITYIM3qTLgB/EgFS/I2zdX005EGRlFfC5RHf/xVgAKOpelZh Z4qRsffEhYsaeMb1/v//gexvXTeCJjFuSMBe7EbX/qGTssu/H3vkgF9JlcF8B2yA xoSBVx5t/a1f+BxtwlKq9p2w4T0oEoxg0nF6WvBesqHd4XoStksiU2tNmEQUZaWI YYvSeD2SKFj9Yb4OUeMLSjhg66F/wzfGrmNaDlPA2PcyyLObX+8SrJ+9490PG5MW 3MMEFej9Ze5EA7gK2Ds85iDBkcf72xsgnvqsfNeoJw24SiqKeTb7lI9Gxvnmddmc ZSPSUni208W8Cnz8LdoBnOZepQNZYtup6UwAawRMac2urHh7MfgMKrdy9rzZgHFo 10PqucvvEtF/dJj82JH65PykhRxz85P1dwfMSL7gYO5QYzzei5k= =8kPM -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
4 changed files, 190 additions(+), 17 deletions(-)
M flake.lock -> flake.lock
diff --git a/flake.lock b/flake.lock
index 4ba09c90094f80db9dcb93310a2fdcd212bc46cd..0f4200ace48309bc2dad940331feb98e665602e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,6 +40,68 @@         "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": [
@@ -83,7 +145,7 @@       }
     },
     "jolheiser-nur": {
       "inputs": {
-      "inputs": {
+      "locked": {
       },
       "locked": {
         "lastModified": 1692850752,
@@ -101,21 +163,21 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688556768,
+        "lastModified": 1682929865,
-        "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
+        "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "darwin": [],
+      "locked": {
     "agenix": {
         "type": "github"
       },
       "original": {
-        "darwin": [],
+{
 {
+      "inputs": {
         "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
 {
-        "nixpkgs": [
+        "repo": "agenix",
       }
     },
     "nixpkgs-py36": {
@@ -136,6 +198,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=",
         "owner": "nixos",
@@ -150,22 +228,38 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-        "home-manager": "home-manager",
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1692447944,
+        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
+        "type": "github"
+      },
+      "original": {
+      "locked": {
       "inputs": {
 {
+  "nodes": {
 {
-        "home-manager": "home-manager",
+      "locked": {
         "darwin": [],
-        "home-manager": "home-manager",
+      }
+    },
         "home-manager": "home-manager",
+      "inputs": {
+      "locked": {
+        "lastModified": 1693943116,
+        "narHash": "sha256-QxoI1WPPWDurTD69+m0lRUciOozBoIs6lXgoT2qrZpw=",
         "owner": "nix-community",
-        "repo": "nur",
+        "repo": "NUR",
-        "rev": "854b37902d9432ed96ad0ad432bb006ddc7d65cc",
+        "rev": "4794cc1b71814c2a2dd657228716a4f6a9112ada",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "repo": "nur",
+        "repo": "NUR",
         "type": "github"
       }
     },
@@ -173,19 +267,54 @@     "root": {
       "inputs": {
         "agenix": "agenix",
         "flake-utils": "flake-utils",
+        "golink": "golink",
         "home-manager": "home-manager_2",
         "jolheiser-nur": "jolheiser-nur",
+        "lastModified": 1690228878,
         "nixpkgs": [
-      "inputs": {
         "nixpkgs-py36": "nixpkgs-py36",
+        "nur": "nur",
+        "tclip": "tclip"
+      }
+    },
         "nixpkgs": [
-        "home-manager": "home-manager",
+        "nixpkgs": [
 {
+{
+        "lastModified": 1681028828,
+        "nixpkgs": [
         ]
+        "owner": "nix-systems",
+        "repo": "default",
+          "nixpkgs"
   "nodes": {
+        "type": "github"
+{
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+{
         "nixpkgs": [
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+{
         "nixpkgs": [
 {
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+{
 {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -197,6 +326,44 @@       },
       "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"
       }
     }
M flake.nix -> flake.nix
diff --git a/flake.nix b/flake.nix
index b89241d9f09bd29e4c544727b4d948cbe8ace560..d5085546c7ffb797ec04d8e588ffb90930a40265 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;})
           ];
M machines/dragonwell/default.nix -> machines/dragonwell/default.nix
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 6d02f3a5a7a3f0f0ecc4f341cf1f69fb6b3ee8a6..1c47a9a98433cd4f27afd1cb02ec96a4d96592e6 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;
I machines/dragonwell/golink.nix
diff --git a/machines/dragonwell/golink.nix b/machines/dragonwell/golink.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6230005c0b70428e3e0b012cb3aa0c9439016582
--- /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
+  };
+}