From 194b13437b5caec0a748d1c0ce6cb93d6aff532d Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 18 Jun 2024 19:54:08 +0200 Subject: [PATCH] remove minecraft nix and fail2ban --- flake.lock | 80 ++------------------------------- flake.nix | 5 --- hosts/default/configuration.nix | 37 +-------------- 3 files changed, 5 insertions(+), 117 deletions(-) diff --git a/flake.lock b/flake.lock index 728a138..3606fc6 100644 --- a/flake.lock +++ b/flake.lock @@ -94,22 +94,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -168,24 +152,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -292,11 +258,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718639631, - "narHash": "sha256-N8bT29SDZUAQcLQsEvUeCFOvV2R69j/dTQtOj5DSgRg=", + "lastModified": 1718723174, + "narHash": "sha256-cPIOblG2H8Z934FPeuU0I6kI1Ke8ZbF330Nq/hTJ2uU=", "ref": "refs/heads/main", - "rev": "d1340bd1d8eedd274283e0cb2568a3ed67b58c81", - "revCount": 4858, + "rev": "236150b3c5227bbfbe46d2610c739a386afdca1f", + "revCount": 4859, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -518,28 +484,6 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718673933, - "narHash": "sha256-wMvH/JUtaji9sDywG6wP+Vs8YuGfhwCt9s5XtH1XrXM=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "36c9e693aa9fd4c1e33a33d7695b570bbb016a91", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1711297276, @@ -662,7 +606,6 @@ "hyprpicker": "hyprpicker", "lazy": "lazy", "nix-colors": "nix-colors", - "nix-minecraft": "nix-minecraft", "nixpkgs": "nixpkgs_3" } }, @@ -738,21 +681,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", diff --git a/flake.nix b/flake.nix index 73298f4..cb7ccb6 100644 --- a/flake.nix +++ b/flake.nix @@ -19,11 +19,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nix-minecraft = { - url = "github:Infinidoge/nix-minecraft"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 19083e7..a7eac32 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -10,7 +10,6 @@ ./hardware-configuration.nix ../../modules/games/steam.nix ../../modules/websites - inputs.nix-minecraft.nixosModules.minecraft-servers ]; # Bootloader. @@ -42,7 +41,7 @@ allowUnfree = true; nvidia.acceptLicense = true; }; - nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; + nixpkgs.overlays = [ ]; networking = { hostName = "lambdaOS"; # Define your hostname. @@ -212,29 +211,6 @@ pulse.enable = true; jack.enable = true; }; - fail2ban = { - enable = true; - maxretry = 5; - bantime = "1s"; - bantime-increment = { - enable = true; - formula = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; - maxtime = "1h"; - overalljails = true; - }; - jails = { - go-login.settings = { - enabled = true; - filter = "go-login"; - action = ''iptables-multiport[name=HTTP, port="http,https,2000"]''; - logpath = "/home/noa/Documents/programming/SODS/login.log"; - backend = "systemd"; - findtime = 600; - bantime = 600; - maxretry = 5; - }; - }; - }; greetd = { enable = true; settings = rec { @@ -245,17 +221,6 @@ default_session = initial_session; }; }; - minecraft-servers = { - enable = false; - eula = true; - openFirewall = true; - servers = { - "no-flicker" = { - enable = true; - package = pkgs.minecraftServers.paper-1_20_4; - }; - }; - }; openssh = { enable = true; settings.PasswordAuthentication = false;