From 008cdf87ee65fbd7d839741262878c29532b113d Mon Sep 17 00:00:00 2001
From: Laurent Gueret <gueretlob@pm.me>
Date: Sat, 24 Jan 2026 19:07:42 +0100
Subject: [PATCH] Fix on modules settings

---
 modules/apps/default.nix        |  8 +++-----
 modules/nixos/default.nix       | 12 +++++-------
 modules/nixos/services/boot.nix |  2 +-
 nixos/configuration.nix         | 17 +++++++----------
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 1d2849c..ef99cc5 100755
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -1,7 +1,5 @@
 {
-  within = {
-    shell = import ./services/shell.nix;
-    gnome = import ./services/gnome.nix;
-    zed = import ./submodules/zed.nix;
-  };
+  shell = import ./services/shell.nix;
+  gnome = import ./services/gnome.nix;
+  zed = import ./submodules/zed.nix;
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f98da38..54fde2e 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,9 +1,7 @@
 {
-  within = {
-    boot = import ./services/boot.nix;
-    graphics = import ./services/graphics.nix;
-    networks = import ./services/networks.nix;
-    audio = import ./services/audio.nix;
-    keyboard = import ./services/keyboard.nix;
-  };
+  boot = import ./services/boot.nix;
+  graphics = import ./services/graphics.nix;
+  networks = import ./services/networks.nix;
+  audio = import ./services/audio.nix;
+  keyboard = import ./services/keyboard.nix;
 }
diff --git a/modules/nixos/services/boot.nix b/modules/nixos/services/boot.nix
index 0dd5d16..69ed3a3 100644
--- a/modules/nixos/services/boot.nix
+++ b/modules/nixos/services/boot.nix
@@ -1,4 +1,4 @@
 {
   systemd = import ../submodules/systemd-boot.nix;
-  plymouth = ../submodules/plymouth.nix;
+  plymouth = import ../submodules/plymouth.nix;
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index e200dec..88e8900 100755
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -16,9 +16,6 @@
     ./configurations/users.nix
     ./configurations/home-manager.nix
 
-    # Modules
-    inputs.self.nixos.within
-
   ];
 
   nixpkgs = {
@@ -49,15 +46,15 @@
   time.timeZone = "Europe/Brussels";
 
   # System services
-  within.boot.bootd.enable = true;
-  within.boot.plymouth.enable = true;
-  within.graphics.nvidia.base.enable = true;
-  within.audio.pipewire.enable = true;
-  within.networks.dns.enable = true;
-  within.networks.manager.enable = true;
+  nixos.boot.systemd.enable = true;
+  nixos.boot.plymouth.enable = true;
+  nixos.graphics.nvidia.base.enable = true;
+  nixos.audio.pipewire.enable = true;
+  nixos.networks.dns.enable = true;
+  nixos.networks.manager.enable = true;
 
   # System configurations
-  within.keyboard.apple.enable = true;
+  nixos.keyboard.apple.enable = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "25.11";