diff --git a/.envrc b/.envrc index fc168eae..bcb631eb 100644 --- a/.envrc +++ b/.envrc @@ -4,6 +4,7 @@ fi export NH_NOM=1 export NH_LOG=nh=info -export NH_FLAKE=$(pwd) +NH_FLAKE=$(pwd) +export NH_FLAKE use flake . --accept-flake-config diff --git a/.nvim.lua b/.nvim.lua new file mode 100644 index 00000000..db8fb634 --- /dev/null +++ b/.nvim.lua @@ -0,0 +1,28 @@ +local nvim_lsp = require("lspconfig") +nvim_lsp.nixd.setup({ + cmd = { "nixd" }, + settings = { + nixd = { + nixpkgs = { + expr = "import { }", + }, + formatting = { + command = { "treefmt" }, + }, + options = { + nixos = { + expr = "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.zaphod.options", + }, + home_manager = { + expr = "(builtins.getFlake (builtins.toString ./.)).nixosConfigurations.zaphod.options.home-manager.users.type.getSubOptions []", + }, + flake_parts = { + expr = "(builtins.getFlake (builtins.toString ./.)).debug.options", + }, + flake_parts_perSystem = { + expr = "(builtins.getFlake (builtins.toString ./.)).currentSystem.options", + }, + }, + }, + }, +}) diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 00000000..a542575b --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1 @@ +disable=SC2148 diff --git a/Justfile b/Justfile index 2e17b80d..201b391f 100644 --- a/Justfile +++ b/Justfile @@ -2,8 +2,8 @@ alias b := build alias s := switch build: - nixos-rebuild-ng build --flake . --accept-flake-config --verbose --show-trace \ - && nvd diff /run/current-system result + nixos-rebuild-ng build --flake . --accept-flake-config --verbose --show-trace \ + && nvd diff /run/current-system result switch: - nixos-rebuild-ng switch --flake . --accept-flake-config --verbose --show-trace --sudo + nixos-rebuild-ng switch --flake . --accept-flake-config --verbose --show-trace --sudo diff --git a/README.md b/README.md index 3bf693d8..d21c51e3 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,43 @@ # PyroConf, a custom Nix config ## No Place Like ~ -This is PyroNet's (relatively) production-grade NixOS config repo. It contains configurations for 3 different machines, as well as `home-manager` configurations. -I try to keep the configuration organized. All home-manager related items go in `/home`, host configurations go in `/hosts`, and custom packages are in `/pkgs`, among other folders. +This is PyroNet's (relatively) production-grade NixOS config repo. It contains configurations for 3 different machines, +as well as `home-manager` configurations. -My machines serve production infra for *.pyrox.dev domains. There are a few exceptions: -* [My blog](https://blog.pyrox.dev), and the [root domain](https://pyrox.dev) which are served by [OMG.LOL](https://omg.lol). -I highly recommend their services, as you get a great domain name at a company that cares about you. If you do sign up, consider using [my referral link](https://omg.lol?refer=py), as I get 3 months of service credit if you sign up through it. +I try to keep the configuration organized. All home-manager related items go in `/home`, host configurations go in +`/hosts`, and custom packages are in `/pkgs`, among other folders. + +My machines serve production infra for \*.pyrox.dev domains. There are a few exceptions: + +- [My blog](https://blog.pyrox.dev), and the [root domain](https://pyrox.dev) which are served by + [OMG.LOL](https://omg.lol). I highly recommend their services, as you get a great domain name at a company that cares + about you. If you do sign up, consider using [my referral link](https://omg.lol?refer=py), as I get 3 months of + service credit if you sign up through it. There are some services I run that many homelabs do not. They are: -* Authoritative DNS for my domains, run on `prefect`. -* A Tailscale tunnel from `marvin` to `prefect` which allows me to run services on `marvin` while having them be externally accessible. -* Email services for my domains, also run on `prefect`, with all email data backed up hourly to `marvin`, ensuring data reliability. -* Connections to the [DN42](https://dn42.us) network, run on `prefect`. + +- Authoritative DNS for my domains, run on `prefect`. +- A Tailscale tunnel from `marvin` to `prefect` which allows me to run services on `marvin` while having them be + externally accessible. +- Email services for my domains, also run on `prefect`, with all email data backed up hourly to `marvin`, ensuring data + reliability. +- Connections to the [DN42](https://dn42.us) network, run on `prefect`. I also run many typical homelab services, such as: -* [Vaultwarden](https://github.com/danigarcia/vaultwarden) for passwords -* [Jellyfin](https://jellyfin.org) for media -* [Authentik](https://goauthentik.io) for central auth -* And many more + +- [Vaultwarden](https://github.com/danigarcia/vaultwarden) for passwords +- [Jellyfin](https://jellyfin.org) for media +- [Authentik](https://goauthentik.io) for central auth +- And many more # Contact -If you have any questions about any of the services I run, or would like to reach out, my contact info is on my profile [here](https://pyrox.dev) + +If you have any questions about any of the services I run, or would like to reach out, my contact info is on my profile +[here](https://pyrox.dev) # License -Copyright (c) 2023 Pyrox and PyroNet. All rights reserved. -This Source Code Form is subject to the terms of the Mozilla Public -License, v. 2.0. If a copy of the MPL was not distributed with this -file, You can obtain one at . + +Copyright (c) 2023 Pyrox and PyroNet. All rights reserved. This Source Code Form is subject to the terms of the Mozilla +Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at +. diff --git a/devShells/default.nix b/devShells/default.nix index 8f9d68fb..3e66168f 100644 --- a/devShells/default.nix +++ b/devShells/default.nix @@ -1,7 +1,4 @@ -{ - ... -}: -{ +_: { perSystem = { pkgs, ... }: { diff --git a/flake.lock b/flake.lock index d09297a2..0d6ed6a8 100644 --- a/flake.lock +++ b/flake.lock @@ -688,7 +688,8 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stalwart-fix": "nixpkgs-stalwart-fix", "quickshell": "quickshell", - "tangled": "tangled" + "tangled": "tangled", + "treefmt-nix": "treefmt-nix" } }, "sqlite-lib-src": { @@ -790,6 +791,26 @@ "type": "git", "url": "https://tangled.org/@tangled.org/core" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 147bc808..636f5606 100644 --- a/flake.nix +++ b/flake.nix @@ -94,6 +94,10 @@ tangled = { url = "git+https://tangled.org/@tangled.org/core"; }; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -108,6 +112,7 @@ imports = [ inputs.easy-hosts.flakeModule inputs.home-manager.flakeModules.home-manager + inputs.treefmt-nix.flakeModule ./packages ./lib ./overlays @@ -126,7 +131,6 @@ # Per-system stuff perSystem = { - pkgs, system, ... }: @@ -141,7 +145,29 @@ allowUnfree = true; }; }; - formatter = pkgs.nixfmt; + treefmt = { + programs = { + deadnix = { + enable = true; + no-underscore = true; + }; + jsonfmt.enable = true; + jsonfmt.excludes = [ ".zed/settings.json" ]; + just.enable = true; + keep-sorted.enable = true; + mdformat.enable = true; + mdformat.settings.wrap = 120; + nixf-diagnose.enable = true; + nixfmt.enable = true; + nixfmt.indent = 2; + nixfmt.width = 120; + shellcheck.enable = true; + statix.enable = true; + stylua.enable = true; + taplo.enable = true; + yamlfmt.enable = true; + }; + }; }; # Enable debugging for nixd debug = true; diff --git a/homeModules/profiles/cli/rbw-config.json b/homeModules/profiles/cli/rbw-config.json index 13817d89..3d101326 100644 --- a/homeModules/profiles/cli/rbw-config.json +++ b/homeModules/profiles/cli/rbw-config.json @@ -1 +1,7 @@ -{"email":"pyrox@pyrox.dev","base_url":"https://bw.pyrox.dev","identity_url":null,"lock_timeout":3600,"pinentry":"pinentry"} +{ + "email": "pyrox@pyrox.dev", + "base_url": "https://bw.pyrox.dev", + "identity_url": null, + "lock_timeout": 3600, + "pinentry": "pinentry" +} diff --git a/homeModules/profiles/desktop/default.nix b/homeModules/profiles/desktop/default.nix index 9f74aed9..0da0cd14 100644 --- a/homeModules/profiles/desktop/default.nix +++ b/homeModules/profiles/desktop/default.nix @@ -6,7 +6,7 @@ }: let cfg = config.py.profiles.desktop; - shell = cfg.shell; + inherit (cfg) shell; inherit (lib) mkIf mkDefault mkEnableOption; in { @@ -22,12 +22,12 @@ in }; caelestia = lib.mkOption { type = lib.types.bool; - default = (if (shell == "caelestia") then true else false); + default = if (shell == "caelestia") then true else false; description = "Enable caelestia shell"; }; dms = lib.mkOption { type = lib.types.bool; - default = (if (shell == "dms") then true else false); + default = if (shell == "dms") then true else false; description = "Enable DMS"; }; }; diff --git a/homeModules/programs/caelestia/caelestia-cli.json b/homeModules/programs/caelestia/caelestia-cli.json index 24786db6..9594b010 100644 --- a/homeModules/programs/caelestia/caelestia-cli.json +++ b/homeModules/programs/caelestia/caelestia-cli.json @@ -21,7 +21,9 @@ "class": "equibop" } ], - "command": ["equibop"], + "command": [ + "equibop" + ], "move": true } }, @@ -37,7 +39,11 @@ } } ], - "command": ["ghostty", "-e", "btop"] + "command": [ + "ghostty", + "-e", + "btop" + ] } } } diff --git a/homeModules/programs/caelestia/caelestia-shell.json b/homeModules/programs/caelestia/caelestia-shell.json index d4a0ea97..ac3038ce 100644 --- a/homeModules/programs/caelestia/caelestia-shell.json +++ b/homeModules/programs/caelestia/caelestia-shell.json @@ -128,10 +128,18 @@ }, "general": { "apps": { - "audio": ["pwvucontrol"], - "explorer": ["thunar"], - "playback": ["mpv"], - "terminal": ["ghostty"] + "audio": [ + "pwvucontrol" + ], + "explorer": [ + "thunar" + ], + "playback": [ + "mpv" + ], + "terminal": [ + "ghostty" + ] }, "battery": { "criticalLevel": 3, @@ -167,7 +175,10 @@ "actionPrefix": ">", "actions": [ { - "command": ["autocomplete", "calc"], + "command": [ + "autocomplete", + "calc" + ], "dangerous": false, "description": "Do simple math equations (powered by Qalc)", "enabled": true, @@ -178,7 +189,10 @@ "name": "Wallpaper", "icon": "image", "description": "Change the current wallpaper", - "command": ["autocomplete", "wallpaper"], + "command": [ + "autocomplete", + "wallpaper" + ], "enabled": true, "dangerous": false }, @@ -186,12 +200,19 @@ "name": "Random", "icon": "casino", "description": "Switch to a random wallpaper", - "command": ["caelestia", "wallpaper", "-r"], + "command": [ + "caelestia", + "wallpaper", + "-r" + ], "enabled": true, "dangerous": false }, { - "command": ["systemctl", "poweroff"], + "command": [ + "systemctl", + "poweroff" + ], "dangerous": true, "description": "Shutdown the system", "enabled": true, @@ -199,7 +220,10 @@ "name": "Shutdown" }, { - "command": ["systemctl", "reboot"], + "command": [ + "systemctl", + "reboot" + ], "dangerous": true, "description": "Reboot the system", "enabled": true, @@ -207,7 +231,11 @@ "name": "Reboot" }, { - "command": ["loginctl", "terminate-user", ""], + "command": [ + "loginctl", + "terminate-user", + "" + ], "dangerous": true, "description": "Log out of the current session", "enabled": true, @@ -215,7 +243,10 @@ "name": "Logout" }, { - "command": ["loginctl", "lock-session"], + "command": [ + "loginctl", + "lock-session" + ], "dangerous": false, "description": "Lock the current session", "enabled": true, @@ -223,7 +254,10 @@ "name": "Lock" }, { - "command": ["systemctl", "suspend"], + "command": [ + "systemctl", + "suspend" + ], "dangerous": false, "description": "Suspend", "enabled": true, @@ -287,10 +321,22 @@ }, "session": { "commands": { - "hibernate": ["systemctl", "suspend"], - "logout": ["loginctl", "terminate-user"], - "reboot": ["systemctl", "reboot"], - "shutdown": ["systemctl", "poweroff"] + "hibernate": [ + "systemctl", + "suspend" + ], + "logout": [ + "loginctl", + "terminate-user" + ], + "reboot": [ + "systemctl", + "reboot" + ], + "shutdown": [ + "systemctl", + "poweroff" + ] }, "dragThreshold": 30, "enabled": true, diff --git a/homeModules/programs/helix/default.nix b/homeModules/programs/helix/default.nix index 20cfa2fa..7c63b636 100644 --- a/homeModules/programs/helix/default.nix +++ b/homeModules/programs/helix/default.nix @@ -5,7 +5,7 @@ in { options.py.programs.helix.enable = lib.mkEnableOption "helix editor"; config.catppuccin.helix = { - enable = cfg.enable; + inherit (cfg) enable; useItalics = cfg.enable; }; config.programs.helix = lib.mkIf cfg.enable { diff --git a/homeModules/wayland/default.nix b/homeModules/wayland/default.nix index ef5f2529..f46d9118 100644 --- a/homeModules/wayland/default.nix +++ b/homeModules/wayland/default.nix @@ -7,7 +7,6 @@ }: let c = osConfig.py.programs.hyprland; - cfg = config.wayland.windowManager.hyprland; in { imports = [ @@ -17,14 +16,14 @@ in config = { catppuccin.hyprland.enable = c.enable; wayland.windowManager.hyprland = { - enable = c.enable; + inherit (c) enable; # Per https://nix-community.github.io/home-manager/options.xhtml#opt-wayland.windowManager.hyprland.package package = null; systemd = { enable = true; enableXdgAutostart = true; }; - settings = (import ./settings.nix { inherit lib config; }); + settings = import ./settings.nix { inherit lib config; }; plugins = [ pkgs.hyprlandPlugins.hy3 ]; diff --git a/homeModules/wayland/settings.nix b/homeModules/wayland/settings.nix index 1579a1b0..db13c7c1 100644 --- a/homeModules/wayland/settings.nix +++ b/homeModules/wayland/settings.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let - shell = config.py.profiles.desktop.shell; - keybinds = (import ./keybindings.nix { inherit lib shell; }); + inherit (config.py.profiles.desktop) shell; + keybinds = import ./keybindings.nix { inherit lib shell; }; monitors = import ./monitors.nix; variables = import ./variables.nix; plugins = import ./plugins.nix; diff --git a/hosts/marvin/services/nextcloud/office.nix b/hosts/marvin/services/nextcloud/office.nix index 3abccef2..eee382f9 100644 --- a/hosts/marvin/services/nextcloud/office.nix +++ b/hosts/marvin/services/nextcloud/office.nix @@ -5,7 +5,7 @@ in { services.collabora-online = { enable = true; - port = d.port; + inherit (d) port; settings = { ssl.enable = false; ssl.termination = true; diff --git a/hosts/marvin/services/pinchflat.nix b/hosts/marvin/services/pinchflat.nix index ba5fa17c..96acc4d1 100644 --- a/hosts/marvin/services/pinchflat.nix +++ b/hosts/marvin/services/pinchflat.nix @@ -12,7 +12,7 @@ in { services.pinchflat = { enable = true; - port = d.port; + inherit (d) port; secretsFile = age.pinchflat-secrets.path; mediaDir = "/var/media/youtube"; extraConfig = { diff --git a/hosts/marvin/services/pingvin-share.nix b/hosts/marvin/services/pingvin-share.nix index f603a995..a188ffd5 100644 --- a/hosts/marvin/services/pingvin-share.nix +++ b/hosts/marvin/services/pingvin-share.nix @@ -69,7 +69,7 @@ in }; users.users.pingvin = { uid = 962; - group = cfg.group; + inherit (cfg) group; isSystemUser = true; }; users.groups.pingvin = { @@ -125,6 +125,6 @@ in age.secrets.pingvin-secrets = { file = ./secrets/pingvin-secrets.age; owner = cfg.user; - group = cfg.group; + inherit (cfg) group; }; } diff --git a/hosts/marvin/services/prosody.nix b/hosts/marvin/services/prosody.nix index 7e23ee34..e826f244 100644 --- a/hosts/marvin/services/prosody.nix +++ b/hosts/marvin/services/prosody.nix @@ -1,12 +1,3 @@ -{ - # deadnix: skip - config, - # deadnix: skip - pkgs, - # deadnix: skip - lib, - ... -}: { services.prosody = { enable = true; diff --git a/hosts/marvin/services/scrutiny.nix b/hosts/marvin/services/scrutiny.nix index 62e454a5..3ace281d 100644 --- a/hosts/marvin/services/scrutiny.nix +++ b/hosts/marvin/services/scrutiny.nix @@ -9,7 +9,7 @@ in settings = { web = { listen = { - port = d.port; + inherit (d) port; }; influxdb.tls.insecure_skip_verify = true; }; diff --git a/hosts/marvin/services/vaultwarden.nix b/hosts/marvin/services/vaultwarden.nix index ff336eb1..84a12eae 100644 --- a/hosts/marvin/services/vaultwarden.nix +++ b/hosts/marvin/services/vaultwarden.nix @@ -1,5 +1,4 @@ { - pkgs, config, self, self', diff --git a/hosts/prefect/default.nix b/hosts/prefect/default.nix index d97c4785..e10388b6 100644 --- a/hosts/prefect/default.nix +++ b/hosts/prefect/default.nix @@ -1,6 +1,5 @@ { pkgs, - system, inputs, ... }: diff --git a/hosts/prefect/dn42/services.nix b/hosts/prefect/dn42/services.nix index 468c9d77..8d5902c1 100644 --- a/hosts/prefect/dn42/services.nix +++ b/hosts/prefect/dn42/services.nix @@ -47,9 +47,7 @@ in + lib.concatStrings ( builtins.map ( x: - "\n protocol bgp ${x.name} from dnpeers {\n ${ - if x.multihop then "multihop;" else "" - }\n ${ + "\n protocol bgp ${x.name} from dnpeers {\n ${if x.multihop then "multihop;" else ""}\n ${ if x.gracefulRestart then "graceful restart on;" else "" }\n neighbor ${x.neigh} as ${x.as};\n ${ if x.multi || x.v4 then diff --git a/hosts/prefect/dn42/tunnels.nix b/hosts/prefect/dn42/tunnels.nix index be0197bf..809227e1 100644 --- a/hosts/prefect/dn42/tunnels.nix +++ b/hosts/prefect/dn42/tunnels.nix @@ -1,7 +1,6 @@ { tunnel, ... }: let - # deadnix: skip - defaultPubKey = "e6kp9sca4XIzncKa9GEQwyOnMjje299Xg9ZdgXWMwHg="; + # _defaultPubKey = "e6kp9sca4XIzncKa9GEQwyOnMjje299Xg9ZdgXWMwHg="; defaultPrivKeyFile = "/run/agenix/dn42-privkey"; defaultLocalIPv4 = "172.20.43.96"; in @@ -9,16 +8,14 @@ in wg42_chris = # Ports 485-486 available - tunnel 487 defaultPrivKeyFile "itmJ4Z8V1aNN368P6kMzuQM+GdzWbBKZjJiXrgSeGlw=" defaultLocalIPv4 - "fe80::100" + tunnel 487 defaultPrivKeyFile "itmJ4Z8V1aNN368P6kMzuQM+GdzWbBKZjJiXrgSeGlw=" defaultLocalIPv4 "fe80::100" "us-qas01.dn42.tech9.io:52322" "wg42_chris" "172.20.16.143" "fe80::1588"; wg42_kioubit = - tunnel 488 defaultPrivKeyFile "6Cylr9h1xFduAO+5nyXhFI1XJ0+Sw9jCpCDvcqErF1s=" defaultLocalIPv4 - "fe80::3" + tunnel 488 defaultPrivKeyFile "6Cylr9h1xFduAO+5nyXhFI1XJ0+Sw9jCpCDvcqErF1s=" defaultLocalIPv4 "fe80::3" "us2.g-load.eu:22459" "wg42_kioubit" "172.20.53.98" @@ -27,25 +24,21 @@ in # Ports 489-490 available wg42_iedon = - tunnel 491 defaultPrivKeyFile "Sz0UhewjDk2yRKI0QL9rB+5daWpXFVlbbz9cLfVVLn4=" defaultLocalIPv4 - "fe80::6" + tunnel 491 defaultPrivKeyFile "Sz0UhewjDk2yRKI0QL9rB+5daWpXFVlbbz9cLfVVLn4=" defaultLocalIPv4 "fe80::6" "us-sjc.dn42.kuu.moe:35470" "wg42_iedon" "172.23.91.117" "fe80::2189:e8"; wg42_sunnet = - tunnel 492 defaultPrivKeyFile "QSAeFPotqFpF6fFe3CMrMjrpS5AL54AxWY2w1+Ot2Bo=" defaultLocalIPv4 - "fe80::abcd" + tunnel 492 defaultPrivKeyFile "QSAeFPotqFpF6fFe3CMrMjrpS5AL54AxWY2w1+Ot2Bo=" defaultLocalIPv4 "fe80::abcd" "v6.lax1-us.dn42.6700.cc:22459" "wg42_sunnet" "172.21.100.193" "fe80::3088:193"; wg42_catgirls = - tunnel 493 defaultPrivKeyFile "jo8eAfY8LeA4FAEJ4laYYMNkMd4z3oO/zN5DN0Mo+RQ=" defaultLocalIPv4 - "fe80::7" - "karx.xyz:22459" + tunnel 493 defaultPrivKeyFile "jo8eAfY8LeA4FAEJ4laYYMNkMd4z3oO/zN5DN0Mo+RQ=" defaultLocalIPv4 "fe80::7" "karx.xyz:22459" "wg42_catgirls" "" "fe80::4242"; @@ -53,32 +46,28 @@ in # Port 494 Available wg42_potato = - tunnel 495 defaultPrivKeyFile "LUwqKS6QrCPv510Pwt1eAIiHACYDsbMjrkrbGTJfviU=" defaultLocalIPv4 - "fe80::9" + tunnel 495 defaultPrivKeyFile "LUwqKS6QrCPv510Pwt1eAIiHACYDsbMjrkrbGTJfviU=" defaultLocalIPv4 "fe80::9" "las.node.potat0.cc:22459" "wg42_potato" "" "fe80::1816"; wg42_uffsalot = - tunnel 496 defaultPrivKeyFile "7V65FxvD9AQetyUr0qSiu+ik8samB4Atrw2ekvC0xQM=" defaultLocalIPv4 - "fe80::10" + tunnel 496 defaultPrivKeyFile "7V65FxvD9AQetyUr0qSiu+ik8samB4Atrw2ekvC0xQM=" defaultLocalIPv4 "fe80::10" "dn42-de-fra4.brand-web.net:42459" "wg42_uffsalot" "172.20.191.129" "fe80::780"; wg42_bandura = - tunnel 497 defaultPrivKeyFile "xPW1/cWYDkk/IAss1GbdwVMW7fzKtyHA+qrfCriOB2k=" defaultLocalIPv4 - "fe80::11" + tunnel 497 defaultPrivKeyFile "xPW1/cWYDkk/IAss1GbdwVMW7fzKtyHA+qrfCriOB2k=" defaultLocalIPv4 "fe80::11" "aurora.mk16.de:52459" "wg42_bandura" "" "fe80::2926"; wg42_bluemedia = - tunnel 498 defaultPrivKeyFile "7HNg2+uMI2WfntN+WlMnlTDG6xra/Dusee82cuXWMBY=" defaultLocalIPv4 - "fe80::12" + tunnel 498 defaultPrivKeyFile "7HNg2+uMI2WfntN+WlMnlTDG6xra/Dusee82cuXWMBY=" defaultLocalIPv4 "fe80::12" "de-fra01.dn42.bluemedia.dev:22459" "wg42_bluemedia" "172.22.167.82" diff --git a/hosts/prefect/dn42/wireguard.nix b/hosts/prefect/dn42/wireguard.nix index 5bc3f60b..a0730b42 100644 --- a/hosts/prefect/dn42/wireguard.nix +++ b/hosts/prefect/dn42/wireguard.nix @@ -3,57 +3,41 @@ let defaultLocalIPv4 = "172.20.43.96/32"; defaultLocalIPv6 = "fe80::1/64"; privKeyFile = "/run/agenix/dn42-privkey"; - # deadnix: skip - defaultPubKey = "e6kp9sca4XIzncKa9GEQwyOnMjje299Xg9ZdgXWMwHg="; + # _defaultPubKey = "e6kp9sca4XIzncKa9GEQwyOnMjje299Xg9ZdgXWMwHg="; in { environment.systemPackages = [ pkgs.wireguard-tools ]; networking.wireguard.interfaces = import ./tunnels.nix rec { - customTunnel = - listenPort: privKeyFile: peerPubKey: endpoint: name: peerIPv4: peerIPv6: localIPv4: localIPv6: isOspf: { - inherit listenPort; - privateKeyFile = privKeyFile; - allowedIPsAsRoutes = false; - peers = [ - { - inherit endpoint; - publicKey = peerPubKey; - allowedIPs = [ - "0.0.0.0/0" - "::/0" - ]; - dynamicEndpointRefreshSeconds = 5; - persistentKeepalive = 15; - } - ]; - postSetup = - '' - ${ - if peerIPv4 != "" then - "${pkgs.iproute2}/bin/ip addr add ${localIPv4} peer ${peerIPv4} dev ${name}" - else - "" - } - ${ - if peerIPv6 != "" then - "${pkgs.iproute2}/bin/ip -6 addr add ${localIPv6} peer ${peerIPv6} dev ${name}" - else - "" - } - '' - + lib.optionalString isOspf "${pkgs.iproute2}/bin/ip -6 addr add ${defaultLocalIPv6} dev ${name}"; - }; + customTunnel = listenPort: privKeyFile: peerPubKey: endpoint: name: peerIPv4: peerIPv6: localIPv4: localIPv6: isOspf: { + inherit listenPort; + privateKeyFile = privKeyFile; + allowedIPsAsRoutes = false; + peers = [ + { + inherit endpoint; + publicKey = peerPubKey; + allowedIPs = [ + "0.0.0.0/0" + "::/0" + ]; + dynamicEndpointRefreshSeconds = 5; + persistentKeepalive = 15; + } + ]; + postSetup = '' + ${if peerIPv4 != "" then "${pkgs.iproute2}/bin/ip addr add ${localIPv4} peer ${peerIPv4} dev ${name}" else ""} + ${if peerIPv6 != "" then "${pkgs.iproute2}/bin/ip -6 addr add ${localIPv6} peer ${peerIPv6} dev ${name}" else ""} + '' + + lib.optionalString isOspf "${pkgs.iproute2}/bin/ip -6 addr add ${defaultLocalIPv6} dev ${name}"; + }; # deadnix: skip tunnel = - listenPort: privKey: peerPubKey: localIPv4: localIPv6: endpoint: name: peerIPv4: peerIPv6: - customTunnel listenPort privKeyFile peerPubKey endpoint name peerIPv4 peerIPv6 localIPv4 localIPv6 - false; + listenPort: _privKey: peerPubKey: localIPv4: localIPv6: endpoint: name: peerIPv4: peerIPv6: + customTunnel listenPort privKeyFile peerPubKey endpoint name peerIPv4 peerIPv6 localIPv4 localIPv6 false; # deadnix: skip ospf = - listenPort: privKey: peerPubKey: endpoint: name: peerIPv4: peerIPv6: ULAIPv6: - customTunnel listenPort privKeyFile peerPubKey endpoint name peerIPv4 peerIPv6 defaultLocalIPv4 - ULAIPv6 - true; + listenPort: _privKey: peerPubKey: endpoint: name: peerIPv4: peerIPv6: ULAIPv6: + customTunnel listenPort privKeyFile peerPubKey endpoint name peerIPv4 peerIPv6 defaultLocalIPv4 ULAIPv6 true; }; } diff --git a/hosts/prefect/secrets/secrets.nix b/hosts/prefect/secrets/secrets.nix index 70fe5bdc..0b45a162 100644 --- a/hosts/prefect/secrets/secrets.nix +++ b/hosts/prefect/secrets/secrets.nix @@ -1,6 +1,5 @@ let yubi-back = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTVGi3PItsbUhFgnFZlqo1iUggL4npMg94+9FsyhEPfShcQwJK2/jJzjv5S9KPuk3cY7aoqyVFLbnasSBZPXmscJmOiVNvtWvHoC3QPXvf3IAcVZ5KOLpY2NJlPx/pAb31C6ewtg8v3VlyhL4zEp6M+AGwXX51tFDh2GnYD+7SNF+aMhKCrX63syAhgPy3F8mZ2RIDLAu+lsYlwdpWRkSEv9kcjX/6+3QgUWjfPBaKEeYID22ihSuj7+AiuAt0gM4q0TY/Hpcx+qDLonrIuBnm1hMZDgbv//D0sHIUxJQkGTKTEbkZxoh0Qri7UV/V6l3mETaG40deuemMU7RFY7Khl8RajNZ+9z0FdquS/HCt8+fYQk6eLneJrMIQ1bI4awrtblG3P2Yf2QUu+H3kfCQe44R3WjUugTbNtumVgyQBzl2dzlIVn1pZBeyZy70XCgbaFKkDR8Y/qZiUoZ0afP3vTOXhkn5UBfutTKwUiSGh3S8Ge5YhNgKHWE2eQp1ckEm0IMJV/q5Nsw/yBBXj/kfD8ekz96LQ+gP5JFLq4EaipXI7FM4aZNOBUZU1l/sCEuq7m997nrBucTKqGm7Ho3rq7bgdj4f6GyUJXSMOM1cN61LLrRumZGGTH8WghVL7ligxZyNFcQoudR8jfpf4mrgRxipQOe1A2umvuufMr+l/bw=="; - yubi-main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBBsOIMMZVmleClXfqUMrnmyh8PFuyiJqHKEZ51Xy746"; prefect = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP532AB5mkNvE29MkDDY8HEf8ZdktGWiI0PzLrvbmLQe"; ssh-new = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAxOg9nOtfbedq9AlnXNVUfyU8Mwfj4IB7HX/4VoWeXP"; default = [ diff --git a/hosts/prefect/services/caddy.nix b/hosts/prefect/services/caddy.nix index 82b6065a..5b0b75ab 100644 --- a/hosts/prefect/services/caddy.nix +++ b/hosts/prefect/services/caddy.nix @@ -1,10 +1,10 @@ { pkgs, self, ... }: let pns = self.lib.data.services; - mail = self.lib.data.mail; + inherit (self.lib.data) mail; marvin = "http://${self.lib.data.hosts.marvin.ts.ip4}"; marvinIP = self.lib.data.hosts.marvin.ts.ip4; - tsNet = self.lib.data.tsNet; + inherit (self.lib.data) tsNet; in { services.caddy = { diff --git a/hosts/prefect/services/mailserver/default.nix b/hosts/prefect/services/mailserver/default.nix index 2e04d9eb..545f0046 100644 --- a/hosts/prefect/services/mailserver/default.nix +++ b/hosts/prefect/services/mailserver/default.nix @@ -8,7 +8,6 @@ let d = self.lib.data.mail; cfg = config.services.stalwart-mail; sec = config.age.secrets; - creds = config.services.stalwart-mail.credentials; credsDir = "/run/credentials/stalwart-mail.service"; certDir = config.security.acme.certs."pyroxdev-mail".directory; isAuthenticated = d: { diff --git a/hosts/thought/secrets/secrets.nix b/hosts/thought/secrets/secrets.nix index 4a741379..38d3c03e 100644 --- a/hosts/thought/secrets/secrets.nix +++ b/hosts/thought/secrets/secrets.nix @@ -1,13 +1,3 @@ -let - # deadnix: skip - yubi-back = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDTVGi3PItsbUhFgnFZlqo1iUggL4npMg94+9FsyhEPfShcQwJK2/jJzjv5S9KPuk3cY7aoqyVFLbnasSBZPXmscJmOiVNvtWvHoC3QPXvf3IAcVZ5KOLpY2NJlPx/pAb31C6ewtg8v3VlyhL4zEp6M+AGwXX51tFDh2GnYD+7SNF+aMhKCrX63syAhgPy3F8mZ2RIDLAu+lsYlwdpWRkSEv9kcjX/6+3QgUWjfPBaKEeYID22ihSuj7+AiuAt0gM4q0TY/Hpcx+qDLonrIuBnm1hMZDgbv//D0sHIUxJQkGTKTEbkZxoh0Qri7UV/V6l3mETaG40deuemMU7RFY7Khl8RajNZ+9z0FdquS/HCt8+fYQk6eLneJrMIQ1bI4awrtblG3P2Yf2QUu+H3kfCQe44R3WjUugTbNtumVgyQBzl2dzlIVn1pZBeyZy70XCgbaFKkDR8Y/qZiUoZ0afP3vTOXhkn5UBfutTKwUiSGh3S8Ge5YhNgKHWE2eQp1ckEm0IMJV/q5Nsw/yBBXj/kfD8ekz96LQ+gP5JFLq4EaipXI7FM4aZNOBUZU1l/sCEuq7m997nrBucTKqGm7Ho3rq7bgdj4f6GyUJXSMOM1cN61LLrRumZGGTH8WghVL7ligxZyNFcQoudR8jfpf4mrgRxipQOe1A2umvuufMr+l/bw=="; - # deadnix: skip - yubi-main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBBsOIMMZVmleClXfqUMrnmyh8PFuyiJqHKEZ51Xy746"; - # deadnix: skip - backup = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCyTiGctsHaTUlRJn2XQ/745dD0UWGWO8W0en8J5rf7BLI8lL/hPUmbNt45vC5754LXcBjnp1t/1FNgiGhvNZIWJpC+elBmhyMhg8z1exRZPD+as7XaH7scnij2vSbSphQFUqH433ggAGe77x5bc7wKFp9n7vj8G1u0JJxMEe1M7kNFY0+ShNtaHna3LxiQOVcW7qVlNKZP8Ol1V7kZLblRADCJMTYOXDIbktA8bbGRfGhbNjJGkL665qz36haYwb2i6A4sC7Y583N8ro8hIDG/ByJqwbl/Sz4rSxkT6G4+OdBvS6sa7TovNXHjmQCculMIltdog7UhgyBsim1sTzxAen3YyFRi1Cz/kLM0oH39m/W4IoMvJcNZCJ3ItLgy+lEVMd87jVOqfuq/hyjHVI0wJtU2Si2HTxv7aKL8gPzqXwbNH+nhkhlQ0ZH8zKVBunOgLDgsmGIky5X/T3bpWZpIoFkOR7AYrId/5dOeGM3pHhHb6woZ3SRubZ43Ah/VdJM="; - # deadnix: skip - thought = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGkJcLykggEp427h2IywoiR74Yl3N+FU6Pwx9ZFQ3vjq"; -in { imports = [ ../../common/secrets/secrets.nix ]; # "headscale-oidc-secret.age".publicKeys = [ prefect yubi-main yubi-back ]; diff --git a/hosts/zaphod/services/misc.nix b/hosts/zaphod/services/misc.nix index 343c47f3..1ac5deec 100644 --- a/hosts/zaphod/services/misc.nix +++ b/hosts/zaphod/services/misc.nix @@ -4,8 +4,7 @@ blueman.enable = false; fstrim.enable = lib.mkDefault true; tlp.enable = lib.mkDefault ( - (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") - || !config.services.power-profiles-daemon.enable + (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05") || !config.services.power-profiles-daemon.enable ); libinput.enable = lib.mkDefault true; logind.settings.Login = { diff --git a/lib/default.nix b/lib/default.nix index 0a7527aa..67d00ab0 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,7 +1,4 @@ -{ - ... -}: -{ +_: { flake = { lib.data = import ./data; }; diff --git a/lib/deploy/default.nix b/lib/deploy/default.nix index e8a95c3e..8e38d801 100644 --- a/lib/deploy/default.nix +++ b/lib/deploy/default.nix @@ -8,7 +8,7 @@ let inherit (inputs) deploy-rs; in -rec { +{ ## Create deployment configuration for use with deploy-rs. ## ## ```nix diff --git a/nixosModules/default-config/programs/nh.nix b/nixosModules/default-config/programs/nh.nix index ded47daa..11aebf1a 100644 --- a/nixosModules/default-config/programs/nh.nix +++ b/nixosModules/default-config/programs/nh.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +_: { programs.nh = { enable = true; clean.enable = true; diff --git a/nixosModules/default.nix b/nixosModules/default.nix index 0990e02e..70e3f9d4 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -1,7 +1,4 @@ -{ - ... -}: -{ +_: { flake.nixosModules = { # Top-level defaultConfig = import ./default-config; diff --git a/nixosModules/programs/misc/default.nix b/nixosModules/programs/misc/default.nix index ebeddb2c..78ee559d 100644 --- a/nixosModules/programs/misc/default.nix +++ b/nixosModules/programs/misc/default.nix @@ -38,11 +38,9 @@ in }; wireshark.enable = mkIf cfg.wireshark.enable true; }; - environment.systemPackages = - [ ] - ++ lib.optionals cfg.steam.enable [ - pkgs.steamtinkerlaunch - pkgs.protonplus - ]; + environment.systemPackages = lib.optionals cfg.steam.enable [ + pkgs.steamtinkerlaunch + pkgs.protonplus + ]; }; } diff --git a/nixosModules/programs/neovim/default.nix b/nixosModules/programs/neovim/default.nix index f3c6b152..6d65389f 100644 --- a/nixosModules/programs/neovim/default.nix +++ b/nixosModules/programs/neovim/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... diff --git a/overlays/cinny/default.nix b/overlays/cinny/default.nix index d18bd510..3c219299 100644 --- a/overlays/cinny/default.nix +++ b/overlays/cinny/default.nix @@ -1,4 +1,4 @@ -_: final: prev: { +_: _final: prev: { cinny-unwrapped = prev.cinny-unwrapped.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./nix-commands.patch ]; }); diff --git a/overlays/hy3-fixes/default.nix b/overlays/hy3-fixes/default.nix index cbae3f85..b8ac368f 100644 --- a/overlays/hy3-fixes/default.nix +++ b/overlays/hy3-fixes/default.nix @@ -1,4 +1,4 @@ -final: prev: { +_final: prev: { hyprlandPlugins = prev.hyprlandPlugins // { hy3 = prev.hyprlandPlugins.hy3.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ diff --git a/overlays/openssh-fixperms/default.nix b/overlays/openssh-fixperms/default.nix index efe93a55..a355016d 100644 --- a/overlays/openssh-fixperms/default.nix +++ b/overlays/openssh-fixperms/default.nix @@ -1,4 +1,4 @@ -final: prev: { +_final: prev: { openssh-patched = prev.openssh.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./permfix.patch ]; doCheck = false; diff --git a/packages/anubis-files/src/policies/forgejo.yaml b/packages/anubis-files/src/policies/forgejo.yaml index f5695f95..d0532d19 100644 --- a/packages/anubis-files/src/policies/forgejo.yaml +++ b/packages/anubis-files/src/policies/forgejo.yaml @@ -7,5 +7,4 @@ bots: - import: (data)/crawlers/internet-archive.yaml - import: (data)/crawlers/kagibot.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/grafana.yaml b/packages/anubis-files/src/policies/grafana.yaml index fdea871b..db404587 100644 --- a/packages/anubis-files/src/policies/grafana.yaml +++ b/packages/anubis-files/src/policies/grafana.yaml @@ -3,5 +3,4 @@ bots: - import: CUSTOM/block/alibaba-cloud.yaml - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/miniflux.yaml b/packages/anubis-files/src/policies/miniflux.yaml index fdea871b..db404587 100644 --- a/packages/anubis-files/src/policies/miniflux.yaml +++ b/packages/anubis-files/src/policies/miniflux.yaml @@ -3,5 +3,4 @@ bots: - import: CUSTOM/block/alibaba-cloud.yaml - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/nextcloud-office.yaml b/packages/anubis-files/src/policies/nextcloud-office.yaml index 70df178a..69237b36 100644 --- a/packages/anubis-files/src/policies/nextcloud-office.yaml +++ b/packages/anubis-files/src/policies/nextcloud-office.yaml @@ -1,13 +1,10 @@ bots: - import: (data)/bots/ai-robots-txt.yaml - import: CUSTOM/block/alibaba-cloud.yaml - # Allow requests from the nextcloud server to bypass checks - name: allow-nextcloud-server user_agent_regex: ^Nextcloud Server / richdocuments$ action: ALLOW - - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/nextcloud.yaml b/packages/anubis-files/src/policies/nextcloud.yaml index 771c1c49..7f72b9a4 100644 --- a/packages/anubis-files/src/policies/nextcloud.yaml +++ b/packages/anubis-files/src/policies/nextcloud.yaml @@ -2,27 +2,22 @@ bots: # Block scrapers and abusive cloud providers - import: (data)/bots/ai-robots-txt.yaml - import: CUSTOM/block/alibaba-cloud.yaml - # Allow android apps that I use - name: allow-android-apps user_agent_regex: Nextcloud-android|DAVx5|ICSx5 action: ALLOW - # Allow the Thunderbird Filelink app - name: allow-thunderbird-filelink user_agent_regex: ^Filelink for \*cloud.*$ action: ALLOW - # Allow anyone accessing the **authenticated** DAV endpoint. - name: allow-dav path_regex: ^/remote.php/dav/.*$ action: ALLOW - # Allow public shares so that I can more easily send them - name: allow-public-shares path_regex: ^/s/.*$ action: ALLOW - # Allow clients to load assets to not break public shares - name: allow-assets action: ALLOW @@ -39,8 +34,6 @@ bots: - 'path.startsWith("/apps/theming/")' # Public DAV endpoint - 'path.startsWith("/public.php/dav/files/")' - - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/pingvin-share.yaml b/packages/anubis-files/src/policies/pingvin-share.yaml index fdea871b..db404587 100644 --- a/packages/anubis-files/src/policies/pingvin-share.yaml +++ b/packages/anubis-files/src/policies/pingvin-share.yaml @@ -3,5 +3,4 @@ bots: - import: CUSTOM/block/alibaba-cloud.yaml - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/planka.yaml b/packages/anubis-files/src/policies/planka.yaml index fdea871b..db404587 100644 --- a/packages/anubis-files/src/policies/planka.yaml +++ b/packages/anubis-files/src/policies/planka.yaml @@ -3,5 +3,4 @@ bots: - import: CUSTOM/block/alibaba-cloud.yaml - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/pocket-id.yaml b/packages/anubis-files/src/policies/pocket-id.yaml index fdea871b..db404587 100644 --- a/packages/anubis-files/src/policies/pocket-id.yaml +++ b/packages/anubis-files/src/policies/pocket-id.yaml @@ -3,5 +3,4 @@ bots: - import: CUSTOM/block/alibaba-cloud.yaml - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/policies/vaultwarden.yaml b/packages/anubis-files/src/policies/vaultwarden.yaml index f12a972a..e068bbc6 100644 --- a/packages/anubis-files/src/policies/vaultwarden.yaml +++ b/packages/anubis-files/src/policies/vaultwarden.yaml @@ -1,7 +1,6 @@ bots: - import: (data)/bots/ai-robots-txt.yaml - import: CUSTOM/block/alibaba-cloud.yaml - # Allow bitwarden apps - name: allow-bitwarden-mobile user_agent_regex: Bitwarden_Mobile @@ -9,8 +8,6 @@ bots: - name: allow-bitwarden-webext user_agent_regex: Mozilla action: ALLOW - - import: (data)/common/keep-internet-working.yaml - import: CUSTOM/challenge/generic-browser.yaml - dnsbl: false diff --git a/packages/anubis-files/src/rules/block/alibaba-cloud.yaml b/packages/anubis-files/src/rules/block/alibaba-cloud.yaml index f8055fb6..fd407628 100644 --- a/packages/anubis-files/src/rules/block/alibaba-cloud.yaml +++ b/packages/anubis-files/src/rules/block/alibaba-cloud.yaml @@ -1,828 +1,3 @@ - name: alibaba-cloud action: DENY - remote_addresses: - [ - "45.196.28.0/24", - "161.117.128.0/17", - "8.209.42.0/23", - "47.89.125.0/24", - "8.222.48.0/20", - "47.79.16.0/21", - "149.129.16.0/23", - "8.212.0.0/17", - "47.89.0.0/19", - "47.240.128.0/17", - "8.213.176.0/20", - "47.77.8.0/22", - "47.79.96.0/19", - "47.246.198.0/23", - "47.91.128.0/17", - "47.89.104.0/21", - "47.89.102.0/24", - "8.222.96.0/19", - "170.33.31.0/24", - "8.215.168.0/24", - "8.222.40.0/21", - "47.235.1.0/24", - "240b:400f::/32", - "170.33.32.0/24", - "8.208.0.0/18", - "47.79.24.0/21", - "47.91.16.0/20", - "47.252.0.0/17", - "8.213.176.0/21", - "8.212.0.0/18", - "8.211.192.0/18", - "47.79.54.0/23", - "47.235.18.0/24", - "47.88.0.0/17", - "43.96.21.0/24", - "47.235.22.0/24", - "240b:4001::/33", - "47.79.64.0/20", - "139.95.4.0/23", - "47.254.128.0/19", - "47.81.64.0/18", - "47.77.128.0/18", - "240b:4009::/33", - "47.246.90.0/23", - "47.89.32.0/19", - "205.204.125.0/24", - "47.79.56.0/23", - "240b:400c:100::/41", - "47.235.26.0/23", - "8.209.64.0/19", - "8.222.16.0/20", - "47.235.12.0/23", - "116.251.64.0/18", - "139.95.64.0/24", - "47.235.31.0/24", - "8.208.32.0/19", - "240b:400c:f00::/48", - "47.235.6.0/24", - "47.246.160.0/21", - "47.246.196.0/22", - "2404:2280:3000::/37", - "47.74.0.0/21", - "240b:4007:8000::/33", - "47.91.0.0/20", - "2400:3200:baba::/48", - "198.11.137.0/24", - "47.84.168.0/21", - "240b:4006:1020::/44", - "149.129.192.0/18", - "8.219.40.0/21", - "43.96.3.0/24", - "240b:4004::/32", - "47.77.64.0/20", - "47.83.48.0/21", - "47.77.104.0/21", - "240b:4001:8000::/33", - "43.96.5.0/24", - "240b:400c:180::/41", - "43.96.25.0/24", - "47.77.96.0/21", - "8.211.160.0/19", - "47.245.32.0/19", - "8.215.0.0/16", - "47.79.32.0/20", - "8.213.160.0/21", - "47.74.0.0/19", - "43.96.4.0/24", - "170.33.75.0/24", - "8.211.128.0/18", - "8.217.0.0/16", - "47.81.0.0/19", - "47.82.96.0/19", - "47.83.56.0/21", - "203.107.64.0/24", - "240b:4006:1020::/45", - "240b:4004::/33", - "47.242.0.0/15", - "47.80.128.0/17", - "8.215.0.0/17", - "240b:4000::/32", - "47.246.192.0/23", - "47.246.176.0/21", - "8.212.224.0/19", - "47.90.0.0/17", - "170.33.107.0/24", - "47.237.32.0/20", - "47.240.0.0/16", - "47.253.0.0/16", - "161.117.0.0/16", - "47.77.12.0/22", - "47.88.128.0/17", - "8.220.147.0/24", - "47.236.0.0/16", - "149.129.192.0/19", - "170.33.73.0/24", - "47.87.160.0/19", - "47.79.0.0/20", - "47.246.153.0/24", - "47.235.29.0/24", - "47.81.128.0/18", - "43.96.35.0/24", - "8.212.128.0/18", - "8.219.0.0/16", - "47.246.155.0/24", - "8.216.64.0/18", - "8.213.253.0/24", - "8.220.116.0/24", - "8.222.128.0/18", - "240b:400e:8000::/33", - "43.96.33.0/24", - "47.77.192.0/18", - "47.81.32.0/19", - "47.77.8.0/21", - "47.79.16.0/20", - "240b:400f:8000::/33", - "47.246.145.0/24", - "47.88.128.0/18", - "170.33.104.0/24", - "8.219.0.0/17", - "47.82.0.0/18", - "139.95.10.0/23", - "47.238.0.0/16", - "240b:4006:1002::/47", - "8.221.188.0/22", - "8.213.251.0/24", - "47.254.192.0/19", - "47.79.32.0/21", - "8.212.128.0/19", - "47.246.83.0/24", - "47.87.64.0/19", - "8.222.192.0/18", - "170.33.68.0/24", - "240b:400c:f01::/48", - "170.33.136.0/24", - "2400:b200:4101::/48", - "2401:8680:4100::/48", - "240b:400c::/32", - "47.89.92.0/22", - "8.223.128.0/18", - "47.89.124.0/23", - "47.74.32.0/19", - "47.244.0.0/17", - "43.96.80.0/24", - "8.211.104.0/21", - "8.213.224.0/19", - "47.86.0.0/17", - "8.222.64.0/21", - "240b:400e::/33", - "161.117.143.0/24", - "47.246.152.0/23", - "47.246.93.0/24", - "240b:4006:1010::/45", - "47.254.224.0/19", - "8.209.40.0/22", - "149.129.64.0/18", - "43.96.20.0/24", - "240b:4000:8000::/33", - "47.251.0.0/16", - "240b:4002::/32", - "8.222.16.0/21", - "203.107.66.0/24", - "8.222.24.0/21", - "47.89.128.0/19", - "240b:400c:8000::/33", - "8.218.128.0/17", - "8.216.128.0/17", - "47.91.128.0/18", - "8.221.64.0/18", - "2404:2280:4000::/36", - "8.211.80.0/21", - "8.217.128.0/17", - "8.220.229.0/24", - "170.33.66.0/24", - "47.237.0.0/16", - "47.235.28.0/23", - "170.33.74.0/24", - "47.90.64.0/18", - "47.246.82.0/23", - "8.209.38.0/23", - "240b:4005:8000::/33", - "8.220.128.0/18", - "139.95.14.0/23", - "8.216.192.0/18", - "8.218.0.0/16", - "47.91.192.0/18", - "8.221.48.0/21", - "149.129.8.0/21", - "43.91.0.0/16", - "8.223.64.0/18", - "8.216.148.0/24", - "8.222.80.0/21", - "2401:b180:4100::/48", - "47.91.0.0/19", - "47.246.154.0/24", - "47.246.152.0/24", - "47.250.64.0/18", - "8.216.128.0/18", - "170.33.72.0/24", - "139.95.12.0/23", - "240b:400c::/40", - "8.221.128.0/18", - "43.96.32.0/24", - "47.90.128.0/17", - "47.251.0.0/17", - "43.96.34.0/24", - "47.245.0.0/18", - "47.85.112.0/23", - "8.209.56.0/21", - "8.213.252.0/24", - "47.77.128.0/17", - "139.95.2.0/23", - "43.96.69.0/24", - "161.117.126.0/24", - "47.75.0.0/16", - "47.89.82.0/23", - "47.89.224.0/19", - "8.209.0.0/20", - "47.246.128.0/22", - "8.221.0.0/21", - "139.95.8.0/23", - "47.253.128.0/17", - "156.236.12.0/24", - "203.107.65.0/24", - "47.241.128.0/17", - "8.222.88.0/21", - "47.87.128.0/18", - "47.254.128.0/18", - "8.221.192.0/18", - "240b:4001::/32", - "47.235.16.0/24", - "240b:4007::/32", - "47.235.13.0/24", - "47.235.24.0/23", - "47.91.80.0/20", - "43.96.11.0/24", - "47.235.5.0/24", - "8.209.160.0/19", - "47.246.88.0/23", - "47.77.4.0/22", - "156.236.17.0/24", - "8.209.224.0/19", - "14.1.115.0/24", - "149.129.96.0/19", - "47.254.192.0/18", - "47.245.192.0/18", - "8.208.0.0/16", - "47.83.0.0/16", - "47.87.96.0/19", - "47.252.64.0/18", - "47.89.192.0/18", - "47.89.122.0/24", - "47.85.114.0/23", - "2404:2280:1000::/36", - "47.81.128.0/17", - "47.246.147.0/24", - "47.87.64.0/18", - "47.235.9.0/24", - "47.52.0.0/17", - "47.246.156.0/22", - "47.246.96.0/22", - "47.74.0.0/18", - "8.214.0.0/17", - "47.246.192.0/22", - "47.246.150.0/24", - "43.91.0.0/17", - "170.33.138.0/24", - "8.213.0.0/18", - "47.90.192.0/18", - "47.85.0.0/16", - "47.235.24.0/22", - "47.235.16.0/23", - "47.85.128.0/17", - "103.81.186.0/23", - "8.221.0.0/18", - "43.96.7.0/24", - "47.79.56.0/21", - "240b:4013::/32", - "47.89.108.0/22", - "47.235.28.0/24", - "47.246.82.0/24", - "47.91.48.0/20", - "185.78.106.0/23", - "47.84.160.0/21", - "140.205.1.0/24", - "47.88.43.0/24", - "47.83.32.0/21", - "47.91.64.0/19", - "43.96.100.0/24", - "43.96.72.0/24", - "47.87.0.0/18", - "8.210.0.0/16", - "47.88.192.0/18", - "47.88.42.0/24", - "170.33.92.0/24", - "149.129.32.0/19", - "47.52.128.0/17", - "47.246.108.0/22", - "8.221.56.0/21", - "47.253.0.0/17", - "110.76.23.0/24", - "170.33.65.0/24", - "240b:4006::/48", - "47.245.0.0/19", - "47.77.64.0/19", - "8.209.39.0/24", - "47.77.96.0/20", - "47.80.128.0/18", - "170.33.83.0/24", - "47.77.32.0/19", - "8.212.64.0/18", - "43.96.40.0/24", - "2400:b200:4102::/48", - "43.96.81.0/24", - "8.214.0.0/16", - "161.117.128.0/24", - "43.96.75.0/24", - "8.215.160.0/24", - "47.77.0.0/22", - "47.239.0.0/16", - "47.89.76.0/22", - "47.82.14.0/23", - "43.91.128.0/17", - "47.89.88.0/22", - "47.79.8.0/21", - "240b:4004:8000::/33", - "47.246.140.0/22", - "43.96.74.0/24", - "161.117.127.0/24", - "8.212.192.0/19", - "240b:4006:1000::/44", - "47.80.192.0/18", - "47.79.48.0/21", - "47.254.64.0/18", - "47.246.144.0/23", - "47.246.92.0/24", - "47.246.66.0/24", - "47.246.150.0/23", - "47.91.96.0/20", - "47.89.98.0/23", - "47.77.80.0/20", - "8.210.240.0/24", - "8.213.0.0/17", - "47.250.99.0/24", - "47.88.41.0/24", - "47.80.32.0/19", - "47.250.0.0/17", - "43.96.8.0/24", - "14.1.112.0/22", - "240b:4006:1008::/45", - "8.211.224.0/19", - "47.84.144.0/21", - "47.88.109.0/24", - "2400:3200::/48", - "47.56.0.0/16", - "8.220.192.0/18", - "8.223.0.0/17", - "8.222.72.0/21", - "47.246.69.0/24", - "240b:4002:8000::/33", - "43.96.66.0/24", - "47.246.92.0/23", - "47.246.136.0/22", - "205.204.117.0/24", - "8.222.80.0/20", - "47.85.112.0/22", - "47.79.128.0/19", - "240b:400d:8000::/33", - "170.33.64.0/24", - "8.222.56.0/21", - "240b:400d::/33", - "8.222.64.0/20", - "47.75.128.0/17", - "8.209.48.0/21", - "47.57.0.0/16", - "139.95.0.0/23", - "47.79.192.0/18", - "170.33.30.0/24", - "47.77.152.0/21", - "8.212.192.0/18", - "8.213.128.0/19", - "47.77.6.0/23", - "47.246.32.0/22", - "140.205.122.0/24", - "47.244.0.0/16", - "47.246.158.0/23", - "8.209.192.0/19", - "170.33.77.0/24", - "8.216.69.0/24", - "8.213.192.0/19", - "47.77.16.0/22", - "47.235.10.0/24", - "202.144.199.0/24", - "47.254.0.0/17", - "43.98.128.0/17", - "240b:400c::/41", - "47.250.128.0/17", - "47.89.101.0/24", - "47.90.128.0/18", - "240b:4013:8000::/33", - "8.209.44.0/23", - "240b:400c:80::/41", - "161.117.129.0/24", - "47.91.64.0/20", - "8.209.36.0/24", - "8.221.8.0/21", - "47.82.32.0/19", - "47.77.4.0/23", - "47.79.72.0/21", - "8.212.160.0/19", - "170.33.80.0/24", - "47.246.156.0/23", - "8.220.192.0/19", - "47.246.68.0/24", - "47.254.160.0/19", - "47.82.56.0/21", - "8.223.128.0/17", - "47.74.128.0/18", - "47.77.24.0/23", - "170.33.93.0/24", - "47.89.72.0/23", - "47.84.152.0/21", - "240b:400e::/32", - "149.129.224.0/19", - "2400:b200:4103::/48", - "47.87.32.0/19", - "47.86.0.0/16", - "47.235.4.0/24", - "139.95.6.0/23", - "47.252.67.0/24", - "47.246.123.0/24", - "47.81.96.0/19", - "43.96.10.0/24", - "8.223.0.0/18", - "240b:4005::/32", - "47.246.130.0/23", - "47.91.96.0/19", - "240b:400b::/33", - "47.246.132.0/23", - "8.213.184.0/21", - "47.246.124.0/24", - "8.209.64.0/18", - "2404:2280:3000::/36", - "47.89.78.0/23", - "47.250.128.0/18", - "47.79.128.0/20", - "240b:4011::/33", - "47.244.128.0/17", - "47.246.151.0/24", - "8.211.226.0/24", - "47.88.135.0/24", - "47.80.0.0/18", - "43.96.88.0/24", - "47.235.6.0/23", - "205.204.111.0/24", - "240b:4006:1000::/45", - "47.250.0.0/18", - "47.89.76.0/23", - "47.89.99.0/24", - "8.211.0.0/17", - "47.89.123.0/24", - "8.209.128.0/19", - "47.246.160.0/20", - "43.99.0.0/16", - "47.236.0.0/15", - "240b:400e:fffe::/48", - "47.80.96.0/19", - "47.246.184.0/21", - "47.235.8.0/24", - "8.222.48.0/21", - "47.89.94.0/23", - "47.245.64.0/18", - "47.77.128.0/21", - "47.74.192.0/18", - "2404:2280:4000::/37", - "8.211.88.0/21", - "8.213.192.0/18", - "8.223.192.0/18", - "240b:4002::/33", - "149.129.64.0/19", - "47.241.0.0/16", - "240b:4006:1018::/45", - "8.216.0.0/17", - "149.129.0.0/21", - "47.254.0.0/18", - "8.220.64.0/18", - "43.96.22.0/24", - "170.33.33.0/24", - "47.91.32.0/19", - "47.246.76.0/22", - "47.246.68.0/23", - "47.246.146.0/23", - "47.254.113.0/24", - "47.89.128.0/18", - "47.77.144.0/21", - "47.89.104.0/22", - "8.211.96.0/21", - "47.80.0.0/19", - "47.246.104.0/22", - "47.80.64.0/18", - "161.117.0.0/17", - "170.33.88.0/24", - "47.77.2.0/23", - "47.241.0.0/17", - "47.79.224.0/19", - "170.33.105.0/24", - "47.82.12.0/23", - "47.246.146.0/24", - "8.213.144.0/20", - "43.99.0.0/17", - "47.89.88.0/23", - "8.220.64.0/19", - "47.89.90.0/23", - "47.235.19.0/24", - "8.215.128.0/17", - "47.235.21.0/24", - "47.81.192.0/18", - "8.211.0.0/18", - "47.246.72.0/22", - "8.211.64.0/18", - "203.107.68.0/24", - "59.82.136.0/23", - "8.209.44.0/22", - "8.209.36.0/23", - "47.89.0.0/18", - "8.216.0.0/18", - "47.246.104.0/21", - "240b:400b::/32", - "47.246.72.0/21", - "8.214.128.0/17", - "8.209.48.0/20", - "170.33.86.0/24", - "110.76.21.0/24", - "8.209.128.0/18", - "8.222.96.0/20", - "47.89.100.0/24", - "47.89.192.0/19", - "8.213.128.0/20", - "2400:b200:4100::/48", - "8.208.0.0/17", - "170.33.90.0/24", - "47.83.0.0/17", - "240b:400c:100::/40", - "170.33.82.0/24", - "8.222.32.0/21", - "47.246.86.0/23", - "47.52.0.0/16", - "47.79.192.0/19", - "2404:2280:1800::/37", - "8.222.112.0/20", - "170.33.24.0/24", - "47.89.92.0/23", - "47.78.0.0/17", - "47.84.0.0/16", - "240b:400b:8000::/33", - "8.209.38.0/24", - "47.235.7.0/24", - "47.235.23.0/24", - "47.237.34.0/24", - "47.79.144.0/20", - "43.96.71.0/24", - "5.181.224.0/23", - "47.246.88.0/22", - "47.246.96.0/21", - "47.82.0.0/19", - "8.209.40.0/23", - "47.77.48.0/20", - "8.209.16.0/20", - "240b:4009::/32", - "47.246.176.0/20", - "47.250.192.0/18", - "47.246.168.0/21", - "47.89.160.0/19", - "8.222.32.0/20", - "223.5.5.0/24", - "47.81.0.0/18", - "47.89.96.0/24", - "47.77.0.0/23", - "43.96.24.0/24", - "8.221.128.0/17", - "47.246.144.0/24", - "47.246.125.0/24", - "240b:400e:ffff::/48", - "47.84.0.0/17", - "170.33.106.0/24", - "156.227.20.0/24", - "170.33.35.0/24", - "240b:4006:1028::/45", - "170.33.78.0/24", - "198.11.128.0/18", - "8.210.0.0/17", - "47.83.40.0/21", - "47.89.80.0/23", - "43.98.0.0/16", - "47.88.0.0/18", - "47.89.74.0/23", - "43.96.67.0/24", - "47.79.48.0/20", - "2404:2280:3800::/37", - "47.235.11.0/24", - "8.220.160.0/19", - "43.96.84.0/24", - "8.221.208.0/21", - "139.95.18.0/23", - "47.246.84.0/22", - "47.77.16.0/21", - "170.33.69.0/24", - "47.78.128.0/17", - "8.220.96.0/19", - "8.209.0.0/19", - "240b:400d::/32", - "205.204.102.0/23", - "47.87.128.0/19", - "47.83.128.0/17", - "8.218.0.0/17", - "47.235.10.0/23", - "8.208.128.0/17", - "170.33.137.0/24", - "8.209.37.0/24", - "8.220.128.0/19", - "47.79.112.0/20", - "47.243.0.0/16", - "47.246.196.0/23", - "170.33.79.0/24", - "47.252.0.0/18", - "47.87.0.0/19", - "2404:2280:2000::/36", - "47.79.58.0/23", - "170.33.34.0/24", - "47.246.132.0/22", - "240b:4012::/48", - "47.91.112.0/20", - "47.77.32.0/20", - "240b:4005::/33", - "8.222.8.0/21", - "47.246.194.0/23", - "2404:2280:1000::/37", - "8.221.200.0/21", - "43.96.23.0/24", - "47.82.64.0/18", - "147.139.128.0/17", - "8.211.192.0/19", - "47.251.128.0/17", - "240b:4011::/32", - "8.222.0.0/20", - "47.235.12.0/24", - "43.99.128.0/17", - "47.246.80.0/24", - "47.246.67.0/24", - "47.246.122.0/24", - "156.245.1.0/24", - "8.210.128.0/17", - "8.213.64.0/18", - "45.199.179.0/24", - "47.235.0.0/22", - "47.246.136.0/21", - "8.213.164.0/22", - "8.209.192.0/18", - "47.77.24.0/22", - "47.82.64.0/19", - "47.244.73.0/24", - "47.89.72.0/22", - "47.76.128.0/17", - "47.76.0.0/16", - "47.245.128.0/17", - "47.75.0.0/17", - "47.245.96.0/19", - "47.235.20.0/24", - "47.79.52.0/23", - "47.79.80.0/20", - "47.82.32.0/21", - "47.251.224.0/22", - "47.74.128.0/17", - "223.6.6.0/24", - "47.246.128.0/23", - "147.139.128.0/18", - "47.246.84.0/23", - "240b:4007::/33", - "170.33.85.0/24", - "43.96.102.0/24", - "43.98.0.0/17", - "203.107.67.0/24", - "8.222.0.0/21", - "2404:2280:2800::/37", - "43.96.101.0/24", - "170.33.84.0/24", - "8.219.128.0/17", - "47.80.64.0/19", - "43.96.85.0/24", - "43.96.96.0/24", - "43.96.73.0/24", - "47.246.100.0/22", - "47.79.60.0/23", - "47.77.26.0/23", - "8.222.128.0/17", - "161.117.138.0/24", - "47.235.18.0/23", - "47.235.0.0/23", - "240b:4006:1010::/44", - "47.76.0.0/17", - "8.221.216.0/21", - "47.82.8.0/23", - "2404:2280:4800::/37", - "170.33.29.0/24", - "47.245.128.0/18", - "47.79.80.0/21", - "47.89.221.0/24", - "198.11.184.0/21", - "240b:4009:8000::/33", - "8.215.162.0/23", - "8.211.128.0/19", - "47.79.83.0/24", - "2408:4009:500::/48", - "47.81.64.0/19", - "8.208.0.0/19", - "47.240.0.0/17", - "47.79.64.0/21", - "47.90.0.0/18", - "43.96.70.0/24", - "149.129.0.0/20", - "240b:400c::/33", - "2408:4000:1000::/48", - "170.33.76.0/24", - "205.204.96.0/19", - "47.88.64.0/18", - "8.209.96.0/19", - "47.79.104.0/21", - "47.82.10.0/23", - "47.79.88.0/21", - "47.245.64.0/19", - "139.95.16.0/23", - "47.77.20.0/22", - "240b:400f::/33", - "47.235.2.0/23", - "8.221.0.0/17", - "8.213.160.0/22", - "8.215.169.0/24", - "170.33.81.0/24", - "47.89.124.0/24", - "47.235.30.0/24", - "47.79.62.0/23", - "43.96.68.0/24", - "47.246.120.0/24", - "8.221.192.0/21", - "8.221.184.0/22", - "47.77.136.0/21", - "8.220.224.0/19", - "156.240.76.0/23", - "8.208.141.0/24", - "2404:2280:2000::/37", - "47.84.128.0/17", - "47.85.0.0/17", - "8.217.0.0/17", - "47.89.84.0/24", - "47.238.0.0/15", - "47.86.128.0/17", - "240b:4011:8000::/33", - "240b:4006:1000::/47", - "47.246.134.0/23", - "47.79.96.0/20", - "47.79.0.0/21", - "47.89.103.0/24", - "47.89.97.0/24", - "240b:4000::/33", - "47.242.0.0/16", - "47.56.0.0/15", - "47.91.32.0/20", - "147.139.192.0/18", - "240b:4013::/33", - "47.79.40.0/21", - "8.209.46.0/23", - "47.82.48.0/21", - "47.82.40.0/21", - "47.87.192.0/22", - "47.87.192.0/23", - "47.87.194.0/23", - "47.87.196.0/22", - "47.87.196.0/23", - "47.87.198.0/23", - "240b:400c:ffff::/48", - "47.87.208.0/23", - "47.87.210.0/23", - "47.87.208.0/22", - "47.87.222.0/23", - "47.87.216.0/23", - "47.87.200.0/23", - "47.87.220.0/23", - "47.87.216.0/22", - "47.87.224.0/22", - "47.87.204.0/22", - "47.87.212.0/23", - "47.87.226.0/23", - "47.87.200.0/22", - "47.87.206.0/23", - "43.100.0.0/16", - "47.87.212.0/22", - "47.87.218.0/23", - "47.87.214.0/23", - "43.100.0.0/15", - "47.87.204.0/23", - "47.87.220.0/22", - "43.101.0.0/16", - "47.87.224.0/23", - "47.87.202.0/23", - ] + remote_addresses: ["45.196.28.0/24", "161.117.128.0/17", "8.209.42.0/23", "47.89.125.0/24", "8.222.48.0/20", "47.79.16.0/21", "149.129.16.0/23", "8.212.0.0/17", "47.89.0.0/19", "47.240.128.0/17", "8.213.176.0/20", "47.77.8.0/22", "47.79.96.0/19", "47.246.198.0/23", "47.91.128.0/17", "47.89.104.0/21", "47.89.102.0/24", "8.222.96.0/19", "170.33.31.0/24", "8.215.168.0/24", "8.222.40.0/21", "47.235.1.0/24", "240b:400f::/32", "170.33.32.0/24", "8.208.0.0/18", "47.79.24.0/21", "47.91.16.0/20", "47.252.0.0/17", "8.213.176.0/21", "8.212.0.0/18", "8.211.192.0/18", "47.79.54.0/23", "47.235.18.0/24", "47.88.0.0/17", "43.96.21.0/24", "47.235.22.0/24", "240b:4001::/33", "47.79.64.0/20", "139.95.4.0/23", "47.254.128.0/19", "47.81.64.0/18", "47.77.128.0/18", "240b:4009::/33", "47.246.90.0/23", "47.89.32.0/19", "205.204.125.0/24", "47.79.56.0/23", "240b:400c:100::/41", "47.235.26.0/23", "8.209.64.0/19", "8.222.16.0/20", "47.235.12.0/23", "116.251.64.0/18", "139.95.64.0/24", "47.235.31.0/24", "8.208.32.0/19", "240b:400c:f00::/48", "47.235.6.0/24", "47.246.160.0/21", "47.246.196.0/22", "2404:2280:3000::/37", "47.74.0.0/21", "240b:4007:8000::/33", "47.91.0.0/20", "2400:3200:baba::/48", "198.11.137.0/24", "47.84.168.0/21", "240b:4006:1020::/44", "149.129.192.0/18", "8.219.40.0/21", "43.96.3.0/24", "240b:4004::/32", "47.77.64.0/20", "47.83.48.0/21", "47.77.104.0/21", "240b:4001:8000::/33", "43.96.5.0/24", "240b:400c:180::/41", "43.96.25.0/24", "47.77.96.0/21", "8.211.160.0/19", "47.245.32.0/19", "8.215.0.0/16", "47.79.32.0/20", "8.213.160.0/21", "47.74.0.0/19", "43.96.4.0/24", "170.33.75.0/24", "8.211.128.0/18", "8.217.0.0/16", "47.81.0.0/19", "47.82.96.0/19", "47.83.56.0/21", "203.107.64.0/24", "240b:4006:1020::/45", "240b:4004::/33", "47.242.0.0/15", "47.80.128.0/17", "8.215.0.0/17", "240b:4000::/32", "47.246.192.0/23", "47.246.176.0/21", "8.212.224.0/19", "47.90.0.0/17", "170.33.107.0/24", "47.237.32.0/20", "47.240.0.0/16", "47.253.0.0/16", "161.117.0.0/16", "47.77.12.0/22", "47.88.128.0/17", "8.220.147.0/24", "47.236.0.0/16", "149.129.192.0/19", "170.33.73.0/24", "47.87.160.0/19", "47.79.0.0/20", "47.246.153.0/24", "47.235.29.0/24", "47.81.128.0/18", "43.96.35.0/24", "8.212.128.0/18", "8.219.0.0/16", "47.246.155.0/24", "8.216.64.0/18", "8.213.253.0/24", "8.220.116.0/24", "8.222.128.0/18", "240b:400e:8000::/33", "43.96.33.0/24", "47.77.192.0/18", "47.81.32.0/19", "47.77.8.0/21", "47.79.16.0/20", "240b:400f:8000::/33", "47.246.145.0/24", "47.88.128.0/18", "170.33.104.0/24", "8.219.0.0/17", "47.82.0.0/18", "139.95.10.0/23", "47.238.0.0/16", "240b:4006:1002::/47", "8.221.188.0/22", "8.213.251.0/24", "47.254.192.0/19", "47.79.32.0/21", "8.212.128.0/19", "47.246.83.0/24", "47.87.64.0/19", "8.222.192.0/18", "170.33.68.0/24", "240b:400c:f01::/48", "170.33.136.0/24", "2400:b200:4101::/48", "2401:8680:4100::/48", "240b:400c::/32", "47.89.92.0/22", "8.223.128.0/18", "47.89.124.0/23", "47.74.32.0/19", "47.244.0.0/17", "43.96.80.0/24", "8.211.104.0/21", "8.213.224.0/19", "47.86.0.0/17", "8.222.64.0/21", "240b:400e::/33", "161.117.143.0/24", "47.246.152.0/23", "47.246.93.0/24", "240b:4006:1010::/45", "47.254.224.0/19", "8.209.40.0/22", "149.129.64.0/18", "43.96.20.0/24", "240b:4000:8000::/33", "47.251.0.0/16", "240b:4002::/32", "8.222.16.0/21", "203.107.66.0/24", "8.222.24.0/21", "47.89.128.0/19", "240b:400c:8000::/33", "8.218.128.0/17", "8.216.128.0/17", "47.91.128.0/18", "8.221.64.0/18", "2404:2280:4000::/36", "8.211.80.0/21", "8.217.128.0/17", "8.220.229.0/24", "170.33.66.0/24", "47.237.0.0/16", "47.235.28.0/23", "170.33.74.0/24", "47.90.64.0/18", "47.246.82.0/23", "8.209.38.0/23", "240b:4005:8000::/33", "8.220.128.0/18", "139.95.14.0/23", "8.216.192.0/18", "8.218.0.0/16", "47.91.192.0/18", "8.221.48.0/21", "149.129.8.0/21", "43.91.0.0/16", "8.223.64.0/18", "8.216.148.0/24", "8.222.80.0/21", "2401:b180:4100::/48", "47.91.0.0/19", "47.246.154.0/24", "47.246.152.0/24", "47.250.64.0/18", "8.216.128.0/18", "170.33.72.0/24", "139.95.12.0/23", "240b:400c::/40", "8.221.128.0/18", "43.96.32.0/24", "47.90.128.0/17", "47.251.0.0/17", "43.96.34.0/24", "47.245.0.0/18", "47.85.112.0/23", "8.209.56.0/21", "8.213.252.0/24", "47.77.128.0/17", "139.95.2.0/23", "43.96.69.0/24", "161.117.126.0/24", "47.75.0.0/16", "47.89.82.0/23", "47.89.224.0/19", "8.209.0.0/20", "47.246.128.0/22", "8.221.0.0/21", "139.95.8.0/23", "47.253.128.0/17", "156.236.12.0/24", "203.107.65.0/24", "47.241.128.0/17", "8.222.88.0/21", "47.87.128.0/18", "47.254.128.0/18", "8.221.192.0/18", "240b:4001::/32", "47.235.16.0/24", "240b:4007::/32", "47.235.13.0/24", "47.235.24.0/23", "47.91.80.0/20", "43.96.11.0/24", "47.235.5.0/24", "8.209.160.0/19", "47.246.88.0/23", "47.77.4.0/22", "156.236.17.0/24", "8.209.224.0/19", "14.1.115.0/24", "149.129.96.0/19", "47.254.192.0/18", "47.245.192.0/18", "8.208.0.0/16", "47.83.0.0/16", "47.87.96.0/19", "47.252.64.0/18", "47.89.192.0/18", "47.89.122.0/24", "47.85.114.0/23", "2404:2280:1000::/36", "47.81.128.0/17", "47.246.147.0/24", "47.87.64.0/18", "47.235.9.0/24", "47.52.0.0/17", "47.246.156.0/22", "47.246.96.0/22", "47.74.0.0/18", "8.214.0.0/17", "47.246.192.0/22", "47.246.150.0/24", "43.91.0.0/17", "170.33.138.0/24", "8.213.0.0/18", "47.90.192.0/18", "47.85.0.0/16", "47.235.24.0/22", "47.235.16.0/23", "47.85.128.0/17", "103.81.186.0/23", "8.221.0.0/18", "43.96.7.0/24", "47.79.56.0/21", "240b:4013::/32", "47.89.108.0/22", "47.235.28.0/24", "47.246.82.0/24", "47.91.48.0/20", "185.78.106.0/23", "47.84.160.0/21", "140.205.1.0/24", "47.88.43.0/24", "47.83.32.0/21", "47.91.64.0/19", "43.96.100.0/24", "43.96.72.0/24", "47.87.0.0/18", "8.210.0.0/16", "47.88.192.0/18", "47.88.42.0/24", "170.33.92.0/24", "149.129.32.0/19", "47.52.128.0/17", "47.246.108.0/22", "8.221.56.0/21", "47.253.0.0/17", "110.76.23.0/24", "170.33.65.0/24", "240b:4006::/48", "47.245.0.0/19", "47.77.64.0/19", "8.209.39.0/24", "47.77.96.0/20", "47.80.128.0/18", "170.33.83.0/24", "47.77.32.0/19", "8.212.64.0/18", "43.96.40.0/24", "2400:b200:4102::/48", "43.96.81.0/24", "8.214.0.0/16", "161.117.128.0/24", "43.96.75.0/24", "8.215.160.0/24", "47.77.0.0/22", "47.239.0.0/16", "47.89.76.0/22", "47.82.14.0/23", "43.91.128.0/17", "47.89.88.0/22", "47.79.8.0/21", "240b:4004:8000::/33", "47.246.140.0/22", "43.96.74.0/24", "161.117.127.0/24", "8.212.192.0/19", "240b:4006:1000::/44", "47.80.192.0/18", "47.79.48.0/21", "47.254.64.0/18", "47.246.144.0/23", "47.246.92.0/24", "47.246.66.0/24", "47.246.150.0/23", "47.91.96.0/20", "47.89.98.0/23", "47.77.80.0/20", "8.210.240.0/24", "8.213.0.0/17", "47.250.99.0/24", "47.88.41.0/24", "47.80.32.0/19", "47.250.0.0/17", "43.96.8.0/24", "14.1.112.0/22", "240b:4006:1008::/45", "8.211.224.0/19", "47.84.144.0/21", "47.88.109.0/24", "2400:3200::/48", "47.56.0.0/16", "8.220.192.0/18", "8.223.0.0/17", "8.222.72.0/21", "47.246.69.0/24", "240b:4002:8000::/33", "43.96.66.0/24", "47.246.92.0/23", "47.246.136.0/22", "205.204.117.0/24", "8.222.80.0/20", "47.85.112.0/22", "47.79.128.0/19", "240b:400d:8000::/33", "170.33.64.0/24", "8.222.56.0/21", "240b:400d::/33", "8.222.64.0/20", "47.75.128.0/17", "8.209.48.0/21", "47.57.0.0/16", "139.95.0.0/23", "47.79.192.0/18", "170.33.30.0/24", "47.77.152.0/21", "8.212.192.0/18", "8.213.128.0/19", "47.77.6.0/23", "47.246.32.0/22", "140.205.122.0/24", "47.244.0.0/16", "47.246.158.0/23", "8.209.192.0/19", "170.33.77.0/24", "8.216.69.0/24", "8.213.192.0/19", "47.77.16.0/22", "47.235.10.0/24", "202.144.199.0/24", "47.254.0.0/17", "43.98.128.0/17", "240b:400c::/41", "47.250.128.0/17", "47.89.101.0/24", "47.90.128.0/18", "240b:4013:8000::/33", "8.209.44.0/23", "240b:400c:80::/41", "161.117.129.0/24", "47.91.64.0/20", "8.209.36.0/24", "8.221.8.0/21", "47.82.32.0/19", "47.77.4.0/23", "47.79.72.0/21", "8.212.160.0/19", "170.33.80.0/24", "47.246.156.0/23", "8.220.192.0/19", "47.246.68.0/24", "47.254.160.0/19", "47.82.56.0/21", "8.223.128.0/17", "47.74.128.0/18", "47.77.24.0/23", "170.33.93.0/24", "47.89.72.0/23", "47.84.152.0/21", "240b:400e::/32", "149.129.224.0/19", "2400:b200:4103::/48", "47.87.32.0/19", "47.86.0.0/16", "47.235.4.0/24", "139.95.6.0/23", "47.252.67.0/24", "47.246.123.0/24", "47.81.96.0/19", "43.96.10.0/24", "8.223.0.0/18", "240b:4005::/32", "47.246.130.0/23", "47.91.96.0/19", "240b:400b::/33", "47.246.132.0/23", "8.213.184.0/21", "47.246.124.0/24", "8.209.64.0/18", "2404:2280:3000::/36", "47.89.78.0/23", "47.250.128.0/18", "47.79.128.0/20", "240b:4011::/33", "47.244.128.0/17", "47.246.151.0/24", "8.211.226.0/24", "47.88.135.0/24", "47.80.0.0/18", "43.96.88.0/24", "47.235.6.0/23", "205.204.111.0/24", "240b:4006:1000::/45", "47.250.0.0/18", "47.89.76.0/23", "47.89.99.0/24", "8.211.0.0/17", "47.89.123.0/24", "8.209.128.0/19", "47.246.160.0/20", "43.99.0.0/16", "47.236.0.0/15", "240b:400e:fffe::/48", "47.80.96.0/19", "47.246.184.0/21", "47.235.8.0/24", "8.222.48.0/21", "47.89.94.0/23", "47.245.64.0/18", "47.77.128.0/21", "47.74.192.0/18", "2404:2280:4000::/37", "8.211.88.0/21", "8.213.192.0/18", "8.223.192.0/18", "240b:4002::/33", "149.129.64.0/19", "47.241.0.0/16", "240b:4006:1018::/45", "8.216.0.0/17", "149.129.0.0/21", "47.254.0.0/18", "8.220.64.0/18", "43.96.22.0/24", "170.33.33.0/24", "47.91.32.0/19", "47.246.76.0/22", "47.246.68.0/23", "47.246.146.0/23", "47.254.113.0/24", "47.89.128.0/18", "47.77.144.0/21", "47.89.104.0/22", "8.211.96.0/21", "47.80.0.0/19", "47.246.104.0/22", "47.80.64.0/18", "161.117.0.0/17", "170.33.88.0/24", "47.77.2.0/23", "47.241.0.0/17", "47.79.224.0/19", "170.33.105.0/24", "47.82.12.0/23", "47.246.146.0/24", "8.213.144.0/20", "43.99.0.0/17", "47.89.88.0/23", "8.220.64.0/19", "47.89.90.0/23", "47.235.19.0/24", "8.215.128.0/17", "47.235.21.0/24", "47.81.192.0/18", "8.211.0.0/18", "47.246.72.0/22", "8.211.64.0/18", "203.107.68.0/24", "59.82.136.0/23", "8.209.44.0/22", "8.209.36.0/23", "47.89.0.0/18", "8.216.0.0/18", "47.246.104.0/21", "240b:400b::/32", "47.246.72.0/21", "8.214.128.0/17", "8.209.48.0/20", "170.33.86.0/24", "110.76.21.0/24", "8.209.128.0/18", "8.222.96.0/20", "47.89.100.0/24", "47.89.192.0/19", "8.213.128.0/20", "2400:b200:4100::/48", "8.208.0.0/17", "170.33.90.0/24", "47.83.0.0/17", "240b:400c:100::/40", "170.33.82.0/24", "8.222.32.0/21", "47.246.86.0/23", "47.52.0.0/16", "47.79.192.0/19", "2404:2280:1800::/37", "8.222.112.0/20", "170.33.24.0/24", "47.89.92.0/23", "47.78.0.0/17", "47.84.0.0/16", "240b:400b:8000::/33", "8.209.38.0/24", "47.235.7.0/24", "47.235.23.0/24", "47.237.34.0/24", "47.79.144.0/20", "43.96.71.0/24", "5.181.224.0/23", "47.246.88.0/22", "47.246.96.0/21", "47.82.0.0/19", "8.209.40.0/23", "47.77.48.0/20", "8.209.16.0/20", "240b:4009::/32", "47.246.176.0/20", "47.250.192.0/18", "47.246.168.0/21", "47.89.160.0/19", "8.222.32.0/20", "223.5.5.0/24", "47.81.0.0/18", "47.89.96.0/24", "47.77.0.0/23", "43.96.24.0/24", "8.221.128.0/17", "47.246.144.0/24", "47.246.125.0/24", "240b:400e:ffff::/48", "47.84.0.0/17", "170.33.106.0/24", "156.227.20.0/24", "170.33.35.0/24", "240b:4006:1028::/45", "170.33.78.0/24", "198.11.128.0/18", "8.210.0.0/17", "47.83.40.0/21", "47.89.80.0/23", "43.98.0.0/16", "47.88.0.0/18", "47.89.74.0/23", "43.96.67.0/24", "47.79.48.0/20", "2404:2280:3800::/37", "47.235.11.0/24", "8.220.160.0/19", "43.96.84.0/24", "8.221.208.0/21", "139.95.18.0/23", "47.246.84.0/22", "47.77.16.0/21", "170.33.69.0/24", "47.78.128.0/17", "8.220.96.0/19", "8.209.0.0/19", "240b:400d::/32", "205.204.102.0/23", "47.87.128.0/19", "47.83.128.0/17", "8.218.0.0/17", "47.235.10.0/23", "8.208.128.0/17", "170.33.137.0/24", "8.209.37.0/24", "8.220.128.0/19", "47.79.112.0/20", "47.243.0.0/16", "47.246.196.0/23", "170.33.79.0/24", "47.252.0.0/18", "47.87.0.0/19", "2404:2280:2000::/36", "47.79.58.0/23", "170.33.34.0/24", "47.246.132.0/22", "240b:4012::/48", "47.91.112.0/20", "47.77.32.0/20", "240b:4005::/33", "8.222.8.0/21", "47.246.194.0/23", "2404:2280:1000::/37", "8.221.200.0/21", "43.96.23.0/24", "47.82.64.0/18", "147.139.128.0/17", "8.211.192.0/19", "47.251.128.0/17", "240b:4011::/32", "8.222.0.0/20", "47.235.12.0/24", "43.99.128.0/17", "47.246.80.0/24", "47.246.67.0/24", "47.246.122.0/24", "156.245.1.0/24", "8.210.128.0/17", "8.213.64.0/18", "45.199.179.0/24", "47.235.0.0/22", "47.246.136.0/21", "8.213.164.0/22", "8.209.192.0/18", "47.77.24.0/22", "47.82.64.0/19", "47.244.73.0/24", "47.89.72.0/22", "47.76.128.0/17", "47.76.0.0/16", "47.245.128.0/17", "47.75.0.0/17", "47.245.96.0/19", "47.235.20.0/24", "47.79.52.0/23", "47.79.80.0/20", "47.82.32.0/21", "47.251.224.0/22", "47.74.128.0/17", "223.6.6.0/24", "47.246.128.0/23", "147.139.128.0/18", "47.246.84.0/23", "240b:4007::/33", "170.33.85.0/24", "43.96.102.0/24", "43.98.0.0/17", "203.107.67.0/24", "8.222.0.0/21", "2404:2280:2800::/37", "43.96.101.0/24", "170.33.84.0/24", "8.219.128.0/17", "47.80.64.0/19", "43.96.85.0/24", "43.96.96.0/24", "43.96.73.0/24", "47.246.100.0/22", "47.79.60.0/23", "47.77.26.0/23", "8.222.128.0/17", "161.117.138.0/24", "47.235.18.0/23", "47.235.0.0/23", "240b:4006:1010::/44", "47.76.0.0/17", "8.221.216.0/21", "47.82.8.0/23", "2404:2280:4800::/37", "170.33.29.0/24", "47.245.128.0/18", "47.79.80.0/21", "47.89.221.0/24", "198.11.184.0/21", "240b:4009:8000::/33", "8.215.162.0/23", "8.211.128.0/19", "47.79.83.0/24", "2408:4009:500::/48", "47.81.64.0/19", "8.208.0.0/19", "47.240.0.0/17", "47.79.64.0/21", "47.90.0.0/18", "43.96.70.0/24", "149.129.0.0/20", "240b:400c::/33", "2408:4000:1000::/48", "170.33.76.0/24", "205.204.96.0/19", "47.88.64.0/18", "8.209.96.0/19", "47.79.104.0/21", "47.82.10.0/23", "47.79.88.0/21", "47.245.64.0/19", "139.95.16.0/23", "47.77.20.0/22", "240b:400f::/33", "47.235.2.0/23", "8.221.0.0/17", "8.213.160.0/22", "8.215.169.0/24", "170.33.81.0/24", "47.89.124.0/24", "47.235.30.0/24", "47.79.62.0/23", "43.96.68.0/24", "47.246.120.0/24", "8.221.192.0/21", "8.221.184.0/22", "47.77.136.0/21", "8.220.224.0/19", "156.240.76.0/23", "8.208.141.0/24", "2404:2280:2000::/37", "47.84.128.0/17", "47.85.0.0/17", "8.217.0.0/17", "47.89.84.0/24", "47.238.0.0/15", "47.86.128.0/17", "240b:4011:8000::/33", "240b:4006:1000::/47", "47.246.134.0/23", "47.79.96.0/20", "47.79.0.0/21", "47.89.103.0/24", "47.89.97.0/24", "240b:4000::/33", "47.242.0.0/16", "47.56.0.0/15", "47.91.32.0/20", "147.139.192.0/18", "240b:4013::/33", "47.79.40.0/21", "8.209.46.0/23", "47.82.48.0/21", "47.82.40.0/21", "47.87.192.0/22", "47.87.192.0/23", "47.87.194.0/23", "47.87.196.0/22", "47.87.196.0/23", "47.87.198.0/23", "240b:400c:ffff::/48", "47.87.208.0/23", "47.87.210.0/23", "47.87.208.0/22", "47.87.222.0/23", "47.87.216.0/23", "47.87.200.0/23", "47.87.220.0/23", "47.87.216.0/22", "47.87.224.0/22", "47.87.204.0/22", "47.87.212.0/23", "47.87.226.0/23", "47.87.200.0/22", "47.87.206.0/23", "43.100.0.0/16", "47.87.212.0/22", "47.87.218.0/23", "47.87.214.0/23", "43.100.0.0/15", "47.87.204.0/23", "47.87.220.0/22", "43.101.0.0/16", "47.87.224.0/23", "47.87.202.0/23"] diff --git a/packages/default.nix b/packages/default.nix index e123f26d..44122be6 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +_: { perSystem = { diff --git a/packages/doc2dash/default.nix b/packages/doc2dash/default.nix index fa583c4c..e3b577cd 100644 --- a/packages/doc2dash/default.nix +++ b/packages/doc2dash/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, python3Packages, -}: python3Packages.buildPythonApplication rec { +}: +python3Packages.buildPythonApplication rec { pname = "doc2dash"; version = "3.1.0"; pyproject = true; @@ -13,9 +14,18 @@ hash = "sha256-u6K+BDc9tUxq4kCekTaqQLtNN/OLVc3rh14sVSfPtoQ="; }; - build-system = with python3Packages; [ hatchling hatch-vcs hatch-fancy-pypi-readme]; + build-system = with python3Packages; [ + hatchling + hatch-vcs + hatch-fancy-pypi-readme + ]; - dependencies = with python3Packages; [attrs beautifulsoup4 click rich]; + dependencies = with python3Packages; [ + attrs + beautifulsoup4 + click + rich + ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook