diff --git a/flake.nix b/flake.nix index bc6339c..e12f9a9 100644 --- a/flake.nix +++ b/flake.nix @@ -32,8 +32,8 @@ let system = "x86_64-linux"; lib = nixpkgs.lib; - pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; }; - pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config = { allowUnfree = true; }; }; + pkgs = nixpkgs.legacyPackages.${system}; + pkgs-unstable = nixpkgs-unstable.legacyPackages.${system}; in { nixosConfigurations = { diff --git a/hosts/Anton/default.nix b/hosts/Anton/default.nix index 8a1c65f..1a0d437 100644 --- a/hosts/Anton/default.nix +++ b/hosts/Anton/default.nix @@ -9,8 +9,6 @@ ./firewall.nix ./gitea.nix ./hardware-configuration.nix - ./invidious.nix - ./minecraft.nix ./radicale.nix ./syncthing.nix diff --git a/hosts/Anton/firewall.nix b/hosts/Anton/firewall.nix index 8067bfc..d5b7378 100644 --- a/hosts/Anton/firewall.nix +++ b/hosts/Anton/firewall.nix @@ -2,7 +2,7 @@ { networking.firewall = { enable = true; - allowedTCPPorts = [ 22 80 443 3000 3001 8384 ]; + allowedTCPPorts = [ 22 80 443 3000 8384 ]; allowedUDPPorts = [ 22 80 443 ]; }; } diff --git a/hosts/Anton/invidious.nix b/hosts/Anton/invidious.nix deleted file mode 100644 index b09d59c..0000000 --- a/hosts/Anton/invidious.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs, lib, ... }: -{ - services.invidious = { - enable = true; - port = 3001; - settings = { - db = { - user = lib.mkForce "invidious"; -# password = lib.mkForce "invidious"; -# host = lib.mkForce "localhost"; -# port = 5432; -# dbname = lib.mkForce "invidious"; - }; - popular_enabled = false; - - quality = "dash"; - volume = 10; - save_player_pos = true; - unseen_only = true; - local = true; - }; - }; -} diff --git a/hosts/Anton/minecraft.nix b/hosts/Anton/minecraft.nix deleted file mode 100644 index 3213cc8..0000000 --- a/hosts/Anton/minecraft.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, pkgs-unstable, ...}: -{ - services.minecraft-server = { - eula = true; - enable = true; - package = pkgs-unstable.minecraft-server; - jvmOpts = "-Xms4096M -Xmx8192M"; - dataDir = "/mnt/data/services/minecraft"; - openFirewall = true; - }; -} diff --git a/hosts/common/default.nix b/hosts/common/default.nix index ff43091..d717b42 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable, hostname, ... }: +{ pkgs, hostname, ... }: { imports = [ ./autoupdate.nix @@ -11,6 +11,7 @@ hostName = "${hostname}"; }; console.keyMap = "de"; + nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; system.stateVersion = "23.11"; }