emily/nixfiles
emily/nixfiles
1
0
Fork 1
Code Issues Pull requests Activity

Update from update-inputs-2024-11-10-04-20

Browse source
This commit is contained in:
Update Bot 2024-11-10 04:20:19 +01:00
commit 62ba6d8fb7
No known key found for this signature in database
6 changed files with 104 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
config/hosts/florp/configuration.nix
View file

@ -1,4 +1,4 @@
{ lib, ... }: { { lib, config, ... }: {
imports = [ imports = [
../../common ../../common
../../profiles/headless.nix ../../profiles/headless.nix
@ -13,13 +13,32 @@
}; };
kyouma.nginx.defaultForbidden = "florp.social"; kyouma.nginx.defaultForbidden = "florp.social";
kyouma.restic = { kyouma.restic = let
pgBackup = "/var/cache/postgresql.sql";
in {
enable = true; enable = true;
remoteUser = "zh3485s1"; remoteUser = "zh3485s1";
timerConfig = {
OnCalendar = "hourly";
Persistent = true;
};
paths = [ paths = [
"/var/lib/akkoma" "/var/lib/akkoma"
"/var/lib/postgresql" "/var/lib/secrets"
pgBackup
]; ];
backupPrepareCommand = ''
umask 0077
rm -f -- ${pgBackup}
${lib.getExe' config.services.postgresql.package "pg_dumpall"} \
-U ${config.services.postgresql.superUser} \
-f ${pgBackup}
'';
backupCleanupCommand = ''
rm -f -- ${pgBackup}
'';
}; };
systemd.network.networks."98-eth-default" = { systemd.network.networks."98-eth-default" = {
address = [ address = [

35
config/services/akkoma/default.nix
View file

@ -26,13 +26,14 @@
extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json); extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
extraStatic."static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '' extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
<h3>Likes are now florps. The timeline goes sideways.</h3> .tos-content img { max-width: 100%; }
''; '';
extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.wallpaper; extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
extraStatic."favicon.png" = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon; extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
frontends = { frontends = {
primary = { primary = {
@ -101,7 +102,6 @@
"solitary.social" "solitary.social"
"donotsta.re" "donotsta.re"
"chaos.social" "chaos.social"
"girldick.gay"
]; ];
}; };
@ -155,27 +155,27 @@
":mrf_simple" = { ":mrf_simple" = {
reject = mapAttrsToListOfTuple { reject = mapAttrsToListOfTuple {
"bae.st" = "transphobia / queerphobia"; "bae.st" = "transphobia, queerphobia";
"brighteon.social" = "transphobia, pro trump"; "brighteon.social" = "transphobia, right‐wing extremism";
"detroitriotcity.com" = "transphobia / queerphobia"; "detroitriotcity.com" = "transphobia, queerphobia";
"freeatlantis.com" = "harassment"; "freeatlantis.com" = "harassment";
"freespeechextremist.com" = "N/A"; "freespeechextremist.com" = "N/A";
"gab.com" = "N/A"; "gab.com" = "N/A";
"gleasonator.com" = "transphobia"; "gleasonator.com" = "transphobia";
"kitsunemimi.club" = "transphobia"; "kitsunemimi.club" = "transphobia";
"kiwifarms.*" = "N/A"; "kiwifarms.*" = "harassment";
"poa.st" = "queerphobia / racism / nazis"; "poa.st" = "queerphobia, racism, right‐wing extremism";
"seal.cafe" = "transphobia"; "seal.cafe" = "transphobia";
"social.quodverum.com" = "N/A"; "social.quodverum.com" = "N/A";
"spinster.xyz" = "transphobia"; "spinster.xyz" = "transphobia";
"truthsocial.co.in" = "N/A"; "truthsocial.co.in" = "N/A";
"varishangout.net" = "transphobia"; "varishangout.net" = "transphobia";
"activitypub-troll.cf" = "N/A"; "activitypub-troll.cf" = "N/A";
"misskey-forkbomb.cf" = "N/A"; "misskey-forkbomb.cf" = "security";
"repl.co" = "N/A"; "repl.co" = "N/A";
"rape.pet" = "CP"; "rape.pet" = "CSAM";
"childlove.space" = "CP"; "childlove.space" = "CSAM";
"pedo.school" = "CP"; "pedo.school" = "CSAM";
"loli.church" = "transphobia"; "loli.church" = "transphobia";
"usasa.ky" = "spam"; "usasa.ky" = "spam";
"tickler.cc" = "spam"; "tickler.cc" = "spam";
@ -242,11 +242,10 @@
services.nginx = { services.nginx = {
clientMaxBodySize = "256m"; clientMaxBodySize = "256m";
commonHttpConfig = '' commonHttpConfig = ''
access_log /var/log/nginx/access.log; access_log off;
error_log /var/log/nginx/err.log warn;
proxy_cache_path /var/cache/nginx/akkoma-media-cache proxy_cache_path /var/cache/nginx/akkoma-media-cache
levels= keys_zone=akkoma_media_cache:32m max_size=64g levels= keys_zone=akkoma_media_cache:64m max_size=64g
inactive=1y use_temp_path=off; inactive=1y use_temp_path=off;
''; '';
}; };

53
flake.lock
View file

@ -12,11 +12,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1730906442, "lastModified": 1731193172,
"narHash": "sha256-tBuyb8jWBSHHgcIrOfiyQJZGY1IviMzH2V74t7gWfgI=", "narHash": "sha256-Ykz7q58tF0wLTOjCxQMe5+jdAPPQ1dC8k39y9I/5k+I=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "d0b66cf897e4d55f03d341562c9821dc4e566e54", "rev": "a02bf38a7562e4041345a136aef6e5a4eb891bbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,6 +430,26 @@
"type": "github" "type": "github"
} }
}, },
"florp-about": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1731187545,
"narHash": "sha256-n/BOlXvOcX5yn2mbjazfCcbojzczCdmcjQNaH7Dcdd4=",
"ref": "refs/heads/main",
"rev": "1845276697adca236be3e7a983238d2a2d0d57b5",
"revCount": 7,
"type": "git",
"url": "https://woof.rip/florp/about.git"
},
"original": {
"type": "git",
"url": "https://woof.rip/florp/about.git"
}
},
"florp-branding": { "florp-branding": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -437,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730825511, "lastModified": 1731182323,
"narHash": "sha256-Ywc4Y+4VobocyxcVhHlJ5Q5h1fOdsJNlAlWlrkqC8U0=", "narHash": "sha256-Ecw7fOxv3hp1iLWBqlYW9TTNi0LTtiu92gtqfdn5v20=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "81bde12357d59215e7d67c7f55c2eb3d54c47689", "rev": "8aaf8c85b902eaaabfdeadd5502019b2816991b9",
"revCount": 2, "revCount": 3,
"type": "git", "type": "git",
"url": "https://woof.rip/florp/branding.git" "url": "https://woof.rip/florp/branding.git"
}, },
@ -693,11 +713,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730779758, "lastModified": 1731153869,
"narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=", "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb", "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -957,11 +977,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1731009822, "lastModified": 1731155487,
"narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=", "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "aabbd60633947baba11db44df84f402edc241440", "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -980,11 +1000,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730760712, "lastModified": 1731060242,
"narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=", "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee", "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1016,6 +1036,7 @@
"dns": "dns", "dns": "dns",
"fernglas": "fernglas", "fernglas": "fernglas",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"florp-about": "florp-about",
"florp-branding": "florp-branding", "florp-branding": "florp-branding",
"home-manager": "home-manager", "home-manager": "home-manager",
"hydra": "hydra", "hydra": "hydra",

4
flake.nix
View file

@ -25,6 +25,10 @@
url = "git+https://woof.rip/florp/branding.git"; url = "git+https://woof.rip/florp/branding.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
florp-about = {
url = "git+https://woof.rip/florp/about.git";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

25
modules/restic/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: let { config, lib, pkgs, utils, ... }: let
cfg = config.kyouma.restic; cfg = config.kyouma.restic;
in { in {
options.kyouma.restic = let options.kyouma.restic = let
@ -40,6 +40,27 @@ in {
type = types.nonEmptyStr; type = types.nonEmptyStr;
default = "${config.networking.hostName}-backup"; default = "${config.networking.hostName}-backup";
}; };
timerConfig = mkOption {
description = "timer config";
type = with types; nullOr (attrsOf utils.systemdUtils.unitOptions.unitOption);
default = {
OnCalendar = "daily";
Persistent = true;
};
};
# FIXME: Can these be just inherited?
backupPrepareCommand = mkOption {
description = "preparation script";
type = with types; nullOr str;
default = null;
};
backupCleanupCommand = mkOption {
description = "cleanup script";
type = with types; nullOr str;
default = null;
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
sops.secrets."restic/${cfg.remoteUser}/password" = { sops.secrets."restic/${cfg.remoteUser}/password" = {
@ -50,7 +71,7 @@ in {
}; };
services.restic.backups."${config.networking.hostName}-${cfg.remote}" = { services.restic.backups."${config.networking.hostName}-${cfg.remote}" = {
inherit (cfg) paths user pruneOpts; inherit (cfg) paths user pruneOpts timerConfig;
initialize = true; initialize = true;
repository = "sftp:${cfg.remoteUser}@${cfg.remote}:${cfg.repo}"; repository = "sftp:${cfg.remoteUser}@${cfg.remote}:${cfg.repo}";
passwordFile = config.sops.secrets."restic/${cfg.remoteUser}/password".path; passwordFile = config.sops.secrets."restic/${cfg.remoteUser}/password".path;

4
pkgs/update-nixfiles/update-nixfiles.sh
View file

@ -23,8 +23,6 @@ merge_theirs () {
test_build () { test_build () {
local last_error local last_error
local build_jobs local build_jobs
local start_time
start_time="$(date +%s)"
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")" build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
for build in ${build_jobs}; do for build in ${build_jobs}; do
@ -45,7 +43,7 @@ test_build () {
done done
last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")" last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")"
[[ $last_error -gt $start_time ]] && [[ $last_error -gt $(date +%s) ]] &&
echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" && echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" &&
exit 1 exit 1
} }