From be289c7cefcd9d05929f7b4b56f56ceb9bcf6455 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 14:23:14 +0200 Subject: [PATCH 01/28] typo in akkoma config --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 82c34ab..a57d93b 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -73,7 +73,7 @@ in ]; }; ":configurable_from_database" = false; - "frontend_configurations" = { + ":frontend_configurations" = { "pleroma_fe" = { "theme" = "${theme}"; }; From ae1eab6ff337607c9b1209d34196cd7f8eb23053 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 14:25:29 +0200 Subject: [PATCH 02/28] fix akkoma depreciation notice --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index a57d93b..c37b796 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -67,7 +67,7 @@ in base_url = "https://blurb.rougebordeaux.xyz/media"; link_name = true; filters = map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Upload.Filter.Exiftool" + "Pleroma.Upload.Filter.Exiftool.StripMetadata" "Pleroma.Upload.Filter.Dedupe" "Pleroma.Upload.Filter.AnonymizeFilename" ]; From 41e9161fce0952b52c8e4b82b6cb1b589433b29d Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 14:26:51 +0200 Subject: [PATCH 03/28] caddy shouldnt handle https on this vm --- hosts/sisyphe/features/services/akkoma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index c37b796..fb14711 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -81,7 +81,7 @@ in }; }; - services.caddy.virtualHosts."${pleromaUrl}".extraConfig = '' + services.caddy.virtualHosts."http://${pleromaUrl}".extraConfig = '' log { output file /var/log/caddy/akkoma.log } @@ -90,7 +90,7 @@ in reverse_proxy 127.0.0.1:4000 ''; - services.caddy.virtualHosts."${pleromaMediaUrl}".extraConfig = '' + services.caddy.virtualHosts."http://${pleromaMediaUrl}".extraConfig = '' log { output file /var/log/caddy/akkoma_media.log } From 1b61750dcf080ba6d77193c2cf047f2a55431f39 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:34:11 +0200 Subject: [PATCH 04/28] tried removing out var --- hosts/sisyphe/features/services/akkoma.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index fb14711..73b5c85 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -28,12 +28,11 @@ let ''; akkoma-overlay = self: super: { akkoma = super.akkoma.overrideAttrs (old: { - postPatch = '' - mkdir -p $out/priv/static/themes + postPatch = old.postPatch ++ '' - cp ${themeSrc} $out/priv/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/priv/static/themes - cp ${tosFile} $out/priv/static/terms-of-service.html + cp ${themeSrc} priv/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} priv/static/themes + cp ${tosFile} priv/static/terms-of-service.html ''; buildInputs = old.buildInputs ++ [ From 16d00b902b6dc797d5ea1bd9ce407323c738f31a Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:36:34 +0200 Subject: [PATCH 05/28] disabled nextcloud for the moment --- hosts/sisyphe/features/fail2ban.nix | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/hosts/sisyphe/features/fail2ban.nix b/hosts/sisyphe/features/fail2ban.nix index 4e7a599..48bd774 100644 --- a/hosts/sisyphe/features/fail2ban.nix +++ b/hosts/sisyphe/features/fail2ban.nix @@ -5,24 +5,28 @@ ignoreIP = [ "192.168.1.0/24" ]; extraPackages = [ ]; jails = { - nextcloud = '' - enabled = true; - filter = nextcloud - port = http,https - ''; - }; + /* + nextcloud = '' + enabled = true; + filter = nextcloud + port = http,https + ''; + */ + }; }; environment.etc = { + /* "fail2ban/filter.d/nextcloud.conf".text = '' - [Definition] - _groupsre = (?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*) - datepattern = ,?\s*"time"\s*:\s*"%%Y-%%m-%%d[T ]%%H:%%M:%%S(%%z)?" - failregex = ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Login failed: - ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Trusted domain error. - ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Two-factor challenge failed: - journalmatch = _SYSTEMD_UNIT=phpfpm-nextcloud.service - ''; - }; + [Definition] + _groupsre = (?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*) + datepattern = ,?\s*"time"\s*:\s*"%%Y-%%m-%%d[T ]%%H:%%M:%%S(%%z)?" + failregex = ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Login failed: + ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Trusted domain error. + ^[^{]*\{%(_groupsre)s,?\s*"remoteAddr":""%(_groupsre)s,?\s*"message":"Two-factor challenge failed: + journalmatch = _SYSTEMD_UNIT=phpfpm-nextcloud.service + ''; + */ + }; } From d9db3909c081d0df9c8f51a666d9f38e161c17d1 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:36:40 +0200 Subject: [PATCH 06/28] fixed not a list --- hosts/sisyphe/features/services/akkoma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 73b5c85..376624a 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -28,8 +28,8 @@ let ''; akkoma-overlay = self: super: { akkoma = super.akkoma.overrideAttrs (old: { - postPatch = old.postPatch ++ '' - + postPatch = '' + ${old.postPatch} cp ${themeSrc} priv/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} priv/static/themes cp ${tosFile} priv/static/terms-of-service.html From ebdd3dccf56a4c3091ca867737a4cb652496375e Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:41:27 +0200 Subject: [PATCH 07/28] file wont be created --- hosts/sisyphe/features/services/akkoma.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 376624a..63b811b 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -30,6 +30,8 @@ let akkoma = super.akkoma.overrideAttrs (old: { postPatch = '' ${old.postPatch} + + mkdir -p priv/static/themes cp ${themeSrc} priv/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} priv/static/themes cp ${tosFile} priv/static/terms-of-service.html From 4ec94283700f6e3f9d9d6718e44d2fcf92d23e51 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:54:15 +0200 Subject: [PATCH 08/28] tried another path --- hosts/sisyphe/features/services/akkoma.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 63b811b..6aa5a06 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -31,10 +31,10 @@ let postPatch = '' ${old.postPatch} - mkdir -p priv/static/themes - cp ${themeSrc} priv/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} priv/static/themes - cp ${tosFile} priv/static/terms-of-service.html + mkdir -p $out/static/themes + cp ${themeSrc} $out/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${tosFile} $out/static/terms-of-service.html ''; buildInputs = old.buildInputs ++ [ From 710d7f5aea8b485500c450f262cb5a4e589b8fe8 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 17:54:23 +0200 Subject: [PATCH 09/28] added ssh jail --- hosts/sisyphe/features/fail2ban.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/sisyphe/features/fail2ban.nix b/hosts/sisyphe/features/fail2ban.nix index 48bd774..a1ef011 100644 --- a/hosts/sisyphe/features/fail2ban.nix +++ b/hosts/sisyphe/features/fail2ban.nix @@ -13,6 +13,12 @@ ''; */ }; + sshd = '' + enabled = true + port = ssh + logpath = %(sshd_log)s + backend = %(sshd_backend)s + ''; }; environment.etc = { From d22840eb0a14d99fddc6d29493fdff9c5bd3ea1c Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:06:05 +0200 Subject: [PATCH 10/28] akkoma fe is a separate package --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 6aa5a06..de8ff4b 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -27,7 +27,7 @@ let } ''; akkoma-overlay = self: super: { - akkoma = super.akkoma.overrideAttrs (old: { + akkoma-fe = super.akkoma-fe.overrideAttrs (old: { postPatch = '' ${old.postPatch} From 5c4ff80858d2d687bd4cf64cca8134317c0b8bd9 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:07:49 +0200 Subject: [PATCH 11/28] fix no buildInputs set --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index de8ff4b..264d287 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -37,7 +37,7 @@ let cp ${tosFile} $out/static/terms-of-service.html ''; - buildInputs = old.buildInputs ++ [ + buildInputs = [ pkgs.curl ]; }); From b7cedb79339c74b22f6ef0b3ae91f971f6e39296 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:18:29 +0200 Subject: [PATCH 12/28] changed path --- hosts/sisyphe/features/services/akkoma.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 264d287..33bf3d0 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -31,15 +31,11 @@ let postPatch = '' ${old.postPatch} - mkdir -p $out/static/themes - cp ${themeSrc} $out/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/static/themes - cp ${tosFile} $out/static/terms-of-service.html + cp ${themeSrc} $out/dist/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/dist/static/themes + cp ${tosFile} $out/dist/static/terms-of-service.html ''; - buildInputs = [ - pkgs.curl - ]; }); }; in From 7f485371d4f83b046a141aa2a081f6c36e9b1393 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:22:15 +0200 Subject: [PATCH 13/28] fixed path again --- hosts/sisyphe/features/services/akkoma.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 33bf3d0..6a476eb 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -31,9 +31,9 @@ let postPatch = '' ${old.postPatch} - cp ${themeSrc} $out/dist/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/dist/static/themes - cp ${tosFile} $out/dist/static/terms-of-service.html + cp ${themeSrc} $out/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${tosFile} $out/static/terms-of-service.html ''; }); From c2de3f7cffe2999f7b0a6830a8fb2a77dce26879 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:25:02 +0200 Subject: [PATCH 14/28] try with postInstall --- hosts/sisyphe/features/services/akkoma.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 6a476eb..89e1558 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -28,8 +28,8 @@ let ''; akkoma-overlay = self: super: { akkoma-fe = super.akkoma-fe.overrideAttrs (old: { - postPatch = '' - ${old.postPatch} + postInstall = '' + ${old.postInstall} cp ${themeSrc} $out/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} $out/static/themes From 194e9fd7a7cc19ef048e545da3ac5429519cf239 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:26:14 +0200 Subject: [PATCH 15/28] theres no postInstall --- hosts/sisyphe/features/services/akkoma.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 89e1558..96c2714 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -29,8 +29,6 @@ let akkoma-overlay = self: super: { akkoma-fe = super.akkoma-fe.overrideAttrs (old: { postInstall = '' - ${old.postInstall} - cp ${themeSrc} $out/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} $out/static/themes cp ${tosFile} $out/static/terms-of-service.html From 08505b39332589c743bc070b4ca2ba1119248e41 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 18:54:19 +0200 Subject: [PATCH 16/28] added dist file --- hosts/sisyphe/features/services/akkoma.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 96c2714..a1bf7a2 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -29,9 +29,9 @@ let akkoma-overlay = self: super: { akkoma-fe = super.akkoma-fe.overrideAttrs (old: { postInstall = '' - cp ${themeSrc} $out/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/static/themes - cp ${tosFile} $out/static/terms-of-service.html + cp ${themeSrc} $out/dist/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/dist/static/themes + cp ${tosFile} $out/dist/static/terms-of-service.html ''; }); From bf56f1957468e104aab41ee8b00a6db0c2a05499 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:03:04 +0200 Subject: [PATCH 17/28] dist does not exists --- hosts/sisyphe/features/services/akkoma.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index a1bf7a2..96c2714 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -29,9 +29,9 @@ let akkoma-overlay = self: super: { akkoma-fe = super.akkoma-fe.overrideAttrs (old: { postInstall = '' - cp ${themeSrc} $out/dist/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/dist/static/themes - cp ${tosFile} $out/dist/static/terms-of-service.html + cp ${themeSrc} $out/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${tosFile} $out/static/terms-of-service.html ''; }); From 7bd0e4459e7dbb9fe99586428f0002c3c7aad0bd Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:11:38 +0200 Subject: [PATCH 18/28] why did i tried to use an overlay --- hosts/sisyphe/features/services/akkoma.nix | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 96c2714..5aef9bd 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -26,19 +26,8 @@ let "${theme}": "/static/themes/${theme}.json" } ''; - akkoma-overlay = self: super: { - akkoma-fe = super.akkoma-fe.overrideAttrs (old: { - postInstall = '' - cp ${themeSrc} $out/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/static/themes - cp ${tosFile} $out/static/terms-of-service.html - ''; - - }); - }; in { - nixpkgs.overlays = [ akkoma-overlay ]; services.akkoma.enable = true; services.akkoma.initDb.enable = true; services.akkoma.config = { @@ -75,6 +64,19 @@ in }; }; }; + services.akkoma.frontends.primary.package = + pkgs.runCommand "akkoma-fe" + { + + } + '' + mkdir $out + lndir ${pkgs.akkoma-frontends.akkoma-fe} $out + + cp ${themeSrc} $out/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${tosFile} $out/static/terms-of-service.html + ''; services.caddy.virtualHosts."http://${pleromaUrl}".extraConfig = '' log { From 43843a39e21391bf1d1f4a90e3751edbe9fe6f36 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:15:30 +0200 Subject: [PATCH 19/28] missing name for frontend --- hosts/sisyphe/features/services/akkoma.nix | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 5aef9bd..55a24ac 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -64,19 +64,22 @@ in }; }; }; - services.akkoma.frontends.primary.package = - pkgs.runCommand "akkoma-fe" - { + services.akkoma.frontends.akkoma-fe = { + name = "akkoma-fe"; + package = + pkgs.runCommand "akkoma-fe" + { - } - '' - mkdir $out - lndir ${pkgs.akkoma-frontends.akkoma-fe} $out + } + '' + mkdir $out + lndir ${pkgs.akkoma-frontends.akkoma-fe} $out - cp ${themeSrc} $out/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/static/themes - cp ${tosFile} $out/static/terms-of-service.html - ''; + cp ${themeSrc} $out/static/themes/${theme}.json + cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${tosFile} $out/static/terms-of-service.html + ''; + }; services.caddy.virtualHosts."http://${pleromaUrl}".extraConfig = '' log { From 3c2662e5fce884c6f744292306eefdc61b5e6580 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:16:34 +0200 Subject: [PATCH 20/28] added missing ref --- hosts/sisyphe/features/services/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 55a24ac..03d6ede 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -66,6 +66,7 @@ in }; services.akkoma.frontends.akkoma-fe = { name = "akkoma-fe"; + ref = "stable"; package = pkgs.runCommand "akkoma-fe" { From f5fa3790a8dbf155e4087f68efcce30581ee3ca5 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:18:15 +0200 Subject: [PATCH 21/28] added missing library --- hosts/sisyphe/features/services/akkoma.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 03d6ede..753655b 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -70,7 +70,12 @@ in package = pkgs.runCommand "akkoma-fe" { + config = { + nativeBuildInputs = with pkgs; [ + xorg.lndir + ]; + }; } '' mkdir $out From 350a8bb4fded7bdec81ca85acb76863b84d6fbfd Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:18:35 +0200 Subject: [PATCH 22/28] fixed depreciation warning --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 753655b..8d8ce24 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -79,7 +79,7 @@ in } '' mkdir $out - lndir ${pkgs.akkoma-frontends.akkoma-fe} $out + lndir ${pkgs.akkoma-fe.akkoma-fe} $out cp ${themeSrc} $out/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} $out/static/themes From 7b45af25f18cbb24a9be3a37bee2a7b0781fdb4c Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:19:28 +0200 Subject: [PATCH 23/28] remove duplicated thing --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 8d8ce24..4aac0e6 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -79,7 +79,7 @@ in } '' mkdir $out - lndir ${pkgs.akkoma-fe.akkoma-fe} $out + lndir ${pkgs.akkoma-fe} $out cp ${themeSrc} $out/static/themes/${theme}.json cp ${pkgs.writeText "styles.json" styles} $out/static/themes From daad8bfe1876457675c58032c42434d5c79956c3 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:20:27 +0200 Subject: [PATCH 24/28] fix the place of the thing --- hosts/sisyphe/features/services/akkoma.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 4aac0e6..0b885fd 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -70,12 +70,9 @@ in package = pkgs.runCommand "akkoma-fe" { - config = { - nativeBuildInputs = with pkgs; [ - xorg.lndir - ]; - - }; + nativeBuildInputs = with pkgs; [ + xorg.lndir + ]; } '' mkdir $out From c396982ef390b7213eaaab6c6021e33dd2e5ef3c Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:29:45 +0200 Subject: [PATCH 25/28] moved correctly the thing --- hosts/sisyphe/features/services/akkoma.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 0b885fd..cd6041f 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -79,7 +79,8 @@ in lndir ${pkgs.akkoma-fe} $out cp ${themeSrc} $out/static/themes/${theme}.json - cp ${pkgs.writeText "styles.json" styles} $out/static/themes + cp ${pkgs.writeText "styles.json" styles} $out/static/styles.json + rm $out/static/terms-of-service.html cp ${tosFile} $out/static/terms-of-service.html ''; }; From 3b5a637ec4a57f7b28ecffb211836ba779faf6d2 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:31:57 +0200 Subject: [PATCH 26/28] does it work if i rm things? --- hosts/sisyphe/features/services/akkoma.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index cd6041f..9c8da07 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -79,6 +79,7 @@ in lndir ${pkgs.akkoma-fe} $out cp ${themeSrc} $out/static/themes/${theme}.json + rm $out/static/styles.json cp ${pkgs.writeText "styles.json" styles} $out/static/styles.json rm $out/static/terms-of-service.html cp ${tosFile} $out/static/terms-of-service.html From 4a818aa7786756848c3e39c06a53e5a0402fc57c Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:33:24 +0200 Subject: [PATCH 27/28] fix wrong naming --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index 9c8da07..a0402e9 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -64,7 +64,7 @@ in }; }; }; - services.akkoma.frontends.akkoma-fe = { + services.akkoma.frontends.primary = { name = "akkoma-fe"; ref = "stable"; package = From 72e0ccf47113b41a36e673615bbf25aa8d0ec758 Mon Sep 17 00:00:00 2001 From: kity Date: Thu, 7 Aug 2025 19:38:28 +0200 Subject: [PATCH 28/28] matched name to fe config --- hosts/sisyphe/features/services/akkoma.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index a0402e9..4bc91df 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -58,7 +58,7 @@ in }; ":configurable_from_database" = false; ":frontend_configurations" = { - "pleroma_fe" = { + "primary" = { "theme" = "${theme}"; }; };