nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tons o' stuff

This commit is contained in:
niten 2024-03-23 14:23:43 -07:00
parent cf10f910bd
commit 8b10f47699
17 changed files with 259 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/domain-config/fudo.org.nix
View File

@ -76,6 +76,7 @@ in {
matrixServerName = matrixHostname;
openIdClientId = readFile domainSecrets."matrix-oidc.clientid";
openIdClientSecret = readFile domainSecrets."matrix-oidc.secret";
openIdJwtSecret = readFile domainSecrets."matrix-private.pem";
})
(import ./fudo.org/mail-server.nix (rec {
primaryMailserver = "germany";

3
config/domain-config/fudo.org/authentik.nix
View File

@ -10,6 +10,7 @@ let
zoneName = config.fudo.domains."${domainName}".zone;
isAuthentik = hostname == authentikHost;
authentikHostname = "authentik.${domainName}";
in {
config = {
fudo = {
@ -20,6 +21,8 @@ in {
zones."${zoneName}".aliases.authentik = authentikHost;
};
systemd.services.authentik-cert-copy.after = [ "fudo-secrets.target" ];
services = {
authentikContainer = mkIf isAuthentik {
enable = true;

1
config/domain-config/fudo.org/mail-server.nix
View File

@ -78,6 +78,7 @@ in {
trusted-networks = config.instance.local-networks;
smtp = {
hostname = "mail.${primaryDomain}";
spf.enable = false;
ssl-directory =
config.security.acme.certs."mail.${primaryDomain}".directory;
};

8
config/domain-config/fudo.org/matrix.nix
View File

@ -1,4 +1,5 @@
{ matrixHost, matrixServerName, openIdClientId, openIdClientSecret, ... }:
{ matrixHost, matrixServerName, openIdClientId, openIdClientSecret
, openIdJwtSecret, ... }:
{ config, lib, pkgs, ... }:
@ -29,6 +30,7 @@ in {
provider = "fudo-auth";
provider-name = "Fudo Auth";
issuer = "https://authentik.fudo.org/application/o/matrix/";
jwt-secret = openIdJwtSecret;
};
};
};
@ -73,6 +75,10 @@ in {
"/.well-known/matrix/client".extraConfig = mkWellKnown {
"m.homeserver".base_url = "https://${matrixFqdn}:443";
};
"/.well-known/matrix/openid".extraConfig = mkWellKnown {
"token-issuer" = "https://authentik.fudo.org/application/o/token/";
"client-id" = openIdClientId;
};
"/.well-known/acme-challenge" = {
root = "/var/lib/acme/acme-challenge/";
extraConfig = "auth_basic off;";

8
config/domain-config/informis.land.nix
View File

@ -7,6 +7,7 @@ let
primaryNameserver = "locum";
defaultHost = "locum";
authentikHost = "locum";
lemmyHost = "locum";
userdbPasswd = pkgs.lib.passwd.stablerandom-passwd-file "userdb-passwd"
config.instance.build-seed;
@ -74,6 +75,13 @@ in {
reverse-zones = [ "172.86.179.17/29" "190.2.134.0/24" ];
};
};
lemmy = {
enable = hostname == lemmyHost;
hostname = "informis.land";
site-name = "Informis";
smtp.host = "mail.informis.land";
};
};
postgresql.package = pkgs.postgresql_15_gssapi;

12
config/domain-config/sea.fudo.org.nix
View File

@ -17,12 +17,9 @@ let
immichHost = "toothless";
in {
imports = [ ./sea.fudo.org/8bitdo.nix ];
config = {
fudo.zones."sea.fudo.org".aliases = {
chat = "nostromo";
frigate = "zbox";
immich = immichHost;
};
fudo = {
services = {
metrics = {
@ -42,6 +39,11 @@ in {
acl = [ "frigate/#" ];
};
};
zones."sea.fudo.org".aliases = {
chat = "nostromo";
frigate = "zbox";
immich = immichHost;
};
};
services = {

83
config/domain-config/sea.fudo.org/8bitdo.nix Normal file
View File

@ -0,0 +1,83 @@
{ config, lib, pkgs, ... }:
with lib;
let
hostname = config.instance.hostname;
enable-gui = config.fudo.hosts."${hostname}".enable-gui;
# 70:9C:D1:0E:48:AD
in {
config = mkIf enable-gui {
environment.systemPackages = with pkgs; [ xboxdrv ];
services.udev.extraRules = let
# btStartScript = concatStringsSep "," [
# ''SUBSYSTEM=="input"''
# ''ATTR{PHYS}=="70:9c:d1:0e:48:ad"''
# ''ATTR{ACTION}=="add"''
# ''ATTR{PRODUCT}=="5/57e/2009/8001"''
# ''
# RUN+="${pkgs.systemd}/bin/systemctl start controller-8bitdo-ultimate-xinput@70_9C_D1_0E_48_AD"''
# ];
# btStopScript = concatStringsSep "," [
# ''SUBSYSTEM=="input"''
# ''ATTR{PHYS}=="70:9c:d1:0e:48:ad"''
# ''ATTR{ACTION}=="remove"''
# ''ATTR{PRODUCT}=="5/57e/2009/8001"''
# ''
# RUN+="${pkgs.systemd}/bin/systemctl stop controller-8bitdo-ultimate-xinput@70_9C_D1_0E_48_AD"''
# ];
# usbStartScript = concatStringsSep "," [
# ''SUBSYSTEM=="usb"''
# ''ATTR{idVendor}=="2dc8"''
# ''ATTR{idProduct}=="3106"''
# ''ATTR{manufacturer}=="8BitDo"''
# ''
# RUN+="${pkgs.systemd}/bin/systemctl start controller-8bitdo-ultimate-xinput@2dc8:3106"''
# ];
# usbStopScript = concatStringsSep "," [
# ''SUBSYSTEM=="usb"''
# ''ATTR{idVendor}=="2dc8"''
# ''ATTR{idProduct}=="3016"'' # NOTE: 3106 - connect, 3016 - disconnect
# ''ATTR{manufacturer}=="8BitDo"''
# ''
# RUN+="${pkgs.systemd}/bin/systemctl stop controller-8bitdo-ultimate-xinput@2dc8:3106''
# ];
startScript = concatStringsSep "," [
''SUBSYSTEM=="input"''
''ACTION=="add"''
''ATTR{PRODUCT}=="5/57e/2009/8001"''
''
RUN+="${pkgs.systemd}/bin/systemctl start controller-8bitdo-ultimate-xinput@$env{ID_MODEL}"''
];
stopScript = concatStringsSep "," [
''SUBSYSTEM=="input"''
''ACTION=="remove"''
''ATTR{PRODUCT}=="5/57e/2009/8001"''
''
RUN+="${pkgs.systemd}/bin/systemctl stop controller-8bitdo-ultimate-xinput@$env{ID_MODEL}"''
];
in concatStringsSep "\n" [ startScript stopScript ];
systemd.services."controller-8bitDo-ultimate-xinput@" = {
unitConfig.Dsecription =
"8BitDo Ultimate Controller XInput mode xboxdrv daemon";
serviceConfig = {
Type = "simple";
ExecStart =
pkgs.writeShellScript "controller-8bitDo-ultimate-xinput.sh" ''
echo "starting xboxdrv for $ID_MODEL"
${pkgs.xboxdrv}/bin/xboxdrv --mimic-xpad --silent --type xbox360 --device-by-id %I --force-feedback;
'';
};
};
};
}

5
config/host-config/germany.nix
View File

@ -48,6 +48,11 @@ in {
requires = [ "fudo-secrets.target" ];
};
"lemmy" = {
after = [ "postgresql.service" ];
requires = [ "postgresql.service" ];
};
fudo-mail-sync = {
path = with pkgs; [ rsync openssh ];
serviceConfig = {

14
config/host-config/jazz.nix
View File

@ -16,11 +16,6 @@ in {
"d ${stateDir}/lib/flatpak 755 root root - -"
];
# i18n.inputMethod = {
# enabled = "fcitx5";
# fcitx5.addons = with pkgs; [ fcitx5-chinese-addons fcitx5-rime ];
# };
services.xserver = {
layout = "us";
xkbVariant = mkForce "";
@ -47,9 +42,12 @@ in {
antialias = true;
};
environment.etc = {
nixos.source = "/etc/nixos-live";
NIXOS.source = "${stateDir}/etc/NIXOS";
environment = {
etc = {
nixos.source = "/etc/nixos-live";
NIXOS.source = "${stateDir}/etc/NIXOS";
};
systemPackages = with pkgs; [ bluez-tools ];
};
systemd.targets = {

26
config/host-config/locum.nix
View File

@ -71,6 +71,8 @@ in {
mail.state-directory = "/state/services/mail";
postgresql.state-directory = "/state/services/postgresql";
services = {
authoritative-dns.state-directory = "/state/services/dns";
auth = {
@ -89,18 +91,18 @@ in {
services = {
authentikContainer.state-directory = "/state/services/authentik";
lemmyDocker = {
enable = true;
hostname = "informis.land";
site-name = "Informis Lemmy";
version = "0.18.2";
state-directory = "/state/services/lemmy";
smtp-server = "smtp.informis.land:587";
docker-images = {
pictrs = "asonix/pictrs:0.4.0-rc.14";
postgres = "postgres:15-alpine";
};
};
# lemmyDocker = {
# enable = true;
# hostname = "informis.land";
# site-name = "Informis Lemmy";
# version = "0.18.2";
# state-directory = "/state/services/lemmy";
# smtp-server = "smtp.informis.land:587";
# docker-images = {
# pictrs = "asonix/pictrs:0.4.0-rc.14";
# postgres = "postgres:15-alpine";
# };
# };
nginx = {
enable = true;

11
config/host-config/system3.nix
View File

@ -103,7 +103,7 @@ in {
];
services = {
blueman.enable = true;
blueman.enable = false;
openssh.hostKeys = [
{
@ -134,9 +134,12 @@ in {
antialias = true;
};
environment.etc = {
nixos.source = "/etc/nixos-live";
NIXOS.source = "${state-dir}/etc/NIXOS";
environment = {
etc = {
nixos.source = "/etc/nixos-live";
NIXOS.source = "${state-dir}/etc/NIXOS";
};
systemPackages = with pkgs; [ bluez-tools ];
};
hardware = {

2
config/profile-config/common-ui.nix
View File

@ -3,7 +3,7 @@
with lib;
let
hostname = config.instance.hostname;
enable-gui = config.fudo.hosts.${hostname}.enable-gui;
enable-gui = config.fudo.hosts."${hostname}".enable-gui;
in {
imports = [ ./common.nix ];

2
config/service/authoritative-dns.nix
View File

@ -112,7 +112,7 @@ let
listen-ips = getHostIps hostname;
state-directory = "/var/lib/nsd";
state-directory = cfg.state-directory;
timestamp = toString config.instance.build-timestamp;

2
config/service/lemmy.nix
View File

@ -49,7 +49,7 @@ in {
lemmyDbUrl = {
source-file = let
url =
"postgres:///lemmy?user=lemmy&password=${lemmyDbPasswd}&host=/var/run/postgresql";
"postgres:///lemmy?user=lemmy&password=${lemmyDbPasswd}&host=localhost&port=5432";
in pkgs.writeText "lemmy-db.url" url;
target-file = "/run/lemmy/db.url";
};

5
config/service/nexus.nix
View File

@ -204,8 +204,9 @@ in {
source-file =
pkgs.lib.passwd.stablerandom-passwd-file "nexus-server-passwd"
"nexus-server-${config.instance.build-seed}";
target-file = "/run/nexus/server-db.passwd";
user = "postgres";
target-file = "/run/nexus-postgres/server-db.passwd";
user = config.systemd.services.postgresql.serviceConfig.User;
group = config.systemd.services.postgresql.serviceConfig.Group;
};
nexus-dns-server-passwd = mkIf isDnsServer {

172
flake.lock
View File

@ -10,11 +10,11 @@
]
},
"locked": {
"lastModified": 1707151070,
"narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=",
"lastModified": 1709606645,
"narHash": "sha256-yObjAl8deNvx1uIfQn7/vkB9Rnr0kqTo1HVrsk46l30=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "9e5caa2b4869c9094a39a7819511a88c35e35671",
"rev": "d2d48c9ec304ac80c84ede138b8c6f298d07d995",
"type": "github"
},
"original": {
@ -31,11 +31,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1707151070,
"narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=",
"lastModified": 1709606645,
"narHash": "sha256-yObjAl8deNvx1uIfQn7/vkB9Rnr0kqTo1HVrsk46l30=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "9e5caa2b4869c9094a39a7819511a88c35e35671",
"rev": "d2d48c9ec304ac80c84ede138b8c6f298d07d995",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
"nixpkgs": "nixpkgs_20"
},
"locked": {
"lastModified": 1707151070,
"narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=",
"lastModified": 1709606645,
"narHash": "sha256-yObjAl8deNvx1uIfQn7/vkB9Rnr0kqTo1HVrsk46l30=",
"owner": "hercules-ci",
"repo": "arion",
"rev": "9e5caa2b4869c9094a39a7819511a88c35e35671",
"rev": "d2d48c9ec304ac80c84ede138b8c6f298d07d995",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
]
},
"locked": {
"lastModified": 1707259343,
"narHash": "sha256-W6W57ruUa+oSD3j1cBG9/trNexhLM4LmF1P1Ber8Qwk=",
"lastModified": 1707958053,
"narHash": "sha256-/FCwDO/kapCWgw7iPWhF+vpMGAJKPMNqEuNgE0+DHsM=",
"ref": "refs/heads/master",
"rev": "4c8601dac9298cb8a15e887de8be2ec07f50e142",
"revCount": 23,
"rev": "1b580545e64ccae1507476174d050f9bee345466",
"revCount": 25,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/authentik-container.git"
},
@ -95,11 +95,11 @@
]
},
"locked": {
"lastModified": 1706576134,
"narHash": "sha256-2fIyFtD0Xt4OqyPs5fzB+b5l8ZR2D7CeYriBjqxRcnQ=",
"lastModified": 1710008093,
"narHash": "sha256-ROChGpYaklLrV27ikhiqmH9VNIS+9tM7luxSGcFrHxQ=",
"ref": "refs/heads/master",
"rev": "8e8a3099e5c3f1cf56677d5a9dbb7fb79a5c937f",
"revCount": 94,
"rev": "3700d10df6943d062860667470188ddbe2bcd896",
"revCount": 95,
"type": "git",
"url": "https://git.fudo.org/fudo-public/authoritative-dns.git"
},
@ -1344,8 +1344,8 @@
"domain-secrets": {
"flake": false,
"locked": {
"lastModified": 1705264542,
"narHash": "sha256-XnMrmFtapnkPHYHQPXuA8ceAijWDUv55XpM/yQVUVPo=",
"lastModified": 1707962276,
"narHash": "sha256-5EBqxQLujMoiSWHhbIeyfzq8x3znS7xSEFupzd+ly3w=",
"path": "/secrets/domain-secrets",
"type": "path"
},
@ -1471,11 +1471,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1707247772,
"narHash": "sha256-qndZ2CrF8jUH104UipHmC23NxUR+vjMxlvCzSymsp4Y=",
"lastModified": 1707592324,
"narHash": "sha256-OpWILltoP+nN+xrVa/cYNrREfW631wdju7gIxLwP6Lo=",
"ref": "refs/heads/master",
"rev": "3a1ffc2992472366c7b570a11ce57fb30690d6f4",
"revCount": 234,
"rev": "bdf15c64e7753b0bb1ba1e6609ca8bf1efe8f712",
"revCount": 235,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/entities.git"
},
@ -1841,11 +1841,11 @@
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@ -1884,11 +1884,11 @@
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@ -1928,11 +1928,11 @@
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"type": "github"
},
"original": {
@ -2318,11 +2318,11 @@
]
},
"locked": {
"lastModified": 1707592324,
"narHash": "sha256-OpWILltoP+nN+xrVa/cYNrREfW631wdju7gIxLwP6Lo=",
"lastModified": 1708044301,
"narHash": "sha256-V7cqPVcskdf3MvvGr9Yo5n4q2xxbAwG4/Fqhu9SHMpw=",
"ref": "refs/heads/master",
"rev": "bdf15c64e7753b0bb1ba1e6609ca8bf1efe8f712",
"revCount": 235,
"rev": "4804ac7bc3533d662af04e75978225403637cf56",
"revCount": 236,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/entities.git"
},
@ -2343,11 +2343,11 @@
]
},
"locked": {
"lastModified": 1707241980,
"narHash": "sha256-OawfqeauORw80WwlW8Yrdw7YebBhfXVh8AQZq43b9lU=",
"lastModified": 1708051636,
"narHash": "sha256-mwv6Q6c9m/X/k9Xr9xVoUvzP3LJjXKh2epXRe7A9ugE=",
"ref": "refs/heads/master",
"rev": "ac346cada8a89da3d3ff81f67126673ee7174767",
"revCount": 464,
"rev": "74be3bcf575c11dcf12f7a4ae19c93954af0c649",
"revCount": 468,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/home.git"
},
@ -2388,11 +2388,11 @@
},
"fudo-lib_3": {
"locked": {
"lastModified": 1707117696,
"narHash": "sha256-29O7UwcggymOtE2In5DjMLrWDlTyYDv4K4+VnJz1N10=",
"lastModified": 1709939497,
"narHash": "sha256-+i2NXUV13PTV2ebxzgJughpkOdx9WvXdB8AZP7lHbzY=",
"ref": "refs/heads/master",
"rev": "751ee6be5d414fd291eb650a105fa06da60b6f6e",
"revCount": 226,
"rev": "e6109489d41c117e6c346db41826dcf969529a22",
"revCount": 227,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/lib.git"
},
@ -2442,11 +2442,11 @@
"unstableNixpkgs": "unstableNixpkgs_2"
},
"locked": {
"lastModified": 1706636056,
"narHash": "sha256-YP/yvkmiRecmQyzo5JCzeKxoue4nQKJSqLOQU2YU/Kk=",
"lastModified": 1708888433,
"narHash": "sha256-WV4uPX/wsqaH406OGhRst9mBLJj2WCatV5lAL0jfpWM=",
"ref": "refs/heads/master",
"rev": "23777dfea1db2118c730d40cae21844fe45e504f",
"revCount": 275,
"rev": "08b3f97c8e03d0bf42878caab5261a6119341201",
"revCount": 294,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
},
@ -2462,11 +2462,11 @@
"unstableNixpkgs": "unstableNixpkgs_3"
},
"locked": {
"lastModified": 1706636056,
"narHash": "sha256-YP/yvkmiRecmQyzo5JCzeKxoue4nQKJSqLOQU2YU/Kk=",
"lastModified": 1707689166,
"narHash": "sha256-kV69NbGYO51wCdWBJaseXdPuD0uJ8YE4BH6Ljc8nqyw=",
"ref": "refs/heads/master",
"rev": "23777dfea1db2118c730d40cae21844fe45e504f",
"revCount": 275,
"rev": "6f3717c9a958991c6d686605274816590ed36cd0",
"revCount": 293,
"type": "git",
"url": "https://git.fudo.org/fudo-nix/pkgs.git"
},
@ -2494,8 +2494,8 @@
"utils": "utils_23"
},
"locked": {
"lastModified": 1707593250,
"narHash": "sha256-SF9H31fTTzF6tvo14ylc8OiBm8Ac1PqN/Ma+lWnO5N8=",
"lastModified": 1708124065,
"narHash": "sha256-tNoh0yYrYv3VO3ixKO2+pqZ++JcLGKg9vN+kf3YpeK8=",
"path": "/secrets",
"type": "path"
},
@ -3039,11 +3039,11 @@
]
},
"locked": {
"lastModified": 1704029560,
"narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
"lastModified": 1708547820,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
"type": "github"
},
"original": {
@ -3062,11 +3062,11 @@
]
},
"locked": {
"lastModified": 1704029560,
"narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
"lastModified": 1708547820,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
"type": "github"
},
"original": {
@ -3085,11 +3085,11 @@
]
},
"locked": {
"lastModified": 1704029560,
"narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=",
"lastModified": 1708547820,
"narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16",
"rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a",
"type": "github"
},
"original": {
@ -3199,11 +3199,11 @@
]
},
"locked": {
"lastModified": 1707341604,
"narHash": "sha256-0gHBWPhkIJKxmUit1m+MumCc3jt4aWdMhAPXgfZmMVw=",
"lastModified": 1710356002,
"narHash": "sha256-exZSmsjddgv1hkAmOv/z0NtNCzrEguqdIMICc8d2wLM=",
"ref": "refs/heads/master",
"rev": "293553c9ed805291f095260c224183902fee3e4c",
"revCount": 262,
"rev": "6c95ada6e1064dd98e3d41f4420ee63a83ea6586",
"revCount": 265,
"type": "git",
"url": "https://git.fudo.org/fudo-public/mail-server.git"
},
@ -3242,11 +3242,11 @@
]
},
"locked": {
"lastModified": 1705436347,
"narHash": "sha256-oG617Kg8oTIKeRo3Tj4nt3Kwej4k0NH136Te4bPIMos=",
"lastModified": 1707980545,
"narHash": "sha256-gDcGdhwxEItaB571Ohs+kROBQ1oRwjazOtCB1AInoYA=",
"ref": "refs/heads/master",
"rev": "1c1034ffe33e48ea02ca58a2d9fdbf37c8fc220f",
"revCount": 20,
"rev": "5d78ce3ec9588cc6ab6002dbfa8f51189ea3582d",
"revCount": 25,
"type": "git",
"url": "https://git.fudo.org/fudo-public/matrix-module.git"
},
@ -3514,11 +3514,11 @@
},
"nixpkgsUnstable": {
"locked": {
"lastModified": 1707268954,
"narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github"
},
"original": {
@ -3663,11 +3663,11 @@
},
"nixpkgs_19": {
"locked": {
"lastModified": 1707091808,
"narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
"lastModified": 1707786466,
"narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
"rev": "01885a071465e223f8f68971f864b15829988504",
"type": "github"
},
"original": {
@ -3693,11 +3693,11 @@
},
"nixpkgs_20": {
"locked": {
"lastModified": 1706913249,
"narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e92b6015881907e698782c77641aa49298330223",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {
@ -3754,11 +3754,11 @@
},
"nixpkgs_24": {
"locked": {
"lastModified": 1707514827,
"narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=",
"lastModified": 1710283656,
"narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "20f65b86b6485decb43c5498780c223571dd56ef",
"rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
"type": "github"
},
"original": {
@ -3829,11 +3829,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1706913249,
"narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
"lastModified": 1709479366,
"narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e92b6015881907e698782c77641aa49298330223",
"rev": "b8697e57f10292a6165a20f03d2f42920dfaf973",
"type": "github"
},
"original": {

50
flake.nix
View File

@ -5,67 +5,67 @@
nixpkgs.url = "nixpkgs/nixos-23.11";
fudo-home = {
url = "git+https://git.fudo.org/fudo-nix/home.git";
url = "git+https://fudo.dev/nix/home.git";
# url = "path:/state/fudo-home";
inputs.nixpkgs.follows = "nixpkgs";
};
# This MUST be a clean git repo, because we use the timestamp.
fudo-entities = {
url = "git+https://git.fudo.org/fudo-nix/entities.git";
url = "git+https://fudo.dev/nix/entities.git";
inputs.nixpkgs.follows = "nixpkgs";
};
fudo-lib = { url = "git+https://git.fudo.org/fudo-nix/lib.git"; };
fudo-lib = { url = "git+https://fudo.dev/nix/lib.git"; };
fudo-pkgs = { url = "git+https://git.fudo.org/fudo-nix/pkgs.git"; };
fudo-pkgs = { url = "git+https://fudo.dev/nix/pkgs.git"; };
fudo-secrets.url = "path:/secrets";
chute = {
url = "git+https://git.fudo.org/chute/chute.git?ref=stable";
url = "git+https://fudo.dev/chute/chute.git?ref=stable";
inputs.nixpkgs.follows = "nixpkgs";
};
chuteUnstable = {
url = "git+https://git.fudo.org/chute/chute.git?ref=master";
url = "git+https://fudo.dev/chute/chute.git?ref=master";
inputs.nixpkgs.follows = "nixpkgs";
};
pricebot = {
url = "git+https://git.fudo.org/fudo-public/pricebot.git";
url = "git+https://fudo.dev/public/pricebot.git";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgsUnstable.url = "nixpkgs/nixos-unstable";
wallfly = {
url = "git+https://git.fudo.org/fudo-public/wallfly.git";
url = "git+https://fudo.dev/public/wallfly.git";
inputs.nixpkgs.follows = "nixpkgs";
};
objectifier = {
url = "git+https://git.fudo.org/fudo-public/objectifier.git";
url = "git+https://fudo.dev/public/objectifier.git";
inputs.nixpkgs.follows = "nixpkgs";
};
nexus = {
url = "git+https://git.fudo.org/fudo-public/nexus.git";
url = "git+https://fudo.dev/public/nexus.git";
inputs.nixpkgs.follows = "nixpkgs";
};
suanni = {
url = "git+https://git.fudo.org/fudo-public/suanni.git";
url = "git+https://fudo.dev/public/suanni.git";
inputs.nixpkgs.follows = "nixpkgs";
};
snooper = {
url = "git+https://git.fudo.org/fudo-public/snooper.git";
url = "git+https://fudo.dev/public/snooper.git";
inputs.nixpkgs.follows = "nixpkgs";
};
tattler = {
url = "git+https://git.fudo.org/fudo-public/tattler.git";
url = "git+https://fudo.dev/public/tattler.git";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -75,7 +75,7 @@
};
lemmy-docker = {
url = "git+https://git.fudo.org/fudo-public/lemmy-docker.git";
url = "git+https://fudo.dev/public/lemmy-docker.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -83,7 +83,7 @@
};
tesla-mate-container = {
url = "git+https://git.fudo.org/fudo-public/tesla-mate-container.git";
url = "git+https://fudo.dev/public/tesla-mate-container.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -91,7 +91,7 @@
};
mastodon-container = {
url = "git+https://git.fudo.org/fudo-public/mastodon-container.git";
url = "git+https://fudo.dev/public/mastodon-container.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -99,7 +99,7 @@
};
lemmy-container = {
url = "git+https://git.fudo.org/fudo-public/lemmy-container.git";
url = "git+https://fudo.dev/public/lemmy-container.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -107,7 +107,7 @@
};
authentik-container = {
url = "git+https://git.fudo.org/fudo-nix/authentik-container.git";
url = "git+https://fudo.dev/nix/authentik-container.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -115,7 +115,7 @@
};
nextcloud-container = {
url = "git+https://git.fudo.org/fudo-public/nextcloud-container.git";
url = "git+https://fudo.dev/public/nextcloud-container.git";
inputs = {
nixpkgs.follows = "nixpkgs";
arion.follows = "arion";
@ -123,12 +123,12 @@
};
matrix-module = {
url = "git+https://git.fudo.org/fudo-public/matrix-module.git";
url = "git+https://fudo.dev/public/matrix-module.git";
inputs.nixpkgs.follows = "nixpkgs";
};
mail-server = {
url = "git+https://git.fudo.org/fudo-public/mail-server.git";
url = "git+https://fudo.dev/public/mail-server.git";
inputs = {
arion.follows = "arion";
nixpkgs.follows = "nixpkgs";
@ -136,7 +136,7 @@
};
immich-container = {
url = "git+https://git.fudo.org/fudo-public/immich-container.git";
url = "git+https://fudo.dev/public/immich-container.git";
inputs = {
arion.follows = "arion";
nixpkgs.follows = "nixpkgs";
@ -144,17 +144,17 @@
};
authoritative-dns = {
url = "git+https://git.fudo.org/fudo-public/authoritative-dns.git";
url = "git+https://fudo.dev/public/authoritative-dns.git";
inputs.nixpkgs.follows = "nixpkgs";
};
frigate-container = {
url = "git+https://git.fudo.org/fudo-public/frigate-container.git";
url = "git+https://fudo.dev/public/frigate-container.git";
inputs.nixpkgs.follows = "nixpkgs";
};
grafana-module = {
url = "git+https://git.fudo.org/fudo-public/grafana-module.git";
url = "git+https://fudo.dev/public/grafana-module.git";
inputs.nixpkgs.follows = "nixpkgs";
};