diff --git a/dragonwell/services/ugit.nix b/dragonwell/services/ugit.nix index dd93c5be519af424cee850aa5beb708d90eb7c2b..c268b6d82eb99a133100c153907bcb7ae8411d6b 100644 --- a/dragonwell/services/ugit.nix +++ b/dragonwell/services/ugit.nix @@ -18,29 +18,22 @@ repoDir = "${homeDir}/repos"; hostKeyFile = "${homeDir}/ugit_ed25519"; user = "ugit"; group = "ugit"; - ssh.cloneUrl = "ugit@${host}"; - http = { - port = pubPort; - cloneUrl = "https://${host}"; - }; - log.json = true; - profile = { - username = jolheiser.username; - email = "ugit@${jolheiser.domain}"; - links = [ - { - name = "GitHub"; - url = "https://github.com/jolheiser"; - } - { - name = "Gitea"; - url = "https://gitea.com/jolheiser"; - } - { - name = "Tangled"; - url = "https://tangled.org/jolheiser.com"; - } - ]; + config = { + ssh.clone-url = "ugit@${host}"; + http = { + port = pubPort; + clone-url = "https://${host}"; + }; + log.json = true; + profile = { + username = jolheiser.username; + email = "ugit@${jolheiser.domain}"; + links = [ + "Github,https://github.com/jolheiser" + "Gitea,https://gitea.com/jolheiser" + "Tangled,https://tangled.sh/@jolheiser.com" + ]; + }; }; }; in @@ -49,9 +42,11 @@ services = { ugit = { public = opts; private = lib.recursiveUpdate opts { - ssh.port = 8446; - http.port = privPort; - showPrivate = true; + config = { + ssh.port = 8446; + http.port = privPort; + show-private = true; + }; }; }; tailproxy.ugit = { diff --git a/flake.lock b/flake.lock index 533991b8b67b740352e836e126d3cf5acfacb2cf..8c293c8935b8530ee0cafc50310ab69142c7984a 100644 --- a/flake.lock +++ b/flake.lock @@ -825,11 +825,11 @@ "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, "locked": { - "lastModified": 1790085520, - "narHash": "sha256-r02Hb3LeE9TdiN26GICFRc8ANKLDAGrXawBvr4v7+e0=", + "lastModified": 1784297924, + "narHash": "sha256-R2tkm+bqXH5HodYo7OKQZsKdGexi93H1KtCUId63Zzk=", "ref": "refs/heads/main", - "rev": "b1f33fc696f9209a1f61eacef5abcdcde2b1cd16", - "revCount": 109, + "rev": "32a2a04127aa8e7ee6eaeca9da4850df00fe5428", + "revCount": 106, "type": "git", "url": "https://git.jolheiser.com/ugit.git" },