From 5f2309c77368a37150de238349e7bcd9ee01654c Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Wed, 28 Apr 2021 01:55:09 +0100
Subject: [PATCH] nixos: Directory optionality fixes

---
 nixos.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos.nix b/nixos.nix
index 970473a8..8b2877e5 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -4,7 +4,8 @@
 
   imports =
     [ (import (./hosts + "/${hostName}/nixos")) ./profiles/common/nixos.nix ]
-    ++ lib.optional (builtins.pathExists ./private/hosts)
+    ++ lib.optional
+    (builtins.pathExists (./private/hosts + "/${hostName}/nixos"))
     (import (./private/hosts + "/${hostName}/nixos"))
     ++ lib.optional (builtins.pathExists ./private/profile)
     ./private/profile/nixos;
@@ -35,7 +36,11 @@
 
       users = {
         kat = {
-          imports = [ ./home.nix (import (./hosts + "/${hostName}/home")) ];
+          imports = [ ./home.nix ] ++ lib.optional
+            (builtins.pathExists (./hosts + "/${hostName}/home"))
+            (import (./hosts + "/${hostName}/home")) ++ lib.optional
+            (builtins.pathExists (./private/hosts + "/${hostName}/home"))
+            (import (./private/hosts + "/${hostName}/home"));
 
           options = {
             deploy.profile.kat = lib.mkEnableOption "uhh meow";