diff options
| -rw-r--r-- | modules/server/spectrum/cgit/default.nix | 5 | ||||
| -rw-r--r-- | sys/atuin.nix | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/modules/server/spectrum/cgit/default.nix b/modules/server/spectrum/cgit/default.nix index 7d7573c3e1cd..f6df47872789 100644 --- a/modules/server/spectrum/cgit/default.nix +++ b/modules/server/spectrum/cgit/default.nix @@ -23,7 +23,7 @@ let } '' mkdir -p $out/bin sed s/pastie/friendly/g >$out/bin/syntax-highlighting.py \ - <${pkgs.cgit}/lib/cgit/filters/.syntax-highlighting.py-wrapped + <${pkgs.cgit-pink}/lib/cgit/filters/.syntax-highlighting.py-wrapped chmod +x $out/bin/syntax-highlighting.py wrapPythonPrograms ''; @@ -33,6 +33,7 @@ in imports = [ ../../cgit ]; services.cgit.instances.spectrum = { + package = pkgs.cgit-pink; vhost = "spectrum-os.org"; path = "/git"; config = pkgs.writeText "cgit.conf" '' @@ -51,7 +52,7 @@ in root-readme=${spectrumReadme} root-title=Spectrum Git Repository Browser snapshots=all - about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh + about-filter=${pkgs.cgit-pink}/lib/cgit/filters/about-formatting.sh source-filter=${sourceFilter}/bin/syntax-highlighting.py scan-path=/home/spectrum/git diff --git a/sys/atuin.nix b/sys/atuin.nix index 0512f6576a00..079a45e89794 100644 --- a/sys/atuin.nix +++ b/sys/atuin.nix @@ -112,7 +112,7 @@ let ''; passAsFile = [ "licenseHeader" "extraCss" ]; } '' - cat $licenseHeaderPath ${pkgs.cgit}/cgit/cgit.css $extraCssPath > $out + cat $licenseHeaderPath ${pkgs.cgit-pink}/cgit/cgit.css $extraCssPath > $out ''; in @@ -222,7 +222,9 @@ in users.groups.acme.members = [ "nginx" ]; users.users.qyliss.home = "/home/qyliss"; + services.cgit.instances.qyliss = { + package = pkgs.cgit-pink; vhost = "git.qyliss.net"; config = pkgs.writeText "cgit.conf" '' clone-prefix=https://git.qyliss.net @@ -237,8 +239,8 @@ in root-desc=Alyssa Ross's personal Git repositories root-title=git.qyliss.net snapshots=all - about-filter=${pkgs.cgit}/lib/cgit/filters/about-formatting.sh - source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py + about-filter=${pkgs.cgit-pink}/lib/cgit/filters/about-formatting.sh + source-filter=${pkgs.cgit-pink}/lib/cgit/filters/syntax-highlighting.py virtual-root=/ scan-path=/home/qyliss/git @@ -291,7 +293,7 @@ in install -g spectrum -m 0775 -d /home/spectrum/git ''; - environment.systemPackages = with pkgs; [ cgit git ]; + environment.systemPackages = with pkgs; [ cgit-pink git ]; services.tor.settings.AccountingMax = "50 GBytes"; services.tor.settings.AccountingStart = "day 12:00"; |