update mastodon
This commit is contained in:
parent
4c13bbc4e6
commit
042b2e9664
9 changed files with 130 additions and 132 deletions
10
flake.lock
10
flake.lock
|
@ -359,11 +359,11 @@
|
||||||
"wlroots": "wlroots"
|
"wlroots": "wlroots"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667585380,
|
"lastModified": 1667671515,
|
||||||
"narHash": "sha256-NipRUi+DGyeNJO98u+ULf7Sd1UdsJ8JitZkKMPaMAF0=",
|
"narHash": "sha256-jdhA2R+Ezam6R++BYId1jwdvgZn6VZDnG4oEK+R8KIQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "70aece85224dcca42e6fc596a4b68d688ad6c295",
|
"rev": "bee06f35073da245b71221897becc74260a5b51f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -624,10 +624,10 @@
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667550944,
|
"lastModified": 1667550944,
|
||||||
"narHash": "sha256-ggII6sCaxlD06V9PBE+9fit6zLFsYzQtEsU7wugNYP0=",
|
"narHash": "sha256-8qNYarOJtasZ/+G5mlNC2mh8VG5NagM6tSpK2Rq5hDk=",
|
||||||
"owner": "NULLx76",
|
"owner": "NULLx76",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a5cafcd286c4fddd81aebbb9edb6befaf0e1afbe",
|
"rev": "afc2d0fe2359d4f4eff4d003f41130ad52ab427e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -131,7 +131,6 @@
|
||||||
vault
|
vault
|
||||||
(vault-push-approle-envs self { })
|
(vault-push-approle-envs self { })
|
||||||
(vault-push-approles self { })
|
(vault-push-approles self { })
|
||||||
rnix-lsp
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,6 +28,7 @@ in
|
||||||
cat >> /var/lib/mastodon/.secrets_env <<EOF
|
cat >> /var/lib/mastodon/.secrets_env <<EOF
|
||||||
AWS_ACCESS_KEY_ID="$(cat ${vs.mastodon}/awsAccessKeyId)"
|
AWS_ACCESS_KEY_ID="$(cat ${vs.mastodon}/awsAccessKeyId)"
|
||||||
AWS_SECRET_ACCESS_KEY="$(cat ${vs.mastodon}/awsSecretAccessKey)"
|
AWS_SECRET_ACCESS_KEY="$(cat ${vs.mastodon}/awsSecretAccessKey)"
|
||||||
|
DEEPL_API_KEY="$(cat ${vs.mastodon}/deeplAPIKey)"
|
||||||
EOF
|
EOF
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -91,6 +92,8 @@ in
|
||||||
S3_PROTOCOL = "https";
|
S3_PROTOCOL = "https";
|
||||||
S3_HOSTNAME = "o.xirion.net";
|
S3_HOSTNAME = "o.xirion.net";
|
||||||
S3_ENDPOINT = "https://o.xirion.net/";
|
S3_ENDPOINT = "https://o.xirion.net/";
|
||||||
|
|
||||||
|
DEEPL_PLAN = "free";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -15,10 +15,7 @@
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "22.11"; # Did you read the comment?
|
system.stateVersion = "22.11"; # Did you read the comment?
|
||||||
|
|
||||||
# Additional packages
|
services.tautulli = {
|
||||||
environment.systemPackages = with pkgs; [ ];
|
|
||||||
|
|
||||||
services.tautulli = rec {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 8080;
|
port = 8080;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
|
wallpaper = eDP-1,~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png
|
||||||
'';
|
'';
|
||||||
|
|
||||||
wayland.windowManager.hyprland =
|
wayland.windowManager.hyprland = let
|
||||||
let
|
|
||||||
startup-script = pkgs.writeScriptBin "startup" ''
|
startup-script = pkgs.writeScriptBin "startup" ''
|
||||||
#!${pkgs.stdenv.shell}
|
#!${pkgs.stdenv.shell}
|
||||||
hyprctl setcursor Catppuccin-Frappe-Pink-Cursors ${builtins.toString config.home.pointerCursor.size}
|
hyprctl setcursor Catppuccin-Frappe-Pink-Cursors ${
|
||||||
|
builtins.toString config.home.pointerCursor.size
|
||||||
|
}
|
||||||
${pkgs.hyprpaper}/bin/hyprpaper &
|
${pkgs.hyprpaper}/bin/hyprpaper &
|
||||||
${pkgs.xsettingsd}/bin/xsettingsd &
|
|
||||||
foot --server &
|
foot --server &
|
||||||
eww daemon &
|
eww daemon &
|
||||||
eww open bar &
|
eww open bar &
|
||||||
|
@ -19,8 +19,7 @@
|
||||||
webcord &
|
webcord &
|
||||||
element-desktop &
|
element-desktop &
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
enable = true;
|
enable = true;
|
||||||
recommendedEnvironment = true;
|
recommendedEnvironment = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
yarnOfflineCache = fetchYarnDeps {
|
yarnOfflineCache = fetchYarnDeps {
|
||||||
yarnLock = "${src}/yarn.lock";
|
yarnLock = "${src}/yarn.lock";
|
||||||
sha256 = "sha256-Yt7TIH24B+S8JarcCEIyMAKWlFiXlb/5i7p2cBrZlDM=";
|
sha256 = "sha256-8LxM+YFOZTWEsljc9Vvq0mBnonhtMNnfqrKCDSk2iZE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
mastodon-gems = bundlerEnv {
|
mastodon-gems = bundlerEnv {
|
||||||
|
|
|
@ -1102,10 +1102,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j";
|
sha256 = "0g7m38n4f5cjqa4gf4fycw6fqvf6m5hhsx4jawryv3bi4hls07d1";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "1.5.3";
|
version = "1.7.1";
|
||||||
};
|
};
|
||||||
fuubar = {
|
fuubar = {
|
||||||
dependencies = ["rspec-core" "ruby-progressbar"];
|
dependencies = ["rspec-core" "ruby-progressbar"];
|
||||||
|
@ -2529,10 +2529,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1jvxcvsqhalndc1wh7zfdqfg78j5sx57vrgsh54pjsm1d73q79hc";
|
sha256 = "1as4yrb8y5lq49div8p3vqgwrrhdgwnvx4m73y3712nmnlpx6cws";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "3.8.1";
|
version = "3.8.2";
|
||||||
};
|
};
|
||||||
safety_net_attestation = {
|
safety_net_attestation = {
|
||||||
dependencies = ["jwt"];
|
dependencies = ["jwt"];
|
||||||
|
@ -2605,10 +2605,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "031ifqpjn51s91ki5svmkv8n4dzky4lxx4vi8pxlv5y9bwgf30gx";
|
sha256 = "0ij0m4m4zi3ffn1csdrj4g96l4vpqlsw3rrgjxda9yqsq4ylf624";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "4.0.2";
|
version = "4.0.3";
|
||||||
};
|
};
|
||||||
sidekiq-unique-jobs = {
|
sidekiq-unique-jobs = {
|
||||||
dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
|
dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];
|
||||||
|
@ -2722,10 +2722,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b";
|
sha256 = "0v7nk5i3fa63h6clfr5vbr0y91v3kxkaxh6gbdx583pn982avdlc";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "0.2.21";
|
version = "0.2.22";
|
||||||
};
|
};
|
||||||
statsd-ruby = {
|
statsd-ruby = {
|
||||||
groups = ["default"];
|
groups = ["default"];
|
||||||
|
@ -2816,10 +2816,10 @@
|
||||||
platforms = [];
|
platforms = [];
|
||||||
source = {
|
source = {
|
||||||
remotes = ["https://rubygems.org"];
|
remotes = ["https://rubygems.org"];
|
||||||
sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv";
|
sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v";
|
||||||
type = "gem";
|
type = "gem";
|
||||||
};
|
};
|
||||||
version = "2.0.10";
|
version = "2.0.11";
|
||||||
};
|
};
|
||||||
tpm-key_attestation = {
|
tpm-key_attestation = {
|
||||||
dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
|
dependencies = ["bindata" "openssl" "openssl-signature_algorithm"];
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
{ fetchgit, applyPatches }: let
|
{ fetchgit, applyPatches }: let
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "https://github.com/glitch-soc/mastodon.git";
|
url = "https://github.com/glitch-soc/mastodon.git";
|
||||||
rev = "371563b0e249b6369e04709fb974a8e57413529f";
|
rev = "2f8fb49d1314db931385089bc9004a48700161ad";
|
||||||
sha256 = "19zbndh2scnjpcdfg142p8wc3a31qg8rzakfmk1x9vmf19sf8yf7";
|
sha256 = "0jj3p70lb16gn5cmcxnqkjy0aih3a5i38ppfjadyaxjdxhzbr3kd";
|
||||||
};
|
};
|
||||||
in applyPatches {
|
in applyPatches {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
"3.5.3"
|
"4.0.0rc1"
|
||||||
|
|
Loading…
Reference in a new issue