From 00952689aac7bf688a525add7b5936d7341f6bbd Mon Sep 17 00:00:00 2001 From: Avery Date: Sat, 28 Jun 2025 15:50:33 +0000 Subject: [PATCH 1/2] Allow unfree packages on all systems --- common/nixos.nix | 5 ++++- hosts/mizuki/nixos.nix | 1 - hosts/totsugeki/nixos/default.nix | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/nixos.nix b/common/nixos.nix index 0882840..bb2f221 100644 --- a/common/nixos.nix +++ b/common/nixos.nix @@ -12,7 +12,10 @@ lib.mkDefault config.hardware.enableRedistributableFirmware; }; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs = { + config.allowUnfree = true; + hostPlatform = lib.mkDefault "x86_64-linux"; + }; users = { defaultUserShell = pkgs.zsh; diff --git a/hosts/mizuki/nixos.nix b/hosts/mizuki/nixos.nix index 034c5b2..eabc478 100644 --- a/hosts/mizuki/nixos.nix +++ b/hosts/mizuki/nixos.nix @@ -20,7 +20,6 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - nixpkgs.config.allowUnfree = true; programs.zsh.enable = true; diff --git a/hosts/totsugeki/nixos/default.nix b/hosts/totsugeki/nixos/default.nix index 423fc5d..ceb7eeb 100644 --- a/hosts/totsugeki/nixos/default.nix +++ b/hosts/totsugeki/nixos/default.nix @@ -58,8 +58,6 @@ ]; }; - nixpkgs.config.allowUnfree = true; - fonts = { packages = with pkgs; [ inter From bde6ed224ecbbc81d4e0c99199830be3f44b1d72 Mon Sep 17 00:00:00 2001 From: Avery Date: Sat, 28 Jun 2025 15:50:44 +0000 Subject: [PATCH 2/2] Change Minecraft server data directory --- hosts/greatyamada/services/minecraft/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/greatyamada/services/minecraft/default.nix b/hosts/greatyamada/services/minecraft/default.nix index 868df3c..5e12c7e 100644 --- a/hosts/greatyamada/services/minecraft/default.nix +++ b/hosts/greatyamada/services/minecraft/default.nix @@ -30,6 +30,7 @@ in { services.minecraft-servers = { enable = true; eula = true; + dataDir = "/mnt/ssd-01/minecraft"; environmentFile = config.sops.templates."minecraft.env".path; managementSystem = { tmux.enable = false;