4 files changed, 8 insertions, 7 deletions
diff --git a/users/grfn/system/home/default.nix b/users/grfn/system/home/default.nix
index 37d53fec1ad2..874d7b2cb281 100644
--- a/users/grfn/system/home/default.nix
+++ b/users/grfn/system/home/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 rec {
-  home = confPath: (import "${pkgs.home-manager.src}/modules" {
+  home = confPath: (import (pkgs.home-manager.src + "/modules") {
     inherit pkgs;
 
     configuration = { config, lib, ... }: {
diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix
index 32df92893a49..a24c5961de8a 100644
--- a/users/grfn/system/home/modules/common.nix
+++ b/users/grfn/system/home/modules/common.nix
@@ -13,6 +13,7 @@
     ../modules/lib/cloneRepo.nix
   ];
 
+  home.username = "grfn";
   home.homeDirectory = "/home/grfn";
 
   programs.password-store.enable = true;
diff --git a/users/grfn/system/system/iso.nix b/users/grfn/system/system/iso.nix
index 92a13f655214..9fa8e7ec7e3b 100644
--- a/users/grfn/system/system/iso.nix
+++ b/users/grfn/system/system/iso.nix
@@ -3,8 +3,8 @@
 let
   configuration = { ... }: {
     imports = [
-      "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-      "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix"
+      (pkgs.path + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+      (pkgs.path + "/nixos/modules/installer/cd-dvd/channel.nix")
     ];
 
     networking.networkmanager.enable = true;
diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix
index 05b78ce51703..0774e0611957 100644
--- a/users/grfn/system/system/machines/mugwump.nix
+++ b/users/grfn/system/system/machines/mugwump.nix
@@ -6,10 +6,10 @@ with lib;
   imports = [
     ../modules/common.nix
     (modulesPath + "/installer/scan/not-detected.nix")
-    "${depot.path}/ops/modules/prometheus-fail2ban-exporter.nix"
-    "${depot.path}/users/grfn/xanthous/server/module.nix"
-    "${depot.third_party.agenix.src}/modules/age.nix"
-    "${depot.path}/users/grfn/bbbg/module.nix"
+    (depot.path.origSrc + "/ops/modules/prometheus-fail2ban-exporter.nix")
+    (depot.path.origSrc + "/users/grfn/xanthous/server/module.nix")
+    (depot.third_party.agenix.src + "/modules/age.nix")
+    (depot.path.origSrc + "/users/grfn/bbbg/module.nix")
   ];
 
   networking.hostName = "mugwump";