migration: fixes

4 files changed, 18 insertions, 14 deletions

diff --git a/flake.nix b/flake.nix
index 9a72aee..c072d56 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,9 +37,14 @@
       nix-minecraft.nixosModules.minecraft-servers
     ];
 
+    overlays = with inputs; [
+      nix-minecraft.overlay
+    ];
+
     channels-config.allowUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) [
       "discord"
       "obsidian"
+      "minecraft-server"
     ];
   };
 }
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;
diff --git a/systems/x86_64-linux/copenhagen/default.nix b/systems/x86_64-linux/copenhagen/default.nix
index ceca7d1..769af44 100644
--- a/systems/x86_64-linux/copenhagen/default.nix
+++ b/systems/x86_64-linux/copenhagen/default.nix
@@ -53,7 +53,15 @@ with lib; with lib.${namespace}; {
     admin = true;
 
     home.config = {
-      cxl.tools.git.key = "DE64538967CA0C68";
+      cxl = {
+        impermanence = {
+          skeleton = false;
+          location = lib.mkForce "/persist/home/c";
+          secure.location = lib.mkForce "/persist/secure/home/c";
+        };
+
+        tools.git.key = "DE64538967CA0C68";
+      };
     };
   };