diff --git a/hosts/sand-archives/core/caddy.nix b/hosts/sand-archives/core/caddy.nix index a395508..923a24a 100644 --- a/hosts/sand-archives/core/caddy.nix +++ b/hosts/sand-archives/core/caddy.nix @@ -72,7 +72,7 @@ in } } route @inner_http { - proxy ${pm.net.ipv4.vulpes.addr}:80 + proxy 0.0.0.0:80 } } @@ -134,19 +134,19 @@ in } } route @inner_https { - proxy ${pm.net.ipv4.vulpes.addr}:443 + proxy 0.0.0.0:443 } } udp/:5353 { route { - proxy udp/${pm.net.ipv4.vulpes.addr}:5300 + proxy udp/0.0.0.0:5300 } } tcp/:5353 { route { - proxy tcp/${pm.net.ipv4.vulpes.addr}:5300 + proxy tcp/0.0.0.0:5300 } } } diff --git a/hosts/vulpes/core/virtualization.nix b/hosts/vulpes/core/virtualization.nix index 0a64ade..dd9a0c1 100644 --- a/hosts/vulpes/core/virtualization.nix +++ b/hosts/vulpes/core/virtualization.nix @@ -22,7 +22,7 @@ in }; preseed = { config = { - "core.https_address" = "${pm.net.ipv4.vulpes.addr}:8443"; + "core.https_address" = "0.0.0.0:8443"; "oidc.audience" = "incus"; "oidc.issuer" = "https://auth.awoo.ren/oauth2/openid/incus"; "oidc.client.id" = "incus"; diff --git a/hosts/vulpes/infra/caddy.nix b/hosts/vulpes/infra/caddy.nix index b922852..928604e 100644 --- a/hosts/vulpes/infra/caddy.nix +++ b/hosts/vulpes/infra/caddy.nix @@ -7,7 +7,7 @@ }: let photos-pkg = ( - pkgs.ente-web.override { + args.pkgs-master.ente-web.override { enteApp = "photos"; enteMainUrl = "https://ente.awoo.ren"; extraBuildEnv = { @@ -37,7 +37,7 @@ in } ''; extraConfig = '' - http://${pm.net.ipv4.vulpes.addr}:3893 { + http://0.0.0.0:3893 { handle /xrpc/com.atproto.identity.resolveHandle* { @pup query handle=awoo.ren @snow query handle=mrsnowy.dev @@ -55,21 +55,21 @@ in } } - http://${pm.net.ipv4.vulpes.addr}:7001 { + http://0.0.0.0:7001 { header Host ente.awoo.ren root * ${photos-pkg} file_server try_files {path} {path}.html /index.html } - http://${pm.net.ipv4.vulpes.addr}:7002 { + http://0.0.0.0:7002 { header Host albums.ente.awoo.ren root * ${photos-pkg} file_server try_files {path} {path}.html /index.html } - http://${pm.net.ipv4.vulpes.addr}:8934 { + http://0.0.0.0:8934 { root * ${pkgs.firefly-iii}/public request_header Host firefly.awoo.ren php_fastcgi unix/${config.services.phpfpm.pools.firefly-iii.socket} { diff --git a/hosts/vulpes/infra/coder.nix b/hosts/vulpes/infra/coder.nix index 067964b..174acdf 100644 --- a/hosts/vulpes/infra/coder.nix +++ b/hosts/vulpes/infra/coder.nix @@ -5,7 +5,7 @@ in { services.coder = { enable = true; - listenAddress = "${pm.net.ipv4.vulpes.addr}:3300"; + listenAddress = "0.0.0.0:3300"; accessUrl = "https://code.awoo.ren"; wildcardAccessUrl = "*.code.awoo.ren"; database = { @@ -22,4 +22,15 @@ in # CODER_DISABLE_PASSWORD_AUTH = "true"; }; }; + systemd = { + services = { + coder = { + after = [ + "netbird-vulpes.service" + "sys-subsystem-net-devices-nb\\x2dvulpes.device" + ]; + requires = [ "netbird-vulpes.service" ]; + }; + }; + }; } diff --git a/hosts/vulpes/infra/dns.nix b/hosts/vulpes/infra/dns.nix index 6ea43c8..eaadc9e 100644 --- a/hosts/vulpes/infra/dns.nix +++ b/hosts/vulpes/infra/dns.nix @@ -7,7 +7,7 @@ in pihole-web = { enable = true; ports = [ - "${pm.net.ipv4.vulpes.addr}:9001" + "0.0.0.0:9001" ]; }; pihole-ftl = { @@ -121,7 +121,7 @@ in showsonarr IN A ${pm.net.ipv4.sand-archives.addr} movieradarr IN A ${pm.net.ipv4.sand-archives.addr} prowlarr IN A ${pm.net.ipv4.sand-archives.addr} - torrent IN A ${pm.net.ipv4.vulpes.addr} + torrent IN A 0.0.0.0 yap IN A ${pm.net.ipv4.sand-archives.addr} diff --git a/hosts/vulpes/infra/git.nix b/hosts/vulpes/infra/git.nix index 352cac4..a1eb55c 100644 --- a/hosts/vulpes/infra/git.nix +++ b/hosts/vulpes/infra/git.nix @@ -49,7 +49,7 @@ in server = { owner = "did:plc:e6e4lgy3nzdshjbpmjvnkbfd"; hostname = "knot.git.awoo.ren"; - listenAddr = "${pm.net.ipv4.vulpes.addr}:5555"; + listenAddr = "0.0.0.0:5555"; }; }; }; @@ -67,7 +67,7 @@ in repo_folder = "/var/lib/git-priv/roufpup/$repo"; in '' - for repo in priv-dots fluxer-v2; do + for repo in priv-dots fluxer-v2 fd; do if [ ! -d "${repo_folder}" ]; then ${pkgs.git}/bin/git init --bare ${repo_folder} chown -R git-puppy-priv:git-puppy-priv ${repo_folder} diff --git a/hosts/vulpes/infra/misc.nix b/hosts/vulpes/infra/misc.nix index 264a87b..030ee97 100644 --- a/hosts/vulpes/infra/misc.nix +++ b/hosts/vulpes/infra/misc.nix @@ -31,7 +31,7 @@ in enable = true; settings = { base-url = "https://ntfy.killuaa.dev"; - listen-http = "${pm.net.ipv4.vulpes.addr}:2586"; + listen-http = "0.0.0.0:2586"; behind-proxy = true; }; }; @@ -49,7 +49,7 @@ in DOMAIN = "https://vaultwarden.awoo.ren"; SIGNUPS_ALLOWED = false; ROCKET_LOG = "critical"; - ROCKET_ADDRESS = "${pm.net.ipv4.vulpes.addr}"; + ROCKET_ADDRESS = "0.0.0.0"; ROCKET_PORT = 7474; DATA_FOLDER = "/var/lib/vaultwarden"; WEB_VAULT_FOLDER = "${pkgs.vaultwarden.webvault}/share/vaultwarden/vault"; @@ -60,7 +60,7 @@ in createDatabaseLocally = false; config = { DATABASE_URL = pm.srv.miniflux.db_connection_url; - LISTEN_ADDR = "${pm.net.ipv4.vulpes.addr}:4678"; + LISTEN_ADDR = "0.0.0.0:4678"; OAUTH2_PROVIDER = "oidc"; OAUTH2_CLIENT_ID = "miniflux"; OAUTH2_CLIENT_SECRET = "${pm.srv.miniflux.oauth2_secret}"; @@ -73,7 +73,7 @@ in instances = { tranquil_pds = { smtp = "127.0.0.1:1025"; - listen = "${pm.net.ipv4.vulpes.addr}:1026"; + listen = "0.0.0.0:1026"; }; }; }; @@ -102,7 +102,7 @@ in enable = true; environmentFile = config.sops.secrets.atticd_env.path; settings = { - listen = "${pm.net.ipv4.vulpes.addr}:1090"; + listen = "0.0.0.0:1090"; allowed-hosts = [ "nar.awoo.ren" ]; api-endpoint = "https://nar.awoo.ren/"; database = { diff --git a/hosts/vulpes/infra/postgres.nix b/hosts/vulpes/infra/postgres.nix index 0c4684b..a87f92c 100644 --- a/hosts/vulpes/infra/postgres.nix +++ b/hosts/vulpes/infra/postgres.nix @@ -82,6 +82,13 @@ in login = true; }; } + { + name = "netbird"; + ensureDBOwnership = true; + ensureClauses = { + login = true; + }; + } ]; ensureDatabases = [ "roufpup" @@ -93,6 +100,7 @@ in "atticd" "firefly_iii" "vaultwarden" + "netbird" ]; settings = { listen_addresses = "*"; @@ -113,6 +121,7 @@ in host forgejo forgejo 127.0.0.1/8 scram-sha-256 host coder coder 127.0.0.1/8 scram-sha-256 host firefly_iii firefly_iii 127.0.0.1/8 scram-sha-256 + host netbird netbird 127.0.0.1/8 scram-sha-256 ''; }; @@ -121,11 +130,22 @@ in initialEmail = pm.srv.pgadmin.email; initialPasswordFile = config.sops.secrets.pgadmin_password.path; settings = { - DEFAULT_SERVER = "${pm.net.ipv4.vulpes.addr}"; + DEFAULT_SERVER = "0.0.0.0"; FIXED_BINARY_PATHS = { pg-18 = "${pkgs.postgresql_18_jit}/bin"; }; }; }; }; + systemd = { + services = { + pgadmin = { + after = [ + "netbird-vulpes.service" + "sys-subsystem-net-devices-nb\\x2dvulpes.device" + ]; + requires = [ "netbird-vulpes.service" ]; + }; + }; + }; } diff --git a/hosts/work/core/boot.nix b/hosts/work/core/boot.nix index 426e2a5..2b3a765 100644 --- a/hosts/work/core/boot.nix +++ b/hosts/work/core/boot.nix @@ -7,7 +7,7 @@ "btrfs" ]; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_6_18; kernelParams = [ "preempt=full" "amdgpu.ppfeaturemask=0xffffffff" diff --git a/hosts/work/core/packages.nix b/hosts/work/core/packages.nix index 6007749..537534a 100644 --- a/hosts/work/core/packages.nix +++ b/hosts/work/core/packages.nix @@ -82,6 +82,7 @@ in }) mangohud moonlight-qt + umu-launcher # Programming rustc @@ -90,6 +91,7 @@ in rustfmt clippy nodejs + pnpm nixd nixfmt schemat diff --git a/hosts/work/default.nix b/hosts/work/default.nix index 8ae4881..8b4479a 100644 --- a/hosts/work/default.nix +++ b/hosts/work/default.nix @@ -133,13 +133,11 @@ in substituters = [ "https://cache.garnix.io" "https://nix-community.cachix.org" - "https://nar.awoo.ren/fluxer_aggregate" ]; trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "fluxer_aggregate:CnMxj4NrSzvt9OTIaP+k5UKajpUTquG3VNUFkO5tba0=" ]; }; gc = { diff --git a/modules/priv b/modules/priv index 9f0ec8b..baf52fe 160000 --- a/modules/priv +++ b/modules/priv @@ -1 +1 @@ -Subproject commit 9f0ec8b02bb011db66ef192e948a786e2625204d +Subproject commit baf52fe10bee392adf89dbac6ae8ee4def60eb6b diff --git a/npins/sources.json b/npins/sources.json index 8c96f21..62a4ccf 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "main", "submodules": false, - "revision": "1aa96ece7d3c39aee027b126005cf401cfb591f2", - "url": "https://github.com/mrshmllow/affinity-nix/archive/1aa96ece7d3c39aee027b126005cf401cfb591f2.tar.gz", - "hash": "sha256-Ebvn8gN4Vw4FJBQZxKm3sV9Cw+/99IwT7U83zIsboN8=" + "revision": "2eb82159e23e76a2d6fe89473fc7b479f60c6076", + "url": "https://github.com/mrshmllow/affinity-nix/archive/2eb82159e23e76a2d6fe89473fc7b479f60c6076.tar.gz", + "hash": "sha256-N6mS4i0c1owGiOXc1y96t2TcYeb3NCCOVlcZqugSN+0=" }, "crane": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "master", "submodules": false, - "revision": "7cf72d978629469c4bd4206b95c402514c1f6000", - "url": "https://github.com/ipetkov/crane/archive/7cf72d978629469c4bd4206b95c402514c1f6000.tar.gz", - "hash": "sha256-SPm9ck7jh3Un9nwPuMGbRU04UroFmOHjLP56T10MOeM=" + "revision": "3fbd73bdd9eb572209fdf094abad19d9b6d147b4", + "url": "https://github.com/ipetkov/crane/archive/3fbd73bdd9eb572209fdf094abad19d9b6d147b4.tar.gz", + "hash": "sha256-P7TLDtRgAxmo0Bdw8fkJrrBpX/8/WhO6Bm/uCfl6jXY=" }, "crate2nix": { "type": "Git", @@ -115,9 +115,9 @@ }, "branch": "main", "submodules": false, - "revision": "32bd6d54d805a3eb41efa62a940eeceaf263c4a8", - "url": "https://github.com/feel-co/hjem/archive/32bd6d54d805a3eb41efa62a940eeceaf263c4a8.tar.gz", - "hash": "sha256-W+kpLQ5J/DDaY1nUmvN9aIAfh5ixdyqYM76ZUdcvMBU=" + "revision": "3828faa3b6c14d4e557866db01d06137f33ad9f8", + "url": "https://github.com/feel-co/hjem/archive/3828faa3b6c14d4e557866db01d06137f33ad9f8.tar.gz", + "hash": "sha256-xjJpa+PGjB2lZi1saUU+ubWw5+FpAud/T0/jC1gLL1A=" }, "hjem-rum": { "type": "Git", @@ -140,9 +140,9 @@ }, "branch": "master", "submodules": false, - "revision": "29d2cca7fc3841708c1d48e2d1272f79db1538b6", - "url": "https://github.com/nix-community/lanzaboote/archive/29d2cca7fc3841708c1d48e2d1272f79db1538b6.tar.gz", - "hash": "sha256-mWn8D/oXXAaqeFFFRorKHvTLw5V9M8eYzAWRr4iffag=" + "revision": "18e9e64bae15b828c092658335599122a6db939b", + "url": "https://github.com/nix-community/lanzaboote/archive/18e9e64bae15b828c092658335599122a6db939b.tar.gz", + "hash": "sha256-TC6yzbCAex1pDfqUZv9u8fVm8e17ft5fNrcZ0JRDOIQ=" }, "nix-index": { "type": "Git", @@ -178,9 +178,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "4c1018dae018162ec878d42fec712642d214fdfa", - "url": "https://github.com/NixOS/nixpkgs/archive/4c1018dae018162ec878d42fec712642d214fdfa.tar.gz", - "hash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=" + "revision": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "url": "https://github.com/NixOS/nixpkgs/archive/4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9.tar.gz", + "hash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=" }, "nixpkgs-master": { "type": "Git", @@ -191,9 +191,9 @@ }, "branch": "master", "submodules": false, - "revision": "f35eaac5f6572939b7ac15a422dd52690b61a55e", - "url": "https://github.com/NixOS/nixpkgs/archive/f35eaac5f6572939b7ac15a422dd52690b61a55e.tar.gz", - "hash": "sha256-52AHykR9ndjjDDO3CqafKndrm1qSjn3d6SQ0VPo7ca0=" + "revision": "47f0bfeb3b2a4bb10f8f7ade2ad6181ee753de3c", + "url": "https://github.com/NixOS/nixpkgs/archive/47f0bfeb3b2a4bb10f8f7ade2ad6181ee753de3c.tar.gz", + "hash": "sha256-qgoDM/jiT1HdQhfN1hTaSqII5UVOPcO1CfLDt28omWQ=" }, "nixpkgs-xr": { "type": "Git", @@ -204,9 +204,9 @@ }, "branch": "main", "submodules": false, - "revision": "c374d05f3bacec9a2f50f4c5621d851751d480a2", - "url": "https://github.com/nix-community/nixpkgs-xr/archive/c374d05f3bacec9a2f50f4c5621d851751d480a2.tar.gz", - "hash": "sha256-k7MaB2xZH7i3JB+ESIkHuAOXpRcNOD6ELeuXWiVJvCk=" + "revision": "40bb99d154d683c175853dffd838e0b2ef2f92b8", + "url": "https://github.com/nix-community/nixpkgs-xr/archive/40bb99d154d683c175853dffd838e0b2ef2f92b8.tar.gz", + "hash": "sha256-fAl9h5MeWOL5xgP+g4UF+yfNUZhcmsZ+kC5XHM/QFD4=" }, "nur": { "type": "Git", @@ -217,9 +217,9 @@ }, "branch": "main", "submodules": false, - "revision": "cdfa6c19630b3ac5ed8ff973568fcb8519cc7062", - "url": "https://github.com/nix-community/NUR/archive/cdfa6c19630b3ac5ed8ff973568fcb8519cc7062.tar.gz", - "hash": "sha256-JNfqMOM/4RZEeCUvQbjH1fNMOv3F4IMlS0oWzwpm7eM=" + "revision": "f42d87effcdce034096e7446ba8d99e50a609361", + "url": "https://github.com/nix-community/NUR/archive/f42d87effcdce034096e7446ba8d99e50a609361.tar.gz", + "hash": "sha256-IcM//BbehNjkx27ylghZtUVtotPOa16e6s/bvBkErrQ=" }, "rust-overlay": { "type": "Git", @@ -230,9 +230,9 @@ }, "branch": "master", "submodules": false, - "revision": "3c27f4c92a7d977556dd2c10bb564d9c61b375e9", - "url": "https://github.com/oxalica/rust-overlay/archive/3c27f4c92a7d977556dd2c10bb564d9c61b375e9.tar.gz", - "hash": "sha256-/f/6/1WOfBJaGMfqV3VxWD9lpFRbPpF+Cx4MO+0mGok=" + "revision": "e611106c527e8ab0adbb641183cda284411d575c", + "url": "https://github.com/oxalica/rust-overlay/archive/e611106c527e8ab0adbb641183cda284411d575c.tar.gz", + "hash": "sha256-Xq7p+Ex3YHFAd+fFFLOYw2Wv67582X7SAmrEDtIDZQ4=" }, "sops-nix": { "type": "Git", @@ -243,9 +243,9 @@ }, "branch": "master", "submodules": false, - "revision": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", - "url": "https://github.com/Mic92/sops-nix/archive/31ac5fe5d015f76b54058c69fcaebb66a55871a4.tar.gz", - "hash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=" + "revision": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", + "url": "https://github.com/Mic92/sops-nix/archive/d4971dd58c6627bfee52a1ad4237637c0a2fb0cd.tar.gz", + "hash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=" }, "stash": { "type": "Git", @@ -269,9 +269,9 @@ }, "branch": "master", "submodules": false, - "revision": "f64dbe713c610910a091bce70ce56c7f68556b6b", + "revision": "956f97c314517efbfa18d04ce8e0234e6609a30a", "url": null, - "hash": "sha256-FIzyZqcHL27vOioLVf1cVKFkCtWWm3ny7gLPqcLERwM=" + "hash": "sha256-bUR/cHqZP1zigWCo59KFF+F6UDuGM9q5CiFHdvnvSO8=" }, "tranquil_pds": { "type": "Git", @@ -281,9 +281,9 @@ }, "branch": "main", "submodules": false, - "revision": "cdbbaaccdf85093c50797281f3e08b6f4f90901b", + "revision": "7edb76507bade77319c06eb1ed515febbd5ed310", "url": null, - "hash": "sha256-F2/rG0fzaAA5cjfM1bG8JCZ2o7yYpkUy+XgCurvIUVM=" + "hash": "sha256-9IjgABNXj2+bTFTUco5yEA6l2vrMrpzAWImrPMFWHMA=" }, "wire": { "type": "Git", diff --git a/packages/fluxer_nix_v2/apps/aggregate.nix b/packages/fluxer_nix_v2/apps/aggregate.nix index 64cb572..d952c90 100644 --- a/packages/fluxer_nix_v2/apps/aggregate.nix +++ b/packages/fluxer_nix_v2/apps/aggregate.nix @@ -98,8 +98,8 @@ import "${toString sources.crate2nix.outPath}/lib/build-from-json.nix" rec { channel_common = ( _: { FLUXER_CHANNEL_PROTO_DIR = "${src}/services/channel/proto"; - FLUXER_CHANNEL_GATEWAY_PROTO_DIR = "${src}/services/gateway/proto"; - FLUXER_CHANNEL_AUTH_PROTO_DIR = "${src}/services/authentication/proto"; + FLUXER_GATEWAY_PROTO_DIR = "${src}/services/gateway/proto"; + FLUXER_AUTH_PROTO_DIR = "${src}/services/authentication/proto"; } ); platform_bans_common = ( @@ -145,7 +145,7 @@ import "${toString sources.crate2nix.outPath}/lib/build-from-json.nix" rec { ); read_state_common = ( _: { - FLUXER_LOCAL_READ_STATE_PROTO_DIR = "${src}/services/read_state/proto"; + FLUXER_READ_STATE_PROTO_DIR = "${src}/services/read_state/proto"; FLUXER_GATEWAY_PROTO_DIR = "${src}/services/gateway/proto"; FLUXER_AUTH_PROTO_DIR = "${src}/services/authentication/proto"; } @@ -193,7 +193,7 @@ import "${toString sources.crate2nix.outPath}/lib/build-from-json.nix" rec { ); gateway_dispatch_encoder = ( _: { - FLUXER_GATEWAY_DISPATCH_ENCODER_PROTO_DIR = "${src}/services/gateway/proto"; + FLUXER_GATEWAY_PROTO_DIR = "${src}/services/gateway/proto"; } ); unfurl_common = ( @@ -242,7 +242,7 @@ import "${toString sources.crate2nix.outPath}/lib/build-from-json.nix" rec { FLUXER_MARKETING_SITE_STATIC_DIR = "1"; preConfigure = '' - ln -sf ${src}/infrastructure/static ./infra_static + ln -sf ${src}/infrastructure/static ./static_dir ''; } ); @@ -266,7 +266,7 @@ import "${toString sources.crate2nix.outPath}/lib/build-from-json.nix" rec { ); fluxer_setup_wizard = ( _: { - FLUXER_SETUP_WIZARD_SERVICES_DIR = "${src}/services"; + FLUXER_SERVICES_DIR = "${src}/services"; } ); };