From c11c0921da6d6cb570503f26435e8f07865564ed Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Fri, 28 Jul 2023 12:30:22 +0200
Subject: [PATCH] moved base
---
lib/default.nix | 4 ++--
base.nix => machines/base.nix | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
rename base.nix => machines/base.nix (97%)
diff --git a/lib/default.nix b/lib/default.nix
index fe89db9..61b377a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -17,7 +17,7 @@ in
inherit inputs;
};
modules = builtins.attrValues modules ++ [
- ../base.nix
+ ../machines/base.nix
inputs.sops-nix.nixosModules.sops
host-config
home-manager.nixosModules.home-manager
@@ -67,7 +67,7 @@ in
extraModules = [ inputs.colmena.nixosModules.deploymentOptions ];
};
- importConfig = path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (readDir path));
+ importConfig = path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (final.filterAttrs (_: v: v == "directory") (readDir path)));
mkSubdomain = name: port: {
luj.nginx.enable = true;
diff --git a/base.nix b/machines/base.nix
similarity index 97%
rename from base.nix
rename to machines/base.nix
index 5de4683..a6c751c 100644
--- a/base.nix
+++ b/machines/base.nix
@@ -8,7 +8,7 @@
luj.programs.mosh.enable = true;
luj.deployment.enable = true;
- sops.defaultSopsFile = ./secrets/secrets.yaml;
+ sops.defaultSopsFile = ../secrets/secrets.yaml;
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
time.timeZone = "Europe/Paris";