home

commit d260830df87b9a00c7c84fd5269a17cc3bc88325
parent 1bbf9aac0a7239c99f2fbbe80d7b39436dec1611
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 19 Aug 2022 12:56:12 +0000

systems/modules: fix core modules

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/modules/core/boot.nix
 | 
4
++--
M
systems/modules/core/default.nix
 | 
2
+-
M
systems/modules/desktop/base.nix
 | 
5
+----

3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/systems/modules/core/boot.nix b/systems/modules/core/boot.nix
@@ -1,4 +1,4 @@
-{ config, pkgs }:
+{ config, lib, pkgs, ... }:
 
 let
   inherit (lib) mkOption types;
@@ -14,6 +14,6 @@ in
     };
   };
   config = {
-    boot.load.systemd-boot.enable = cfg.systemd-boot;
+    boot.loader.systemd-boot.enable = cfg.systemd-boot;
   };
 }
diff --git a/systems/modules/core/default.nix b/systems/modules/core/default.nix
@@ -1,6 +1,6 @@
 {
   imports = [
-    #./boot.nix
+    ./boot.nix
     ./config.nix
     ./nix.nix
     ./users.nix
diff --git a/systems/modules/desktop/base.nix b/systems/modules/desktop/base.nix
@@ -23,8 +23,8 @@ in
   };
   config = mkIf cfg.enable {
     # Enable netbootxyz if systemd-boot is enabled
-    loader.systemd-boot.netbootxyz.enable = core.boot.systemd-boot;
     boot = {
+      loader.systemd-boot.netbootxyz.enable = config.core.boot.systemd-boot;
       # /tmp to be tmpfs
       tmpOnTmpfs = true;
       # Enable Plymouth on desktops
@@ -35,9 +35,6 @@ in
       };
     };
 
-    # FIXME Fix tmpOnTmpfs
-    systemd.additionalUpstreamSystemUnits = [ "tmp.mount" ];
-
     # Configure some fonts
     fonts = {
       # enableFontDir = true;