Begin stabilize system module

modules/default.nix

@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ./cli
-    ./desktop
-    ./server
+    # ./cli
+    # ./desktop
+    # ./server
     ./system
   ];
 }

modules/desktop/default.nix

@@ -2,14 +2,8 @@
 
 {
   imports = [
-    ./chromium
-    ./flatpak
-    ./gamingKernel
     ./gnome
     ./hyprland
-    ./jetbrainsToolbox
-    ./kitty
     ./plasma
-    ./vscode
   ];
 }

modules/desktop/plasma/default.nix

@@ -2,12 +2,12 @@
 
 with lib;
 let
-  cfg = config.modules.system.plymouth;
+  cfg = config.modules.system.plasma;
 in
 {
-  options.modules.system.plymouth = {
+  options.modules.system.plasma = {
     enable = mkEnableOption ''
-      Enable plymouth with my custom configurations
+      Enable plasma with my custom configurations
     '';
   };
   config = mkIf cfg.enable {

modules/home/default.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./chromium
+    ./flatpak
+    ./jetbrainsToolbox
+    ./kitty
+    ./vscode
+  ];
+}

modules/home/vscode/default.nix

@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.desktop.vscode;
+  cfg = config.modules.home.vscode;
 in
 {
-  options.modules.desktop.vscode = {
+  options.modules.home.vscode = {
     enable = mkEnableOption ''
       Enable vscode with my custom configurations
     '';

modules/system/bluetooth/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let

modules/system/default.nix

@@ -1,13 +1,15 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
   imports = [
     ./bluetooth
-    ./keymaps
+    ./gamingKernel
+    # ./keymaps
     ./nvidia
     ./pipewire
     ./plymouth
     ./printing
+    ./waydroid
 
     # Common configuration
     ./system.nix

modules/system/gamingKernel/default.nix

@@ -2,15 +2,15 @@
 
 with lib;
 let
-  cfg = config.modules.desktop.gamingKernel;
+  cfg = config.modules.system.gamingKernel;
 in
 {
-  options.modules.desktop.gamingKernel = {
+  options.modules.system.gamingKernel = {
     enable = mkEnableOption ''
       Enable gaming kernel with my custom configurations
     '';
   };
   config = mkIf cfg.enable {
-    virtualisation.waydroid.enable = true;
+    boot.kernelPackages = pkgs.linuxPackages_zen;
   };
 }

modules/system/keymaps/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let
@@ -15,9 +15,5 @@ in
       type = types.string;
     };
   };
-  config = {
-    imports = [
-      ./${cfg.layout}
-    ];
-  };
+  config = (import ./${cfg.layout}.nix {});
 }

modules/system/keymaps/fr.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 {
   # Configure keymap in X11
   services.xserver = {

modules/system/keymaps/us.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ ... }:
 {
   # Configure keymap in X11
   services.xserver = {

modules/system/nvidia/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let

modules/system/pipewire/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let

modules/system/plymouth/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let

modules/system/printing/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let

modules/system/system.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   # Set your time zone.

modules/system/waydroid/default.nix

@@ -2,15 +2,15 @@
 
 with lib;
 let
-  cfg = config.modules.desktop.waydroid;
+  cfg = config.modules.system.waydroid;
 in
 {
-  options.modules.desktop.waydroid = {
+  options.modules.system.waydroid = {
     enable = mkEnableOption ''
       Enable waydroid with my custom configurations
     '';
   };
   config = mkIf cfg.enable {
-    boot.kernelPackages = pkgs.linuxPackages_zen;
+    virtualisation.waydroid.enable = true;
   };
 }