diff --git a/config/hosts/mastodon/mastodon.nix b/config/hosts/mastodon/mastodon.nix index 18c25e0..ed168ff 100644 --- a/config/hosts/mastodon/mastodon.nix +++ b/config/hosts/mastodon/mastodon.nix @@ -5,37 +5,28 @@ 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="; }; mastodonNekoverseOverlay = final: prev: { mastodon = (prev.mastodon.override rec { - version = "4.3.2"; + version = "4.3.1"; srcOverride = final.applyPatches { src = pkgs.stdenv.mkDerivation { name = "mastodonWithThemes"; src = pkgs.fetchgit { url = "https://github.com/mastodon/mastodon.git"; rev = "v${version}"; - sha256 = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg="; + sha256 = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4="; }; 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 - modern-dark: styles/modern-dark.scss" >> $out/config/themes.yml + tangerineui-lagoon: styles/tangerineui-lagoon.scss" >> $out/config/themes.yml ''; }; patches = [ diff --git a/flake.lock b/flake.lock index 7e5177b..7f16841 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ }, "nixlib": { "locked": { - "lastModified": 1733620091, - "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", + "lastModified": 1732410305, + "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", + "rev": "87b6978992e2eb605732fba842cad0a7e14b2047", "type": "github" }, "original": { @@ -55,11 +55,11 @@ ] }, "locked": { - "lastModified": 1733965598, - "narHash": "sha256-0tlZU8xfQGPcBOdXZee7P3vJLyPjTrXw7WbIgXD34gM=", + "lastModified": 1732496924, + "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d162ffdf0a30f3d19e67df5091d6744ab8b9229f", + "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734078800, - "narHash": "sha256-x5OW9e2w1y/7UKvZK0m9vXddociX9cF1F1Cg9/uA/Ts=", + "lastModified": 1732954812, + "narHash": "sha256-RvyWCxT6O9ugSqSXHAMaFTIZtKS7SBHdUHKLoPW1/xg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e21c38b7d24eadf3ef672a65a1cc927015d2197", + "rev": "809802e9ab4b56e7a3db576832e95e3f7b74781a", "type": "github" }, "original": { @@ -101,11 +101,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1734212916, - "narHash": "sha256-tWCGLhWSc3BqDrQIapnpU8JCW228NrZeVHzJbEAoJN0=", + "lastModified": 1732997066, + "narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e28b3fe1a979e365d90172558616c08d114d753", + "rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9", "type": "github" }, "original": { @@ -117,11 +117,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734187240, - "narHash": "sha256-I8cMXXWtf/+3DJT3QGm9BAp/b1oOCdKfgvpZ5XAUnp4=", + "lastModified": 1732951447, + "narHash": "sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM+7/E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "119bb2941c87b630c56b5e36b9ed63e3daa0e2d3", + "rev": "57feb2a16f705eeffb075888d92a986e66473012", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e5a6b25..bd9834f 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/fi/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/fi/pass/infra" ]; + keyCommandEnv = [ "env" "GNUPGHOME=/home/yuri/.passinfra_gnupg" "PASSWORD_STORE_DIR=/home/yuri/pass/infra" ]; }; }; } // builtins.mapAttrs (helper.generateColmenaHost) hosts;