arrumando erros

flake.nix

@@ -12,15 +12,7 @@
     home-manager.url = "github:nix-community/home-manager/";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     zen-browser.url = "github:0xc000022070/zen-browser-flake";
-<<<<<<< HEAD
     my-pkgs.url = "git+https://git.darkgui.com.br/DarkGui/nix-pkgs";
-=======
-<<<<<<< HEAD
-    my-pkgs.url = "git+https://git.darkgui.com.br/DarkGui/nix-pkgs";
-=======
-    my-pkgs.url = "github:darkguibrine/nix-pkgs";
->>>>>>> 5017e56 (.)
->>>>>>> 9afbf20 (backup)
     noctalia.url = "github:noctalia-dev/noctalia-shell";
     niri.url = "github:sodiboo/niri-flake";
     quickshell.url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";

hosts/darkgui-vps/config/self-host/firewall.nix

@@ -6,27 +6,13 @@
   ...
 }:
 {
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-  # Open ports in the firewall.
->>>>>>> 5017e56 (.)
->>>>>>> 9afbf20 (backup)
   networking.firewall = {
     enable = true;
     allowedTCPPorts = [
       22
       80
       81
-<<<<<<< HEAD
       222
-=======
-<<<<<<< HEAD
-      222
-=======
->>>>>>> 5017e56 (.)
->>>>>>> 9afbf20 (backup)
       443
       3000
       3478