From 9eb4002d1867c123bcc0ba58dbf7bd29684e8136 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 26 May 2022 14:50:41 +0200 Subject: refactor(tazjin/nixos): Prepare for restricted-eval Change-Id: I6adbe1d53581dddc4c7c3a44516fbed3a661daff Reviewed-on: https://cl.tvl.fyi/c/depot/+/5689 Reviewed-by: tazjin Autosubmit: tazjin Tested-by: BuildkiteCI --- users/tazjin/nixos/polyanka/default.nix | 4 ++-- users/tazjin/nixos/tverskoy/default.nix | 4 ++-- users/tazjin/nixos/zamalek/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/users/tazjin/nixos/polyanka/default.nix b/users/tazjin/nixos/polyanka/default.nix index 5758ee39b3..fc30b82373 100644 --- a/users/tazjin/nixos/polyanka/default.nix +++ b/users/tazjin/nixos/polyanka/default.nix @@ -6,8 +6,8 @@ _: # ignore readTree options { config, depot, lib, pkgs, ... }: let - mod = name: depot.path + ("/ops/modules/" + name); - usermod = name: depot.path + ("/users/tazjin/nixos/modules/" + name); + mod = name: depot.path.origSrc + ("/ops/modules/" + name); + usermod = name: depot.path.origSrc + ("/users/tazjin/nixos/modules/" + name); in { imports = [ diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix index a1248c6c5d..4a94e58c5f 100644 --- a/users/tazjin/nixos/tverskoy/default.nix +++ b/users/tazjin/nixos/tverskoy/default.nix @@ -9,8 +9,8 @@ let monolithic = false; }; - mod = name: depot.path + ("/ops/modules/" + name); - usermod = name: depot.path + ("/users/tazjin/nixos/modules/" + name); + mod = name: depot.path.origSrc + ("/ops/modules/" + name); + usermod = name: depot.path.origSrc + ("/users/tazjin/nixos/modules/" + name); in lib.fix (self: { imports = [ diff --git a/users/tazjin/nixos/zamalek/default.nix b/users/tazjin/nixos/zamalek/default.nix index 71e230347a..be5b204277 100644 --- a/users/tazjin/nixos/zamalek/default.nix +++ b/users/tazjin/nixos/zamalek/default.nix @@ -3,8 +3,8 @@ config: let - mod = name: depot.path + ("/ops/modules/" + name); - usermod = name: depot.path + ("/users/tazjin/nixos/modules/" + name); + mod = name: depot.path.origSrc + ("/ops/modules/" + name); + usermod = name: depot.path.origSrc + ("/users/tazjin/nixos/modules/" + name); zdevice = device: { inherit device; -- cgit 1.4.1