From 62390ab4c323183c6c23f0e4bea6ea01908f6be5 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Sat, 12 Feb 2022 13:50:39 -0800
Subject: hosts: import common modules

Update the `mkSystem` function to include the proper common module, and
fix the path to import the common configuration for a desktop into
`carmel`.
---
 hosts/carmel/default.nix | 3 +--
 lib/default.nix          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix
index dcc1c7a..9abd61a 100644
--- a/hosts/carmel/default.nix
+++ b/hosts/carmel/default.nix
@@ -4,8 +4,7 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../commons
-      ../../modules/desktop
+      ../common/desktop
     ];
 
   # Use the systemd-boot EFI boot loader.
diff --git a/lib/default.nix b/lib/default.nix
index 4fdd3f1..fbb9bb7 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,7 +11,7 @@
         inherit inputs system hostname;
       };
       modules = [
-        ../modules/systems
+        ../hosts/common
         ../hosts/${hostname}
         {
           networking.hostName = hostname;
-- 
cgit 1.4.1