diff --git a/clients/quadraticserver/degoog.nix b/clients/quadraticserver/degoog.nix index ae719d2..af40868 100644 --- a/clients/quadraticserver/degoog.nix +++ b/clients/quadraticserver/degoog.nix @@ -3,12 +3,14 @@ services = { degoog = { enable = true; - port = 8081; + configurePostgres = true; - publicInstance = true; + environment.DEGOOG_UNIX_SOCKET = "/var/run/degoog/degoog.sock"; }; caddy.authedHosts."search.federated.nexus" = - "reverse_proxy 127.0.0.1:${toString config.services.degoog.port}"; + "reverse_proxy unix/${config.services.degoog.environment.DEGOOG_UNIX_SOCKET}"; }; + + systemd.services.caddy.serviceConfig.SupplementaryGroups = [ "degoog" ]; } diff --git a/flake.lock b/flake.lock index c45abc8..98cc437 100644 --- a/flake.lock +++ b/flake.lock @@ -237,11 +237,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1784665499, - "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", + "lastModified": 1782772816, + "narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=", "owner": "nix-community", "repo": "bun2nix", - "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", + "rev": "5a39d717029e94163ac223aee8d5c9946cafed1c", "type": "github" }, "original": { @@ -518,39 +518,22 @@ "degoog": { "inputs": { "bun2nix": "bun2nix", - "degoog": "degoog_2", - "flake-utils": "flake-utils_2", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1787406697, - "narHash": "sha256-3Oc0YRlB2EDLJz4KVukWWd7Ls788WoNH11zfDUbQcqU=", - "owner": "Guusvanmeerveld", - "repo": "degoog.nix", - "rev": "c58c6ca9ab29766b08aedd27b7725c73d59d4722", - "type": "github" - }, - "original": { - "owner": "Guusvanmeerveld", - "repo": "degoog.nix", - "type": "github" - } - }, - "degoog_2": { - "flake": false, - "locked": { - "lastModified": 1786219839, - "narHash": "sha256-5Tid6WEe4GbIkfLOF6XetQoYxVpBj3Bk5KuCIe+Rrcc=", - "owner": "degoog-org", + "lastModified": 1788976499, + "narHash": "sha256-QlBQDQMjNxtgpBZf2iCRysb93mnAWXHp4aOzczfxEvw=", + "owner": "Henry-Hiles", "repo": "degoog", - "rev": "4ec589cab8c0b231b8c346ab9d877ef46e3de5b5", + "rev": "52308edd3a679ca1b08ac5f9c91a3a41cdd69e61", "type": "github" }, "original": { - "owner": "degoog-org", - "ref": "0.24.0", + "owner": "Henry-Hiles", + "ref": "quad/feat/nix", "repo": "degoog", "type": "github" } @@ -877,6 +860,24 @@ } }, "flake-parts_10": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_9" + }, + "locked": { + "lastModified": 1785627969, + "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_11": { "inputs": { "nixpkgs-lib": [ "sdm845", @@ -897,7 +898,7 @@ "type": "github" } }, - "flake-parts_11": { + "flake-parts_12": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -945,11 +946,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -963,11 +964,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1788450739, - "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -981,11 +982,11 @@ "nixpkgs-lib": "nixpkgs-lib_4" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -1016,24 +1017,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_6" }, - "locked": { - "lastModified": 1785627969, - "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_8": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_7" - }, "locked": { "lastModified": 1749398372, "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", @@ -1048,9 +1031,9 @@ "type": "github" } }, - "flake-parts_9": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_8" + "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { "lastModified": 1785627969, @@ -1066,6 +1049,24 @@ "type": "github" } }, + "flake-parts_9": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_8" + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1747430042, @@ -1139,24 +1140,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": [ "sdm845", @@ -1570,7 +1553,7 @@ }, "lasuite-docs-proxy": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ] @@ -1640,7 +1623,7 @@ }, "matrixoidc": { "inputs": { - "flake-parts": "flake-parts_6", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nixpkgs" ] @@ -1835,7 +1818,7 @@ }, "nexus": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_8", "nix2flatpak": "nix2flatpak", "nixpkgs": [ "nixpkgs" @@ -1858,7 +1841,7 @@ }, "nexusbot": { "inputs": { - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_9", "nixpkgs": [ "nixpkgs" ] @@ -2131,7 +2114,7 @@ }, "nix2flatpak": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs" }, "locked": { @@ -2401,11 +2384,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1788057806, - "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -2416,11 +2399,11 @@ }, "nixpkgs-lib_4": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1788057806, + "narHash": "sha256-DTQSMxzDWmT0zhguthvegnVkn7CFqGCv4IHCzk5ZUpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "596e2e3940e09b2abbeb03f75fa1828c57fcd72c", "type": "github" }, "original": { @@ -2445,6 +2428,21 @@ } }, "nixpkgs-lib_6": { + "locked": { + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-lib_7": { "locked": { "lastModified": 1785031560, "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", @@ -2459,7 +2457,7 @@ "type": "github" } }, - "nixpkgs-lib_7": { + "nixpkgs-lib_8": { "locked": { "lastModified": 1748740939, "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", @@ -2474,7 +2472,7 @@ "type": "github" } }, - "nixpkgs-lib_8": { + "nixpkgs-lib_9": { "locked": { "lastModified": 1785031560, "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", @@ -2798,7 +2796,7 @@ "disko": "disko", "fht-compositor": "fht-compositor", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "gnome-mobile": "gnome-mobile", "home-manager": "home-manager_2", "lasuite-docs-proxy": "lasuite-docs-proxy", @@ -2912,7 +2910,7 @@ "sable": { "inputs": { "fenix": "fenix_2", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_10", "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" @@ -2949,9 +2947,9 @@ "emacs-overlay": "emacs-overlay", "fenix": "fenix_3", "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_10", + "flake-parts": "flake-parts_11", "flake-schemas": "flake-schemas", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "flake-utils-plus": "flake-utils-plus", "flat-flake": "flat-flake", "git-hooks-nix": "git-hooks-nix", @@ -2998,7 +2996,7 @@ "preservation": "preservation", "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", - "systems": "systems_6", + "systems": "systems_5", "treefmt-nix": "treefmt-nix_5", "weird-deployer": "weird-deployer" }, @@ -3044,13 +3042,13 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_12", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -3102,16 +3100,16 @@ }, "systems_3": { "locked": { - "lastModified": 1776166891, - "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "triplet", - "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "triplet", + "repo": "default", "type": "github" } }, @@ -3146,21 +3144,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -3270,11 +3253,11 @@ ] }, "locked": { - "lastModified": 1784369104, - "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 771e216..7af52fa 100755 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; degoog = { - url = "github:Guusvanmeerveld/degoog.nix"; + url = "github:Henry-Hiles/degoog/quad/feat/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; fht-compositor = {