From 62326a818504a1a4ff4d9e7dd4e424c72f77b60a Mon Sep 17 00:00:00 2001 From: DarkGuibrine Date: Sun, 17 May 2026 17:37:35 -0300 Subject: [PATCH] . --- flake.lock | 90 +++++++++---------- hosts/Alfa/conf/GM/Pkgs/pkgs.nix | 3 +- hosts/Alfa/conf/GM/configs/self-host.nix | 5 +- hosts/Alfa/configuration.nix | 4 + .../config/self-host/self-host.nix | 12 ++- mods/nixos/netbird/netbird.nix | 24 ----- mods/nixos/nixos.nix | 1 - 7 files changed, 59 insertions(+), 80 deletions(-) delete mode 100644 mods/nixos/netbird/netbird.nix diff --git a/flake.lock b/flake.lock index 25e8db0..fa5c4c2 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1777713215, - "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", + "lastModified": 1778958912, + "narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=", "owner": "nix-community", "repo": "disko", - "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", + "rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf", "type": "github" }, "original": { @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1778905298, - "narHash": "sha256-mqzr2uSY3TzBxnpFGocsT7fATE8tqU+eb0V+OhNR53I=", + "lastModified": 1778954430, + "narHash": "sha256-oaNyOr05lblaQdtbkbN1wO0b2KLIL2O1LkmwDgdQp4I=", "owner": "nix-community", "repo": "home-manager", - "rev": "92a8736142944ed3b2c4aba8b364583b6fda15a5", + "rev": "26aaab785b0bab4af60a2c42b22760fa906ef22a", "type": "github" }, "original": { @@ -171,11 +171,11 @@ ] }, "locked": { - "lastModified": 1778858474, - "narHash": "sha256-uOh5fCoxOgdFa50WymuhCwJKuEVv/Eo4VYjK0SgzlPs=", + "lastModified": 1778937626, + "narHash": "sha256-OzLAT0G96WlT/WWaNdkTvQ7E9ohq9h0xQTdL1oe3gm0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ca77575d39c908de876c10f93704532689df546f", + "rev": "d5ece85b6d3d6b5ab5a514b2785fb952b629bfea", "type": "github" }, "original": { @@ -214,11 +214,11 @@ ] }, "locked": { - "lastModified": 1778656613, - "narHash": "sha256-msfEuGxdU3hMykJKkkKfE+kT1Us/3o4XLjdOaQLyYHA=", + "lastModified": 1778879388, + "narHash": "sha256-X5DkzTzuHsLQ4P8UATmaaeq5ve0oDvMO3PTsRrY0s9c=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "98800e4d24a3be2d5e9fa47e0dc7c5a1982f99a7", + "rev": "8a1ee4335d474c64ddc5d80e3c008ee41b066f4e", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1778862364, - "narHash": "sha256-O0qC3IOHRscJcGPuDlIS4cLboKJZq358KH3oVzBeQjo=", + "lastModified": 1778942403, + "narHash": "sha256-SPCWvqeVySTNUgX/shARpRl5fi/NnkObUgDGR/Aco4c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9ab3f8b17e22ead80525c4572b74156acf870526", + "rev": "daefca3370581223fedc24d0101c4915a3689f9e", "type": "github" }, "original": { @@ -339,11 +339,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1778906273, - "narHash": "sha256-c2dM/pECfvRi0rCwmMVoD9P1jS6ESwAZ//wQZRW33HQ=", + "lastModified": 1778980758, + "narHash": "sha256-M2B5nlocam6kfKluHijT2E2+TRUC2j8S14JWmwHr/l0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f3661533a9ec5bf2e363c8980ca4864879dbacf", + "rev": "84aceb4288d260c86c624ca926cd402557a6cf67", "type": "github" }, "original": { @@ -465,11 +465,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -481,11 +481,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1778794387, - "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -545,11 +545,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1778443072, - "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -565,11 +565,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778830602, - "narHash": "sha256-5HKL37GkJNRHsU8GS38UshBY7UyvTOQim2L4quSYGfE=", + "lastModified": 1778972351, + "narHash": "sha256-GGzDdZMSRDRAQWLE7Gc4xBpBf2T+tezi8NjmiMSnJJM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "13964255121d100a7306e76a28010f19e8b33a1a", + "rev": "27c715dcf28be276d17d334e9d1137b2d10a0174", "type": "github" }, "original": { @@ -607,11 +607,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1778906070, - "narHash": "sha256-RlUmGoriRD2eB4NpEcFzpx8XP99UaXiAcDc76E7g9nc=", + "lastModified": 1778979652, + "narHash": "sha256-VKptLSz5jqsa5A7DQV/Jd8WBWsW2MZxZHyUhOE3F7q4=", "owner": "nix-community", "repo": "NUR", - "rev": "d75b47276e57bcf5ef14f6cf9070f9e61a70f6f0", + "rev": "06a9f4853ad0d96558cf6966da0b228e6d808174", "type": "github" }, "original": { @@ -629,11 +629,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1778867960, - "narHash": "sha256-TOQb4wa+hql3X/uLGHsIFaNURVXoe9VJ1kCzmREPYqQ=", + "lastModified": 1778950911, + "narHash": "sha256-N2TbtAvhetxMHXPP9gWMU0v34Nj+H/76PmCCgdzV1cc=", "owner": "lonerOrz", "repo": "nyx-loner", - "rev": "a27bfaeab1570c84e6ff4bcc515cfff6606238ad", + "rev": "099b03ff77442ac2352e005579ee98d78acffbbd", "type": "github" }, "original": { @@ -728,11 +728,11 @@ ] }, "locked": { - "lastModified": 1778815121, - "narHash": "sha256-xlhD+1NVJbhrUUM2usRHW6iKWTXP2uw2Fo6sWJmLg8g=", + "lastModified": 1778901358, + "narHash": "sha256-n35a8GOPs8zi35GXPe4uBz0Y8xseTkQpNgcrq81gPg0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "017351829a9356423afd2cca0dde9b63346c8ab3", + "rev": "61ec6a4fc56fe0c2b863f7b3eaba07b6664697d9", "type": "github" }, "original": { @@ -850,11 +850,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1778846616, - "narHash": "sha256-cqNwCnEdzUlUgNk9c3bVkXnEfmhzHvHre2Nr2C0sIfo=", + "lastModified": 1778919017, + "narHash": "sha256-P2+aRay2sPQGVXzNmiD4yYlhy4ytxqBvT4A2OLOvkoU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3e3671b5f0e7c60e8f10bdf8667598603203546a", + "rev": "7c41a80acc12ab012448b84aec90ca9b4bf8b9ac", "type": "github" }, "original": { diff --git a/hosts/Alfa/conf/GM/Pkgs/pkgs.nix b/hosts/Alfa/conf/GM/Pkgs/pkgs.nix index 6bd40b4..1bc8bb7 100644 --- a/hosts/Alfa/conf/GM/Pkgs/pkgs.nix +++ b/hosts/Alfa/conf/GM/Pkgs/pkgs.nix @@ -21,6 +21,7 @@ ## Segurança / rede bitwarden-desktop + server-box tailscale netbird zerotierone @@ -92,8 +93,6 @@ programs.sleepy-launcher.enable = true; programs.anime-game-launcher.enable = true; - services.netbird.enable = true; - nixpkgs.config.permittedInsecurePackages = [ "electron-38.8.4" ]; diff --git a/hosts/Alfa/conf/GM/configs/self-host.nix b/hosts/Alfa/conf/GM/configs/self-host.nix index ff0c498..1fc4a6d 100644 --- a/hosts/Alfa/conf/GM/configs/self-host.nix +++ b/hosts/Alfa/conf/GM/configs/self-host.nix @@ -8,11 +8,14 @@ { mods = { - netbird.enable = true; tailscale.enable = true; flakePath = "/etc/nixos"; }; + services = { + netbird.enable = true; + netbird.ui = true; + }; networking.nftables.enable = true; networking.firewall = { diff --git a/hosts/Alfa/configuration.nix b/hosts/Alfa/configuration.nix index 45e5fc4..5b6896f 100644 --- a/hosts/Alfa/configuration.nix +++ b/hosts/Alfa/configuration.nix @@ -39,6 +39,10 @@ "wheel" "tailscale" "docker" + "" + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINQmhMhs1d3o0ZUS2a5i/0fsgg8FgSqCTCABhpc7hyxd" ]; packages = with pkgs; [ ]; }; diff --git a/hosts/darkgui-vps/config/self-host/self-host.nix b/hosts/darkgui-vps/config/self-host/self-host.nix index 54eece5..36bd885 100644 --- a/hosts/darkgui-vps/config/self-host/self-host.nix +++ b/hosts/darkgui-vps/config/self-host/self-host.nix @@ -8,7 +8,6 @@ { mods = { - netbird.enable = true; tailscale.enable = true; flakePath = "/etc/nixos"; }; @@ -22,7 +21,6 @@ }; }; - boot.kernel.sysctl = { "net.ipv4.ip_unprivileged_port_start" = 53; "net.ipv6.conf.all.forwarding" = true; @@ -33,11 +31,11 @@ virtualisation.docker = { enable = true; daemon.settings = { - ipv6 = true; - fixed-cidr-v6 = "fd00:db8:1::/64"; - ip6tables = true; - experimental = true; - }; + ipv6 = true; + fixed-cidr-v6 = "fd00:db8:1::/64"; + ip6tables = true; + experimental = true; + }; }; services.tailscale = { diff --git a/mods/nixos/netbird/netbird.nix b/mods/nixos/netbird/netbird.nix deleted file mode 100644 index 6369c60..0000000 --- a/mods/nixos/netbird/netbird.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - lib, - ... -}: -{ - options.mods.netbird = { - enable = lib.mkEnableOption "netbird"; - }; - - config = lib.mkIf config.mods.netbird.enable { - services.netbird.clients.wt0 = { - login = { - enable = false; - setupKeyFile = "/path/to/your/setup-key"; - }; - port = 51821; - ui.enable = false; - openFirewall = true; - openInternalFirewall = true; - }; - services.resolved.enable = true; - }; -} diff --git a/mods/nixos/nixos.nix b/mods/nixos/nixos.nix index dc1c9d0..fadc626 100644 --- a/mods/nixos/nixos.nix +++ b/mods/nixos/nixos.nix @@ -1,7 +1,6 @@ { lib, ... }: { imports = [ - ./netbird/netbird.nix ./tailscale/tailscale.nix ];