From 9cbb3b1f37fb7fa891689dbbffe61ac6a03e5a44 Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 14 Dec 2024 21:59:10 +0100 Subject: [PATCH 1/3] Update mastodon to 4.3.2 --- config/hosts/mastodon/mastodon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index ed168ff..43bca3e 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -11,14 +11,14 @@ let }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.1"; + version = "4.3.2"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; + sha256 = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg="; }; installPhase = '' cp -r ./ $out/ From cfec34b2926907397c9bfad49ba102c87b42003d Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 14 Dec 2024 22:34:28 +0100 Subject: [PATCH 2/3] Add mastodon-modern theme --- config/hosts/mastodon/mastodon.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 43bca3e..18c25e0 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -5,6 +5,11 @@ let rev = "v2.2"; hash = "sha256-KyXDnpZh1DrY59jvdU42UicgBVvEGtvAGeU1mNxJauQ="; }; + mastodonModern = pkgs.fetchgit { + url = "https://git.gay/freeplay/Mastodon-Modern.git"; + rev = "e9e53496789234d5782b5b3d97ed66a130b1678a"; + hash = "sha256-lUq57Gbr1UCMVGoO4xTT3wYPNwohdepxSPCX+WP6AS8="; + }; mastodonNekoversePatches = pkgs.fetchgit { url = "https://github.com/yuri-qq/nekoverse-mastodon-patches.git"; hash = "sha256-3jWbKll5RGB1vfEmONVivzGYcoONEkBEHh/rOt9LXlU="; @@ -23,10 +28,14 @@ let installPhase = '' cp -r ./ $out/ cp -r ${tangerineUI}/mastodon/app/javascript/styles/* $out/app/javascript/styles/ + echo "@import 'mastodon/variables'; + @import 'application';" >> $out/app/javascript/styles/modern-dark.scss + cat ${mastodonModern}/modern.css >> $out/app/javascript/styles/modern-dark.scss echo "tangerineui: styles/tangerineui.scss tangerineui-purple: styles/tangerineui-purple.scss tangerineui-cherry: styles/tangerineui-cherry.scss - tangerineui-lagoon: styles/tangerineui-lagoon.scss" >> $out/config/themes.yml + tangerineui-lagoon: styles/tangerineui-lagoon.scss + modern-dark: styles/modern-dark.scss" >> $out/config/themes.yml ''; }; patches = [ From 36491b8e1727817691a51983d6ec52ebe94446ab Mon Sep 17 00:00:00 2001 From: fi Date: Sat, 14 Dec 2024 22:56:30 +0100 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/098e8b6ff72c86944a8d54b64ddd7b7e6635830a?narHash=sha256-/MNhZLR0eh9z/d3l%2Bammq%2BF5XxHln0RHgO4Bhtjr0IM%3D' (2024-11-25) → 'github:nix-community/nixos-generators/d162ffdf0a30f3d19e67df5091d6744ab8b9229f?narHash=sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM%3D' (2024-12-12) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/87b6978992e2eb605732fba842cad0a7e14b2047?narHash=sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck%3D' (2024-11-24) → 'github:nix-community/nixpkgs.lib/f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b?narHash=sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s%3D' (2024-12-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/809802e9ab4b56e7a3db576832e95e3f7b74781a?narHash=sha256-RvyWCxT6O9ugSqSXHAMaFTIZtKS7SBHdUHKLoPW1/xg%3D' (2024-11-30) → 'github:NixOS/nixpkgs/8e21c38b7d24eadf3ef672a65a1cc927015d2197?narHash=sha256-x5OW9e2w1y/7UKvZK0m9vXddociX9cF1F1Cg9/uA/Ts%3D' (2024-12-13) • Updated input 'nixpkgs-master': 'github:NixOS/nixpkgs/33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9?narHash=sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q%3D' (2024-11-30) → 'github:NixOS/nixpkgs/5e28b3fe1a979e365d90172558616c08d114d753?narHash=sha256-tWCGLhWSc3BqDrQIapnpU8JCW228NrZeVHzJbEAoJN0%3D' (2024-12-14) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/57feb2a16f705eeffb075888d92a986e66473012?narHash=sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM%2B7/E%3D' (2024-11-30) → 'github:NixOS/nixpkgs/119bb2941c87b630c56b5e36b9ed63e3daa0e2d3?narHash=sha256-I8cMXXWtf/%2B3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4%3D' (2024-12-14) --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 7f16841..7e5177b 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixlib": { "locked": { - "lastModified": 1732410305, - "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", + "lastModified": 1733620091, + "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", + "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1732496924, - "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", + "lastModified": 1733965598, + "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", + "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732954812, - "narHash": "sha256-RvyWCxT6O9ugSqSXHAMaFTIZtKS7SBHdUHKLoPW1/xg=", + "lastModified": 1734078800, + "narHash": "sha256-x5OW9e2w1y/7UKvZK0m9vXddociX9cF1F1Cg9/uA/Ts=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "809802e9ab4b56e7a3db576832e95e3f7b74781a", + "rev": "8e21c38b7d24eadf3ef672a65a1cc927015d2197", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1732997066, - "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", + "lastModified": 1734212916, + "narHash": "sha256-tWCGLhWSc3BqDrQIapnpU8JCW228NrZeVHzJbEAoJN0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", + "rev": "5e28b3fe1a979e365d90172558616c08d114d753", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732951447, - "narHash": "sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM+7/E=", + "lastModified": 1734187240, + "narHash": "sha256-I8cMXXWtf/+3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57feb2a16f705eeffb075888d92a986e66473012", + "rev": "119bb2941c87b630c56b5e36b9ed63e3daa0e2d3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bd9834f..e5a6b25 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ inherit nixpkgs-unstable nixpkgs-master hosts simple-nixos-mailserver; # Provide environment for secret key command - keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ]; + keyCommandEnv = [ "env" "GNUPGHOME=/home/fi/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/fi/pass/infra" ]; }; }; } // builtins.mapAttrs (helper.generateColmenaHost) hosts;