From 478569c26171716982bcb47168dd11d9a8ab624d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 9 Dec 2021 20:01:13 +0100 Subject: [PATCH] Install minecraft on zeus --- home-manager/roles/hotkeys.nix | 1 + home-manager/roles/state.nix | 1 + nixos/machines/zeus/configuration.nix | 10 +++++++++- overlays/20-unfree.nix | 3 ++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/home-manager/roles/hotkeys.nix b/home-manager/roles/hotkeys.nix index b5c7e91d..1922a03a 100644 --- a/home-manager/roles/hotkeys.nix +++ b/home-manager/roles/hotkeys.nix @@ -57,6 +57,7 @@ in Chromium = fork "chromium"; Games = { Steam = fork "steam"; + Minecraft = fork "minecraft-launcher"; }; Deluge = fork "deluge"; }; diff --git a/home-manager/roles/state.nix b/home-manager/roles/state.nix index c53380b8..b5d6d648 100644 --- a/home-manager/roles/state.nix +++ b/home-manager/roles/state.nix @@ -20,6 +20,7 @@ let ".local/share/khal" ".local/share/mpd" ".mozilla/firefox/maralorn-default" + ".minecraft" ".ssh" ".task" ".vdirsyncer" diff --git a/nixos/machines/zeus/configuration.nix b/nixos/machines/zeus/configuration.nix index 76227d73..dbe9726d 100644 --- a/nixos/machines/zeus/configuration.nix +++ b/nixos/machines/zeus/configuration.nix @@ -76,6 +76,7 @@ in "d /disk/volatile/maralorn 700 maralorn users - -" "d /disk/persist/var/lib/bluetooth - - - - -" "d /disk/persist/var/lib/waydroid 777 root root - -" + "d /disk/persist/minecraft 700 minecraft minecraft - -" "L+ /var/lib/bluetooth - - - - /disk/persist/var/lib/bluetooth" "L+ /var/lib/waydroid - - - - /disk/persist/var/lib/waydroid" "L+ /root/.ssh - - - - /disk/persist/root/.ssh" @@ -114,7 +115,8 @@ in networking = { hostName = "zeus"; - domain = "m-0.eu"; + domain = "lo.m-0.eu"; + networkmanager.enable = false; interfaces.enp34s0 = { useDHCP = true; ipv6.addresses = [{ address = "fdc0:1::4"; prefixLength = 64; }]; @@ -207,6 +209,12 @@ in tracker-miners.enable = false; gnome-online-miners.enable = lib.mkForce false; }; + minecraft-server = { + enable = true; + openFirewall = true; + eula = true; + dataDir = "/disk/persist/minecraft"; + }; }; boot.kernel.sysctl."fs.inotify.max_user_watches" = 204800; diff --git a/overlays/20-unfree.nix b/overlays/20-unfree.nix index 78aa78a2..80f50b35 100644 --- a/overlays/20-unfree.nix +++ b/overlays/20-unfree.nix @@ -1,8 +1,9 @@ self: super: let unfree = import self.sources."${self.nixpkgs-channel}" { config.allowUnfree = true; }; - # unstableUnfree = import self.sources.nixos-unstable { config.allowUnfree = true; }; + unstableUnfree = import self.sources.nixos-unstable { config.allowUnfree = true; }; in { inherit (unfree) discord factorio zoom-us skypeforlinux google-chrome minecraft teamviewer steam; + inherit (unstableUnfree) minecraft-server; }