diff --git a/flake.lock b/flake.lock index eded267..37ed12c 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779968370, "narHash": "sha256-4MaKXKUhjjcCSJFqsqKnCDHUk1wlq3E5cEu8o1zQOWE=", "owner": "chaotic-cx", "repo": "nyx", "rev": "096de93c030eea632ea6ce0332cac425a50188f3", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780148652, "narHash": "sha256-jyG8eDYS0+ZS/TOYQF6wzBms4vC/j6tbC0nX9rdBHrY=", @@ -42,6 +52,11 @@ "repo": "nyx", "rev": "2fb63a1031e02530fcf3214952ff5b7bf354eb27", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -57,11 +72,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779942106, "narHash": "sha256-81sATQ+hMCcsqFCN5UyhCoXXf62yQfKtzKzuiFXtdxA=", "owner": "nix-community", "repo": "disko", "rev": "36c1d04e85fc70f7b94f7434b1ea0a1a13bda4cd", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780048612, "narHash": "sha256-Md/eOK5OjmvvHc2H52pLZe4zpP4XyfiS5vHqfRCz2HU=", @@ -69,6 +94,11 @@ "repo": "disko", "rev": "caa775cf67bfdc47f940edd96c975b5016df9059", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -213,11 +243,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779726696, "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780099287, "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", @@ -225,6 +265,11 @@ "repo": "home-manager", "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -241,11 +286,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779969295, "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=", "owner": "nix-community", "repo": "home-manager", "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780099287, "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", @@ -253,6 +308,11 @@ "repo": "home-manager", "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -292,11 +352,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779787240, "narHash": "sha256-hqpzAmYzcKvo+i0XCDgDCAV9WzW1a7gzQWGjp8Dfcjg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", "rev": "976bb49bfc30f716c1e94cef55845e915631a4c6", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780129573, "narHash": "sha256-6/S2FvBz+dxEgPfRU7dK+ycLYzRU7L8aN+GjDRyVs/E=", @@ -304,6 +374,11 @@ "repo": "Jovian-NixOS", "rev": "8f97d1dee8c0971b01cd6b17ccf913e8bb70f5d5", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -342,11 +417,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779948373, "narHash": "sha256-9TrrI+BE3W+mu/A0w7iipAQmjx1XbB2ZZr2ePAXS3rs=", "owner": "sodiboo", "repo": "niri-flake", "rev": "a1edd99aa43b32d1f7c2a6bcf20fa69d9e322f19", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780062130, "narHash": "sha256-3XF+oy0PX4aajJw2RNB8rlMpyu0eXCG4pGH7fe94yBg=", @@ -354,6 +439,11 @@ "repo": "niri-flake", "rev": "3cb351d73c357a4e413f59c4551d219118791c14", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -383,11 +473,21 @@ "flake": false, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779944898, "narHash": "sha256-PHgyvhhd2bMWD6pZeAR8bMgTigc6KMwGV2cXZxrmq2o=", "owner": "YaLTeR", "repo": "niri", "rev": "9a6f31012d031a7fccaf607b49080ddce44f0935", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780056110, "narHash": "sha256-t7lKVshV/srD0G06j4r5P5qj9zaDeZ9JYFCxHDGROZU=", @@ -395,6 +495,11 @@ "repo": "niri", "rev": "f9f43d826ab4014a7c302be28d7da33e12f5be37", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -460,11 +565,21 @@ "nixpkgs-master": { "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779980702, "narHash": "sha256-P5K5XgEQUjnkXbNm9I+IW8WPPX/Pt8A2k+E6zvMXfwM=", "owner": "nixos", "repo": "nixpkgs", "rev": "e0bad46c30caebf6414b5a76569cecc13e3de87c", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780163346, "narHash": "sha256-UxOrnBj9SH2tFDwUQWJDP6lPHiRaa2ZLqm+1OLDOCoM=", @@ -472,6 +587,11 @@ "repo": "nixpkgs", "rev": "ca1df238c0941f191a699ee5bf0a4ffc80b331d3", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -483,11 +603,21 @@ "nixpkgs-stable": { "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779467186, "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1779796641, "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", @@ -495,6 +625,11 @@ "repo": "nixpkgs", "rev": "25f538306313eae3927264466c70d7001dcea1df", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -618,11 +753,21 @@ "nixpkgs_6": { "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779877693, "narHash": "sha256-NOF9NAREhxr50bbBfVcVOq+ArCMSoe8dP79Pk2uyARk=", "owner": "nixos", "repo": "nixpkgs", "rev": "4100e830e085863741bc69b156ec4ccd53ab5be0", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780030872, "narHash": "sha256-u6WU/yd/o8iYQrHX3RAwO1hYa3LkoSL+WNQD0rJfJZQ=", @@ -630,6 +775,11 @@ "repo": "nixpkgs", "rev": "e9a7635a57597d9754eccebdfc7045e6c8600e6b", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -736,11 +886,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779980738, "narHash": "sha256-+qQHqtDCg9E7w6HnG58YDeN6Q7jADa58sRkoV+M+gJc=", "owner": "nix-community", "repo": "NUR", "rev": "f88b620cd4a97197006d617cb2960e2e90197c59", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780162844, "narHash": "sha256-7ECU2fbXRe/1DW7mB3vDYSQ+ccKxcrEbk4x+yLVAogU=", @@ -748,6 +908,11 @@ "repo": "NUR", "rev": "eff5bf8dcb24941f068d1e8f8025101600c88030", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -865,11 +1030,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779851998, "narHash": "sha256-UkkMh3bX9QW4Luqkm98nUaOqKWrU6i65mUnph3WeSSw=", "owner": "oxalica", "repo": "rust-overlay", "rev": "6cddd512fa2bf7231f098d3a2f92f6e4cff71e0a", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780110990, "narHash": "sha256-6QBThUi7SuK+dgA+DCaEkQGZN4kYx6DpXmK45+MG9zI=", @@ -877,6 +1052,11 @@ "repo": "rust-overlay", "rev": "85570ef134d92a8702de6afd1f6f0209c863fa91", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { @@ -992,11 +1172,21 @@ }, "locked": { <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "lastModified": 1779955179, "narHash": "sha256-cHrbJ8pZrsFWUTJVk7AxWiEg5eiZptPQxtT0YXMIENo=", "owner": "0xc000022070", "repo": "zen-browser-flake", "rev": "c341e3f6516fb1286d25b99d34b111f93028ae87", +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 9afbf20 (backup) ======= "lastModified": 1780123543, "narHash": "sha256-vRHmt1N3rPgLJFcSQfHb2c3F7edzVPcyAk6/2QYmO1s=", @@ -1004,6 +1194,11 @@ "repo": "zen-browser-flake", "rev": "7e1dae7aa169ad02f18ca11da247008181b2dc7f", >>>>>>> 8d28431 (initial commit) +<<<<<<< HEAD +======= +======= +>>>>>>> 5017e56 (.) +>>>>>>> 9afbf20 (backup) "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 827ef2e..fdb7d9f 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,15 @@ 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"; diff --git a/hosts/darkgui-vps/config/self-host/firewall.nix b/hosts/darkgui-vps/config/self-host/firewall.nix index ba7fabf..0d37580 100644 --- a/hosts/darkgui-vps/config/self-host/firewall.nix +++ b/hosts/darkgui-vps/config/self-host/firewall.nix @@ -6,13 +6,27 @@ ... }: { +<<<<<<< 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