diff options
Diffstat (limited to 'krebs')
-rw-r--r-- | krebs/2configs/default.nix | 6 | ||||
-rw-r--r-- | krebs/2configs/mastodon.nix | 8 | ||||
-rw-r--r-- | krebs/nixpkgs-unstable.json | 8 | ||||
-rw-r--r-- | krebs/nixpkgs.json | 8 | ||||
-rwxr-xr-x | krebs/update-nixpkgs.sh | 2 |
5 files changed, 19 insertions, 13 deletions
diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix index 38d770316..fffe128e6 100644 --- a/krebs/2configs/default.nix +++ b/krebs/2configs/default.nix @@ -27,9 +27,6 @@ with import <stockholm/lib>; ]; console.keyMap = "us"; - i18n = { - defaultLocale = lib.mkForce "C"; - }; programs.ssh.startAgent = false; @@ -60,4 +57,7 @@ with import <stockholm/lib>; # The NixOS release to be compatible with for stateful data such as databases. system.stateVersion = "17.03"; + + # maybe fix Error: unsupported locales detected: + i18n.defaultLocale = mkDefault "C.UTF-8"; } diff --git a/krebs/2configs/mastodon.nix b/krebs/2configs/mastodon.nix index d0c1943cc..145b383ed 100644 --- a/krebs/2configs/mastodon.nix +++ b/krebs/2configs/mastodon.nix @@ -15,7 +15,7 @@ configureNginx = true; trustedProxy = config.krebs.hosts.prism.nets.retiolum.ip6.addr; smtp.createLocally = false; - smtp.fromAddress = "mastodon@social.krebsco.de"; + smtp.fromAddress = "derp"; }; services.nginx.virtualHosts.${config.services.mastodon.localDomain} = { @@ -36,5 +36,11 @@ (pkgs.writers.writeDashBin "tootctl" '' sudo -u mastodon /etc/profiles/per-user/mastodon/bin/mastodon-env /etc/profiles/per-user/mastodon/bin/tootctl "$@" '') + (pkgs.writers.writeDashBin "create-mastodon-user" '' + set -efu + nick=$1 + /run/current-system/sw/bin/tootctl accounts create "$nick" --email "$nick"@krebsco.de --confirmed + /run/current-system/sw/bin/tootctl accounts approve "$nick" + '') ]; } diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index a5d67f2fc..897af6482 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "b457130e8a21608675ddf12c7d85227b22a27112", - "date": "2022-11-16T11:03:19+00:00", - "path": "/nix/store/jr123qfmrl53imi48naxh6zs486fqmz2-nixpkgs", - "sha256": "16cjrr3np3f428lxw8yk6n2dqi7mg08zf6h6gv75zpw865jz44df", + "rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e", + "date": "2022-12-04T12:18:32+01:00", + "path": "/nix/store/xnxll37bfls7a3g969avyvb2cic0g0f3-nixpkgs", + "sha256": "0bix6746zmifas85mkb49g0szkdza4ajzdfbix4cdan9ig06v6rc", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index f836f63f9..b6d46f1f9 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "6474d93e007e4d165bcf48e7f87de2175c93d10b", - "date": "2022-11-16T11:41:31+01:00", - "path": "/nix/store/z86f31carhz3sf78kn3lkyq748drgp63-nixpkgs", - "sha256": "00swm7hz3fjyzps75bjyqviw6dqg2cc126wc7lcc1rjkpdyk5iwg", + "rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502", + "date": "2022-11-30T14:03:12-05:00", + "path": "/nix/store/vax0irdsk8gvczikw219vj079mck6j6r-nixpkgs", + "sha256": "1n524a44p2kprk65zx2v6793kmxjpz1qm1ilxk82vq0vg0c5jy32", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/krebs/update-nixpkgs.sh b/krebs/update-nixpkgs.sh index 59dbd91b5..97c069d86 100755 --- a/krebs/update-nixpkgs.sh +++ b/krebs/update-nixpkgs.sh @@ -3,7 +3,7 @@ dir=$(dirname $0) oldrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') nix-shell -p nix-prefetch-git --run 'nix-prefetch-git \ --url https://github.com/NixOS/nixpkgs \ - --rev refs/heads/nixos-22.05' \ + --rev refs/heads/nixos-22.11' \ > $dir/nixpkgs.json newrev=$(cat $dir/nixpkgs.json | jq -r .rev | sed 's/\(.\{7\}\).*/\1/') git commit $dir/nixpkgs.json -m "nixpkgs: $oldrev -> $newrev" |