fix

profiles/base.nix

@@ -1,16 +1,15 @@
 {
   pkgs,
-  userName,
+  username,
   ...
 }:
 {
   imports = [
-    ../modules/nix/boot
-    ../modules/nix/caches.nix
-    ../modules/nix/gc.nix
-    ../modules/nix/hardware
-    ../modules/nix/user.nix
-    ../modules/nix/network
+    ../modules/system/boot
+    ../modules/system/caches.nix
+    ../modules/system/gc.nix
+    ../modules/system/hardware
+    ../modules/system/network
   ];
 
   programs = {
@@ -32,6 +31,6 @@
     unstable.msedit # Microsoft Editor
   ];
 
-  home-manager.users.${userName}.imports = [
+  home-manager.users.${username}.imports = [
   ];
 }

profiles/cli-minimal.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  userName,
+  username,
   ...
 }:
 {
@@ -31,5 +31,5 @@
     unstable.opencode # Coding AI Assistant
   ];
 
-  home-manager.users.${userName}.imports = [ ];
+  home-manager.users.${username}.imports = [ ];
 }

profiles/cli-vm.nix

@@ -1,7 +1,7 @@
-{ userName, ... }:
+{ username, ... }:
 {
   imports = [
     ./cli-minimal.nix
   ];
-  home-manager.users.${userName}.imports = [ ];
+  home-manager.users.${username}.imports = [ ];
 }

profiles/desktop.nix

@@ -1,7 +1,7 @@
-{ userName, ... }:
+{ username, ... }:
 {
   imports = [
     ./gui.nix
   ];
-  home-manager.users.${userName}.imports = [ ];
+  home-manager.users.${username}.imports = [ ];
 }

profiles/gui.nix

@@ -1,23 +1,26 @@
 {
   pkgs,
-  userName,
+  username,
   ...
 }:
 {
   imports = [
     ./cli-minimal.nix
-    ../modules/nix/hardware/gui.nix
-    ../modules/nix/camera.nix
-    ../modules/nix/fonts.nix
-    ../modules/nix/greetd.nix
-    ../modules/nix/i18n.nix
-    ../modules/nix/kde.nix
-    ../modules/nix/noctalia.nix
+    ../modules/system/hardware/gui.nix
+    ../modules/system/camera.nix
+    ../modules/system/fonts.nix
+    ../modules/applications/greetd.nix
+    ../modules/applications/fcitx5.nix
+    ../modules/applications/kde.nix
   ];
 
-  programs = {
+  my.applications = {
     niri.enable = true;
-    xwayland.enable = true;
+    noctalia.enable = true;
+    wayland.enable = true;
+  };
+
+  programs = {
     dconf.enable = true;
     seahorse.enable = true;
   };
@@ -34,5 +37,5 @@
     wf-recorder # A Screen Recorder For Wayland
   ];
 
-  home-manager.users.${userName}.imports = [ ];
+  home-manager.users.${username}.imports = [ ];
 }

profiles/laptop.nix

@@ -1,15 +1,15 @@
 {
   pkgs,
-  userName,
+  username,
   ...
 }:
 {
   imports = [
     ./gui.nix
-    ../modules/nix/bluetooth.nix
-    ../modules/nix/fingerprint.nix
-    ../modules/nix/network/wifi.nix
-    ../modules/nix/power.nix
+    ../modules/system/hardware/bluetooth.nix
+    ../modules/system/fingerprint.nix
+    ../modules/system/network/wifi.nix
+    ../modules/system/power.nix
   ];
 
   environment.systemPackages = with pkgs; [
@@ -17,5 +17,5 @@
     sbctl # Secure Boot Key Management Tool
   ];
 
-  home-manager.users.${userName}.imports = [ ];
+  home-manager.users.${username}.imports = [ ];
 }