coolneng/zion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: coolneng/zion:master
Branches Tags
coolneng/zion:master
..
compare: coolneng/zion:57e2df4f0baae1018c32948480d7e9ca119111c9
Branches Tags
coolneng/zion:master
3 Commits
master .. 57e2df4f0b
Author SHA1 Message Date
coolneng 57e2df4f0b Move well-known delegation to main domain 2026-06-02 15:21:03 +02:00
coolneng 8846b7c79b Replace dendrite with continuwuity 2026-06-02 15:20:18 +02:00
coolneng 7c03104e77 Upgrade to NixOS 26.05 2026-05-31 20:12:59 +02:00
4 changed files with 63 additions and 78 deletions
Expand all files Collapse all files
flake.lock
Generated
+59 -55
View File
@@ -54,12 +54,12 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1789681713, "lastModified": 1779475417,
"narHash": "sha256-6KPsQyUeKKlTJmI4VXijP+B4+zi5FCEXOscFxMm8zHQ=", "narHash": "sha256-7/U/+X66C7XmLnt5JVJVtpx8wVDRU//Awaeqkq9+NNc=",
"rev": "35e914102d4992b10bac4c12e94ec606d109633d", "rev": "8a9c57ea6b458a40589df60f26200b7d305354d1",
"revCount": 438, "revCount": 417,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.5/01a0b15b-1d43-7be1-beb0-8aa22a4d3d93/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.21.0/019e5103-0940-7a50-bac6-f1c621bf31ff/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -69,51 +69,51 @@
"determinate-nixd-aarch64-darwin": { "determinate-nixd-aarch64-darwin": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-QuBUghdOXgnIXX25fUNvBnpjeSgIebz7uCHK6E5K1qc=", "narHash": "sha256-LNvx0qZsH8tbdgNfaig/x5Cf4r4UrXfU1m+0bO3D0E4=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/macOS"
} }
}, },
"determinate-nixd-aarch64-linux": { "determinate-nixd-aarch64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-XT6fkS0rMzQErYmxw0kMb4bQCgLat0v0OgcMidj0Srw=", "narHash": "sha256-rKg7uVAEK8X3TTFGaWp8CVZuCAr3wHkMnuJOndhXJF0=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/aarch64-linux"
} }
}, },
"determinate-nixd-x86_64-linux": { "determinate-nixd-x86_64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-JlMPuS0nwupTaJ4fvr14R519hUBupHteDNshGhCdMM8=", "narHash": "sha256-vBCUEVPfY4+nxGDM62evpxJYEVqLTqdBGbCkmZ2sQhk=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.5/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.21.0/x86_64-linux"
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1696426674,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "NixOS", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@@ -127,12 +127,12 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782949081, "lastModified": 1748821116,
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
"revCount": 480, "revCount": 377,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.480%2Brev-17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e/019f2195-dee5-7233-9747-eca0c27f7406/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -142,6 +142,10 @@
"git-hooks-nix": { "git-hooks-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"gitignore": [
"determinate",
"nix"
],
"nixpkgs": [ "nixpkgs": [
"determinate", "determinate",
"nix", "nix",
@@ -149,12 +153,12 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1784288435, "lastModified": 1747372754,
"narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
"rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
"revCount": 1231, "revCount": 1026,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1231%2Brev-43b3c1ab9d40fb1dbb008f451988a91e375825e9/019f7135-8fdf-76f0-b1a1-d2c67e91af8d/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -191,12 +195,12 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1789679063, "lastModified": 1779472733,
"narHash": "sha256-5rX9rK1y8NpOaYyL+cn1P2O5re+ON2Wpo39J8/LLCXI=", "narHash": "sha256-nV5OHwivEf392cB5MDwoVdDHSvy6Q+rRYZBHd9sePj4=",
"rev": "6468ca430b298865100b753ec21687aba457a05c", "rev": "11f3aff904f84ae612e36e8bc578ac421fca74fa",
"revCount": 27345, "revCount": 25967,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.5/01a0b14c-a282-7291-953e-6e8ddd04304b/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.21.0/019e50fb-8633-73d0-b673-b2e265950490/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -208,11 +212,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1789978172, "lastModified": 1780065812,
"narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", "narHash": "sha256-SCSLUKBmwlSLGQ8Xbr8PjRFtiHNk0l9ktqkcmqdBkfE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", "rev": "b76b5639c0593e0aeb0b5879ad62d4b30596c144",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -224,16 +228,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1787962033, "lastModified": 1773222311,
"narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
"rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb", "rev": "0590cd39f728e129122770c029970378a79d076a",
"revCount": 1012930, "revCount": 909248,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1012930%2Brev-c5c4a43b0e8056328ec4529f735cabdb8f1942bb/01a053c0-7061-7382-b001-102e9148a5b5/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.909248%2Brev-0590cd39f728e129122770c029970378a79d076a/019ce32b-8ace-7339-b129-cceaa8dd10c6/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2605" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2511"
} }
}, },
"nixpkgs-23-11": { "nixpkgs-23-11": {
@@ -270,12 +274,12 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1788752844, "lastModified": 1778869304,
"narHash": "sha256-VaWGJ6+cIYN2erfSecbRV+4ljI185Ty2wUrXyvQbgOw=", "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
"rev": "dc5d91f840324650bac8c379428c7037a416959a", "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
"revCount": 1068949, "revCount": 998534,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.1068949%2Brev-dc5d91f840324650bac8c379428c7037a416959a/01a0a392-87f7-7a12-88cf-358485bd5ec1/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.998534%2Brev-d233902339c02a9c334e7e593de68855ad26c4cb/019e3efc-e09a-7ff1-b05f-0c8f85ba7441/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -284,11 +288,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1789546076, "lastModified": 1767892417,
"narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
"rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "tarball", "type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@@ -297,11 +301,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1789998861, "lastModified": 1780051219,
"narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", "narHash": "sha256-WnxzG4x47uCgjz+uD+vOzbF+Qid+hKyYdJWbduA9w7g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", "rev": "e8e446a361172fe838243958325845d0b845c5e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
modules/containers.nix
-11
View File
@@ -58,17 +58,6 @@
PHOTOVIEW_LISTEN_PORT = "4001"; PHOTOVIEW_LISTEN_PORT = "4001";
}; };
}; };
# File converter
convertx = {
image = "c4illin/convertx@sha256:b515b04bfd25298a5cdc775b2fcd48b9399bab658ce13e2598b65df1b16098c8";
ports = [ "127.0.0.1:9292:3000" ];
volumes = [ "/vault/convertx:/app/data" ];
environment = {
AUTO_DELETE_EVERY_N_HOURS = "0";
FFMPEG_ARGS = "-hwaccel vaapi";
LIBVA_DRIVER_NAME = "iHD";
};
};
}; };
}; };
}; };
modules/monitoring.nix
+4 -7
View File
@@ -82,13 +82,10 @@ with pkgs;
# Grafana configuration # Grafana configuration
services.grafana = { services.grafana = {
enable = true; enable = true;
settings = { settings.server = {
server = { domain = "grafana.psydnd.org";
domain = "grafana.psydnd.org"; http_port = 9009;
http_port = 9009; http_addr = "127.0.0.1";
http_addr = "127.0.0.1";
};
security.secret_key = config.age.secrets.grafana.path;
}; };
}; };
modules/webstack.nix
-5
View File
@@ -174,11 +174,6 @@
forceSSL = true; forceSSL = true;
locations."/".proxyPass = "http://localhost:9191/"; locations."/".proxyPass = "http://localhost:9191/";
}; };
"convert.psydnd.org" = {
useACMEHost = "psydnd.org";
forceSSL = true;
locations."/".proxyPass = "http://localhost:9292/";
};
}; };
}; };