summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--chaski/services/radicle.nix71
-rw-r--r--flake.nix3
-rw-r--r--flora/services/akkoma.nix15
-rw-r--r--flora/services/picarones.nix26
-rw-r--r--flora/services/znc.nix43
-rw-r--r--pkgs/crs-tools.nix2
-rw-r--r--pkgs/galmon.nix2
-rw-r--r--pkgs/glitchtip.nix2
-rw-r--r--pkgs/overlay.nix37
-rw-r--r--pkgs/patches/akkoma-fe-toki-pona.patch (renamed from flora/services/akkoma-fe-toki-pona.patch)0
-rw-r--r--pkgs/patches/akkoma-toki-pona.patch (renamed from flora/services/akkoma-toki-pona.patch)0
-rw-r--r--pkgs/patches/cgit-main-instead-of-master.patch (renamed from flora/services/0001-main-instead-of-master-branch.patch)0
-rw-r--r--pkgs/patches/crs-tools-add-lockfile.patch (renamed from pkgs/crs-tools-add-lockfile.patch)0
-rw-r--r--pkgs/patches/galmon-fix-linker.patch (renamed from pkgs/galmon.patch)0
-rw-r--r--pkgs/patches/glitchtip-fix-poetry-name.patch (renamed from pkgs/glitchtip-fix-poetry-name.patch)0
-rw-r--r--pkgs/patches/hikari-gtk4.patch (renamed from pkgs/hikari-gtk4.patch)0
-rw-r--r--pkgs/patches/radicle-remove-curl-script.patch (renamed from pkgs/radicle-remove-curl-script.patch)0
-rw-r--r--pkgs/patches/rustex-cargo.lock (renamed from pkgs/rustex-cargo.lock)0
-rw-r--r--pkgs/radicle.nix2
19 files changed, 36 insertions, 167 deletions
diff --git a/chaski/services/radicle.nix b/chaski/services/radicle.nix
deleted file mode 100644
index 62bb8d1..0000000
--- a/chaski/services/radicle.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-
- networking.firewall.allowedTCPPorts = [ 8776 ];
-
- services.nginx.virtualHosts."node.radicle.stuebinm.eu" = {
- enableACME = true;
- forceSSL = true;
- locations."/".proxyPass = "http://localhost:4444";
- };
-
- services.nginx.virtualHosts."radicle.stuebinm.eu" = {
- enableACME = true;
- forceSSL = true;
- locations."/nodes".tryFiles = "/index.html =404";
- root = pkgs.radicle-interface.override {
- config = {
- nodes = {
- defaultHttpdPort = 443;
- defaultLocalHttpdPort = 8080;
- defaultHttpdScheme = "https";
- defaultNodePort = 8776;
- pinned = [ {
- baseUrl = {
- hostname = "node.radicle.stuebinm.eu";
- port = 443;
- scheme = "https";
- };
- } ];
- };
- reactions = ["👍" "👎" "😄" "🎉" "🙁" "🚀" "👀"];
- projects.pinned = [ {
- name = "bahnhof.name";
- id = "rad:z3R2BH43TcvaMQgtk6bKHxzqfNP2W";
- baseUrl = {
- hostname = "node.radicle.stuebinm.eu";
- port = 443;
- scheme = "https";
- };
- } ];
- };
- };
- };
-
- systemd.services.radicle-httpd = {
- enable = true;
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- Type = "simple";
- Restart = "always";
- MemoryMax = "1G";
- User = "radicle";
- Group = "radicle";
- };
- environment.RAD_HOME = "/var/lib/radicle";
- path = [ pkgs.heartwood pkgs.gitMinimal ];
- script = ''
- cd /var/lib/radicle
- radicle-httpd --listen 0.0.0.0:4444;
- '';
- };
-
- users.users.radicle = {
- group = "radicle";
- isSystemUser = true;
- };
- users.groups.radicle = {};
-
- environment.systemPackages = [ pkgs.heartwood ];
-}
diff --git a/flake.nix b/flake.nix
index 371d0ea..2ba2802 100644
--- a/flake.nix
+++ b/flake.nix
@@ -95,7 +95,6 @@
flora = mkServer ./flora/configuration.nix;
abbenay = mkDesktop ./abbenay/configuration.nix;
cyberbox = mkDesktop ./cyberbox/configuration.nix;
- surltesh-echer = mkDesktop ./surltesh-echer/configuration.nix;
ilex = mkDesktop ./ilex/configuration.nix;
};
@@ -138,7 +137,7 @@
import ./pkgs/overlay.nix { inherit inputs; } final prev;
packages.x86_64-linux = {
inherit (nixpkgs)
- galmon-core galmon-full glitchtip typst almanac rustex
+ galmon-core galmon-full almanac rustex
kijetesantakaluotokieni showrt isabelle-utils isabat
travelynx crs-tracker crs-php bahnhof-name matrix-to
hikari_unstable heartwood radicle-interface radicle-tui
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index 5a2c8f3..756f2a7 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -26,11 +26,12 @@ in
isReadOnly = true;
};
- config = {pkgs, config, ...}: {
+ config = {config, ...}: {
# generating the manual will fail when mixing nixos channels,
# so disable it here or this won't build at all.
documentation.enable = false;
+ nixpkgs.pkgs = pkgs;
system.stateVersion = "22.11";
@@ -39,9 +40,7 @@ in
frontends = {
primary = {
- package = pkgs.akkoma-frontends.akkoma-fe.overrideAttrs (old: {
- patches = [ ./akkoma-fe-toki-pona.patch ];
- });
+ package = pkgs.akkoma-fe;
name = "pleroma-fe";
ref = "stable";
};
@@ -52,10 +51,6 @@ in
};
};
- package = pkgs.akkoma.overrideAttrs (old: {
- patches = [ ./akkoma-toki-pona.patch ];
- });
-
extraStatic."static/terms-of-service.html" = pkgs.writeText "terms-of-service-html" ''
<p>toki!</p>
<p>lawa kepeken pi tomo akkoma ni li lili: sina li mi la, sina ken kepeken e tomo ni.</p>
@@ -81,6 +76,10 @@ in
description = "a test instance";
email = "dings@dings";
};
+ ":restrict_unauthenticated" = {
+ timelines = true;
+ activities = true;
+ };
":media_proxy" = {
enabled = false;
redirect_on_failure = true;
diff --git a/flora/services/picarones.nix b/flora/services/picarones.nix
deleted file mode 100644
index c2e3c7b..0000000
--- a/flora/services/picarones.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{config, pkgs, ...}:
-let
- source = builtins.fetchGit {
- url = "https://stuebinm.eu/git/picarones/";
- rev = "0596b9f6c561daa67945adb81570efd30650dffd";
- };
-in
-{
-
- imports = [ source.outPath ];
-
- services.picarones = {
- enable = true;
- frontend = {
- enable = true;
- domain = "picarones.stuebinm.eu";
- proxyBackend = true;
- config = {
- enableACME = true;
- forceSSL = true;
- };
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 80 443 ];
-}
diff --git a/flora/services/znc.nix b/flora/services/znc.nix
deleted file mode 100644
index e81bc65..0000000
--- a/flora/services/znc.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
- services.znc = {
- enable = true;
- mutable = false;
- useLegacyConfig = false;
- openFirewall = true;
-
- config = {
- LoadModule = [ "adminlog" "webadmin" ];
- Listener.l = {
- IPv4 = true;
- IPv6 = false;
- AllowIRC = true;
- AllowWeb = true;
- Port = 12345;
- SSL = true;
- };
- User.stuebinm = {
- Admin = true;
- BindHost = "0.0.0.0";
- LoadModule = [ "chansaver" "controlpanel" "sasl" ];
- QuitMsg = "fell into a looping fixpoint operator";
- RealName = "stuebinm";
- Pass.password = {
- Method = "sha256";
- Hash = "a0dd4be1f8959dc9c775a76779bfb8fab52e43b89bad24d85bdc28caa3499710";
- Salt = "eNT_:x1SgMvQNJAW0J!Q";
- };
- Network.libera = {
- IRCConnectEnabled = true;
- LoadModule = [ "simple_away" "sasl" ];
- Server = [ "irc.libera.chat +6697" ];
- TrustAllCerts = false;
- TrustPKI = true;
- };
- };
- };
- };
-
- networking.firewall.allowedTCPPorts = [ 12345 ];
-}
diff --git a/pkgs/crs-tools.nix b/pkgs/crs-tools.nix
index 4993b53..07032b8 100644
--- a/pkgs/crs-tools.nix
+++ b/pkgs/crs-tools.nix
@@ -27,7 +27,7 @@ rec {
};
patches = [
- ./crs-tools-add-lockfile.patch
+ ./patches/crs-tools-add-lockfile.patch
];
buildInputs = [ php php.packages.composer ];
diff --git a/pkgs/galmon.nix b/pkgs/galmon.nix
index 9331e37..be6b89e 100644
--- a/pkgs/galmon.nix
+++ b/pkgs/galmon.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
- patches = [ ./galmon.patch ];
+ patches = [ ./patches/galmon-fix-linker.patch ];
buildInputs = [
protobuf pkg-config h2o openssl eigen ncurses5 zstd zlib curl gitMinimal abseil-cpp
diff --git a/pkgs/glitchtip.nix b/pkgs/glitchtip.nix
index dcecd0e..cdd832a 100644
--- a/pkgs/glitchtip.nix
+++ b/pkgs/glitchtip.nix
@@ -18,7 +18,7 @@ let
projectDir = src;
patches = [
- ./glitchtip-fix-poetry-name.patch
+ ./patches/glitchtip-fix-poetry-name.patch
];
# a bunch of python packages seem to misdeclare their dependencies
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index f38e7e0..ae1741b 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -12,12 +12,11 @@ let
in
{
beamPackages = super.beam.packagesWith self.erlang;
- elixir = self.beamPackages.elixir_1_14;
+ elixir = self.beamPackages.elixir;
erlang = super.erlang_nox;
inherit (unstable) lean4;
-
#### packages which are actually in use somewhere ####
galmon-core = self.callPackage ./galmon.nix {};
@@ -25,7 +24,19 @@ in
hikari = super.hikari.overrideAttrs (old: {
makeFlags = old.makeFlags ++ [ "DEBUG=YES" ];
- patches = [ ./hikari-gtk4.patch ];
+ patches = [ ./patches/hikari-gtk4.patch ];
+ });
+
+ akkoma-fe = super.akkoma-frontends.akkoma-fe.overrideAttrs (old: {
+ patches = [ ./patches/akkoma-fe-toki-pona.patch ];
+ });
+
+ akkoma = super.akkoma.overrideAttrs (old: {
+ patches = [ ./patches/akkoma-toki-pona.patch ];
+ });
+
+ cgit = super.cgit.overrideAttrs (old: {
+ patches = [ ./patches/cgit-main-instead-of-master.patch ];
});
almanac = self.rustPlatform.buildRustPackage rec {
@@ -44,11 +55,10 @@ in
rev = "74f9d13d4a88e32a32c5d8b10e5ae1a2442a7a92";
sha256 = "sha256-SOnqb/ptMoPI+G96nI/dQHOsvjlaDa6YSBEjy77kRdY=";
}}/rustex";
- # patches = [ ./rustex.patch ];
postPatch = ''
- ln -s ${./rustex-cargo.lock} Cargo.lock
+ ln -s ${./patches/rustex-cargo.lock} Cargo.lock
'';
- cargoLock.lockFile = ./rustex-cargo.lock;
+ cargoLock.lockFile = ./patches/rustex-cargo.lock;
doCheck = false;
};
@@ -146,13 +156,14 @@ in
});
});
- glitchtip = (self.callPackage ./glitchtip.nix {
- python = super.python310.override ({
- packageOverrides = self: super: {
- django = super.django_4;
- };
- });
- });
+ # currently broken because poetry2nix was moved out of nixpkgs
+ # glitchtip = (self.callPackage ./glitchtip.nix {
+ # python = super.python310.override ({
+ # packageOverrides = self: super: {
+ # django = super.django_4;
+ # };
+ # });
+ # });
crs-tracker = crs-tools.tracker;
crs-php = crs-tools.php;
diff --git a/flora/services/akkoma-fe-toki-pona.patch b/pkgs/patches/akkoma-fe-toki-pona.patch
index 281fdfc..281fdfc 100644
--- a/flora/services/akkoma-fe-toki-pona.patch
+++ b/pkgs/patches/akkoma-fe-toki-pona.patch
diff --git a/flora/services/akkoma-toki-pona.patch b/pkgs/patches/akkoma-toki-pona.patch
index 4cff3fa..4cff3fa 100644
--- a/flora/services/akkoma-toki-pona.patch
+++ b/pkgs/patches/akkoma-toki-pona.patch
diff --git a/flora/services/0001-main-instead-of-master-branch.patch b/pkgs/patches/cgit-main-instead-of-master.patch
index 21f6b00..21f6b00 100644
--- a/flora/services/0001-main-instead-of-master-branch.patch
+++ b/pkgs/patches/cgit-main-instead-of-master.patch
diff --git a/pkgs/crs-tools-add-lockfile.patch b/pkgs/patches/crs-tools-add-lockfile.patch
index a8cd3ce..a8cd3ce 100644
--- a/pkgs/crs-tools-add-lockfile.patch
+++ b/pkgs/patches/crs-tools-add-lockfile.patch
diff --git a/pkgs/galmon.patch b/pkgs/patches/galmon-fix-linker.patch
index f53c504..f53c504 100644
--- a/pkgs/galmon.patch
+++ b/pkgs/patches/galmon-fix-linker.patch
diff --git a/pkgs/glitchtip-fix-poetry-name.patch b/pkgs/patches/glitchtip-fix-poetry-name.patch
index 9cc82bd..9cc82bd 100644
--- a/pkgs/glitchtip-fix-poetry-name.patch
+++ b/pkgs/patches/glitchtip-fix-poetry-name.patch
diff --git a/pkgs/hikari-gtk4.patch b/pkgs/patches/hikari-gtk4.patch
index 68d8cf1..68d8cf1 100644
--- a/pkgs/hikari-gtk4.patch
+++ b/pkgs/patches/hikari-gtk4.patch
diff --git a/pkgs/radicle-remove-curl-script.patch b/pkgs/patches/radicle-remove-curl-script.patch
index ea8905d..ea8905d 100644
--- a/pkgs/radicle-remove-curl-script.patch
+++ b/pkgs/patches/radicle-remove-curl-script.patch
diff --git a/pkgs/rustex-cargo.lock b/pkgs/patches/rustex-cargo.lock
index c26343b..c26343b 100644
--- a/pkgs/rustex-cargo.lock
+++ b/pkgs/patches/rustex-cargo.lock
diff --git a/pkgs/radicle.nix b/pkgs/radicle.nix
index ff2ed8b..6a3ad9d 100644
--- a/pkgs/radicle.nix
+++ b/pkgs/radicle.nix
@@ -8,7 +8,7 @@
hash = "sha256-bdXsK01mLrz4g8rVlMQfZDB+p7ldMIsTJP7jfGeobkM=";
};
- patches = [ ./radicle-remove-curl-script.patch ];
+ patches = [ ./patches/radicle-remove-curl-script.patch ];
postPatch = ''
patchShebangs scripts/*
${if config == null then "" else ''
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:11:51 +0000