From f02af8347fefdf4df4812fc33825bf707962fcd9 Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Mon, 14 Apr 2025 19:41:32 -0700
Subject: migration: fixes

---
 modules/home/impermanence/default.nix        |  7 +++----
 modules/nixos/services/minecraft/default.nix | 10 +---------
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/home/impermanence/default.nix b/modules/home/impermanence/default.nix
index 081946c..959e92a 100644
--- a/modules/home/impermanence/default.nix
+++ b/modules/home/impermanence/default.nix
@@ -1,9 +1,8 @@
 { options, config, osConfig, lib, namespace, inputs, host, ... }:
 
 with lib; with lib.${namespace}; let
-  cfg = config.${namespace}.impermanence // {
-    inherit (osConfig.${namespace}.system.impermanence.home) enable location secure;
-  };
+  cfg = config.${namespace}.impermanence;
+  os = osConfig.${namespace}.system.impermanence.home;
 in {
   imports = [
     inputs.impermanence.nixosModules.home-manager.impermanence
@@ -22,7 +21,7 @@ in {
 
   config = {
     ${namespace}.impermanence = {
-      inherit (cfg) enable location secure;
+      inherit (os) enable location secure;
     };
 
     home.persistence.${cfg.location} = {
diff --git a/modules/nixos/services/minecraft/default.nix b/modules/nixos/services/minecraft/default.nix
index 7705c1c..1ea2ab4 100644
--- a/modules/nixos/services/minecraft/default.nix
+++ b/modules/nixos/services/minecraft/default.nix
@@ -1,21 +1,13 @@
-{ options, config, lib, namespace, inputs, ... }:
+{ options, config, lib, namespace, ... }:
 
 with lib; with lib.${namespace}; let
   cfg = config.${namespace}.services.minecraft;
-  impermanence = config.${namespace}.system.impermanence;
 in {
   options.${namespace}.services.minecraft = with types; {
     enable = mkEnableOption "minecraft server support";
   };
 
   config = mkIf cfg.enable {
-    nixpkgs = {
-      overlays = [ inputs.nix-minecraft.overlay ];
-      config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-        "minecraft-server"
-      ];
-    };
-
     services.minecraft-servers = {
       enable = true;
       eula = true;
-- 
cgit v1.2.3