Feat: Switch to default.nix

7 files changed, 10 insertions, 10 deletions

diff --git a/system/boot/boot.nix b/system/boot/default.nix
index f978d26a..f978d26a 100644
--- a/system/boot/boot.nix
+++ b/system/boot/default.nix
diff --git a/system/default.nix b/system/default.nix
index 17e78968..81949ce4 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,10 +1,10 @@
 {config, ...}: {
   imports = [
-    ./boot/boot.nix
-    ./filesystemLayouts/filesystemLayouts.nix
-    ./locale/locale.nix
-    ./packages/packages.nix
-    ./sound/sound.nix
-    ./users/users.nix
+    ./boot
+    ./users # this needs to be before fileSystemLayouts
+    ./fileSystemLayouts
+    ./locale
+    ./packages
+    ./sound
   ];
 }
diff --git a/system/filesystemLayouts/filesystemLayouts.nix b/system/fileSystemLayouts/default.nix
index a4215512..bdbad630 100644
--- a/system/filesystemLayouts/filesystemLayouts.nix
+++ b/system/fileSystemLayouts/default.nix
@@ -4,10 +4,10 @@
   ...
 }:
 with lib; let
-  cfg = config.system.filesystemLayouts;
+  cfg = config.system.fileSystemLayouts;
 in {
-  options.system.filesystemLayouts = {
-    enable = mkEnableOption (mdDoc "filesysetemLayout");
+  options.system.fileSystemLayouts = {
+    enable = mkEnableOption (mdDoc "fileSystemLayout");
     mainDisk = mkOption {
       type = lib.types.path;
       example = literalExpression "/dev/disk/by-uuid/0442cb6d-f13a-4635-b487-fa76189774c5";
@@ -47,7 +47,7 @@ in {
         options = ["bind"];
       };
 
-      "${config.users.soispha.home}/.config" = {
+      "${config.users.users.soispha.home}/.config" = {
         device = "none";
         fsType = "tmpfs";
         options = ["defaults" "size=1G" "mode=755"];
diff --git a/system/locale/locale.nix b/system/locale/default.nix
index 2fcc2115..2fcc2115 100644
--- a/system/locale/locale.nix
+++ b/system/locale/default.nix
diff --git a/system/packages/packages.nix b/system/packages/default.nix
index 6eb25681..6eb25681 100644
--- a/system/packages/packages.nix
+++ b/system/packages/default.nix
diff --git a/system/sound/sound.nix b/system/sound/default.nix
index 16dd4279..16dd4279 100644
--- a/system/sound/sound.nix
+++ b/system/sound/default.nix
diff --git a/system/users/users.nix b/system/users/default.nix
index 2c962c26..2c962c26 100644
--- a/system/users/users.nix
+++ b/system/users/default.nix