diff --git a/modules/apps/1password/1password.nix b/modules/apps/sys/1password.nix
similarity index 68%
rename from modules/apps/1password/1password.nix
rename to modules/apps/sys/1password.nix
index fa924ed..f2595ed 100644
--- a/modules/apps/1password/1password.nix
+++ b/modules/apps/sys/1password.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.onepassword = {
+  flake.nixosModules.apps-sys-onepassword = {
     programs._1password.enable = true;
     programs._1password-gui.enable = true;
   };
diff --git a/modules/apps/browser/brave.nix b/modules/apps/sys/brave.nix
similarity index 60%
rename from modules/apps/browser/brave.nix
rename to modules/apps/sys/brave.nix
index 9550f79..8765a17 100644
--- a/modules/apps/browser/brave.nix
+++ b/modules/apps/sys/brave.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.brave = { pkgs, ... }: {
+  flake.nixosModules.apps-sys-brave = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [
       brave
     ];
diff --git a/modules/apps/browser/chrome.nix b/modules/apps/sys/chrome.nix
similarity index 60%
rename from modules/apps/browser/chrome.nix
rename to modules/apps/sys/chrome.nix
index 2933063..60223c5 100644
--- a/modules/apps/browser/chrome.nix
+++ b/modules/apps/sys/chrome.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.chrome = { pkgs, ... }: {
+  flake.nixosModules.apps-sys-chrome = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [
       chrome
     ];
diff --git a/modules/base/base.nix b/modules/base/base.nix
deleted file mode 100644
index 94b0b2f..0000000
--- a/modules/base/base.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ inputs, config, ... }: {
-  flake.nixosModules.base = {
-    imports = with inputs.self.nixosModules; [
-      boot
-      firmware
-      home-manager
-      locale
-      network
-      nix-settings
-      rtkit
-      shellapps
-      sshd
-      version
-      zsh
-    ];
-  };
-
-  flake.homeModules.base = { ... }: {
-    imports = with config.flake.homeModules; [
-      git-allusers
-      zsh-allusers
-    ];
-  };
-}
diff --git a/modules/base/boot/boot.nix b/modules/base/boot/boot.nix
deleted file mode 100644
index 8d2cc12..0000000
--- a/modules/base/boot/boot.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }: {
-  flake.nixosModules.boot = {
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.systemd-boot.consoleMode = "max";
-    boot.loader.efi.canTouchEfiVariables = true;
-    boot.loader.timeout = 1;
-    boot.consoleLogLevel = 0;
-    boot.initrd.verbose = false;
-    boot.initrd.enable = true;
-    boot.plymouth.enable = true;
-    boot.plymouth.theme = "bgrt";
-  };
-}
diff --git a/modules/base/firmware/firmware.nix b/modules/base/firmware/firmware.nix
deleted file mode 100644
index 67b3465..0000000
--- a/modules/base/firmware/firmware.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  flake.nixosModules.firmware = {
-    services.fwupd.enable = true;
-    hardware.enableAllFirmware = true;
-  };
-}
diff --git a/modules/base/git/git-allusers.nix b/modules/base/git/git-allusers.nix
deleted file mode 100644
index 315d32f..0000000
--- a/modules/base/git/git-allusers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ inputs, ... }: {
-  flake.homeModules.git-allusers = { ... }: {
-    programs.git = {
-      enable = true;
-      settings.user.name = "Mohamed Chrayed";
-      settings.user.email = "mohamed@chrayed.de";
-      settings = {
-        init.defaultBranch = "main";
-        core.editor = "nano";
-      };
-    };
-  };
-}
diff --git a/modules/base/home-manager/home-manager.nix b/modules/base/home-manager/home-manager.nix
deleted file mode 100644
index 13b02e8..0000000
--- a/modules/base/home-manager/home-manager.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ inputs, config, ... }:
-{
-  flake.nixosModules.home-manager = {
-    imports = [
-      inputs.home-manager.nixosModules.home-manager
-      (
-        { lib, ... }:
-        {
-          home-manager = {
-            verbose = true;
-            useUserPackages = true;
-            useGlobalPkgs = true;
-            backupFileExtension = "backup";
-            backupCommand = "rm";
-            overwriteBackup = true;
-          };
-        }
-      )
-    ];
-  };
-}
diff --git a/modules/base/locale/locale.nix b/modules/base/locale/locale.nix
deleted file mode 100644
index 8d1e48e..0000000
--- a/modules/base/locale/locale.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ ... }: {
-  flake.nixosModules.locale = {
-    time.timeZone = "Europe/Berlin";
-    i18n.defaultLocale = "de_DE.UTF-8";
-    console.keyMap = "de";
-    services.xserver.xkb.layout = "de";
-    i18n.extraLocaleSettings = {
-      LC_ADDRESS = "de_DE.UTF-8";
-      LC_IDENTIFICATION = "de_DE.UTF-8";
-      LC_MEASUREMENT = "de_DE.UTF-8";
-      LC_MONETARY = "de_DE.UTF-8";
-      LC_NAME = "de_DE.UTF-8";
-      LC_NUMERIC = "de_DE.UTF-8";
-      LC_PAPER = "de_DE.UTF-8";
-      LC_TELEPHONE = "de_DE.UTF-8";
-      LC_TIME = "de_DE.UTF-8";
-    };
-  };
-}
diff --git a/modules/base/network/network.nix b/modules/base/network/network.nix
deleted file mode 100644
index 9de3c8b..0000000
--- a/modules/base/network/network.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  flake.nixosModules.network = {lib, host, ... }:{
-    networking.firewall.enable = true;
-    networking.networkmanager.enable = true;
-    networking.hostName = host;
-  };
-}
diff --git a/modules/base/nix-settings/nix-settings.nix b/modules/base/nix-settings/nix-settings.nix
deleted file mode 100644
index 294b902..0000000
--- a/modules/base/nix-settings/nix-settings.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  flake.nixosModules.nix-settings = {
-    nixpkgs.config.allowUnfree = true;
-    nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  };
-}
diff --git a/modules/base/rtkit/security.nix b/modules/base/rtkit/security.nix
deleted file mode 100644
index 64b33b4..0000000
--- a/modules/base/rtkit/security.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.nixosModules.rtkit = {
-    security.rtkit.enable = true;
-  };
-}
diff --git a/modules/base/shellapps/shellapps.nix b/modules/base/shellapps/shellapps.nix
deleted file mode 100644
index d86d064..0000000
--- a/modules/base/shellapps/shellapps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }: {
-  flake.nixosModules.shellapps = { pkgs, ... }: {
-    environment.systemPackages = with pkgs; [
-      wget
-      git
-      nil
-      yaml-language-server
-      tree
-    ];
-  };
-}
diff --git a/modules/base/sshd/sshd.nix b/modules/base/sshd/sshd.nix
deleted file mode 100644
index 246ae34..0000000
--- a/modules/base/sshd/sshd.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.nixosModules.sshd = { config, ... }: {
-    services.openssh.enable = true;
-  };
-}
diff --git a/modules/base/version/version.nix b/modules/base/version/version.nix
deleted file mode 100644
index 77bbc01..0000000
--- a/modules/base/version/version.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.nixosModules.version = {
-   system.stateVersion = "25.11";
-  };
-}
diff --git a/modules/base/zsh/dotfiles/zsh-config b/modules/base/zsh/dotfiles/zsh-config
deleted file mode 100644
index e69de29..0000000
diff --git a/modules/base/zsh/zsh-allusers.nix b/modules/base/zsh/zsh-allusers.nix
deleted file mode 100644
index ffe5867..0000000
--- a/modules/base/zsh/zsh-allusers.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.homeModules.zsh-allusers = { ... }: {
-    home.file.".zshrc".source = ./dotfiles/zsh-config;
-  };
-}
diff --git a/modules/base/zsh/zsh.nix b/modules/base/zsh/zsh.nix
deleted file mode 100644
index 506306c..0000000
--- a/modules/base/zsh/zsh.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ ... }: {
-  flake.nixosModules.zsh = { pkgs, ... }: {
-    programs.zsh.enable = true;
-    programs.zsh.enableCompletion = true;
-    programs.zsh.syntaxHighlighting.enable = true;
-    programs.zsh.autosuggestions.enable = true;
-    programs.zsh.autosuggestions.async = true;
-    programs.zsh.ohMyZsh.enable = true;
-    programs.zsh.ohMyZsh.theme = "agnoster";
-    users.defaultUserShell = pkgs.zsh;
-  };
-}
diff --git a/modules/desktop/bluetooth/bluetooth.nix b/modules/desktop/bluetooth/bluetooth.nix
deleted file mode 100644
index 238a976..0000000
--- a/modules/desktop/bluetooth/bluetooth.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  flake.nixosModules.bluetooth = {
-    hardware.bluetooth.enable = true;
-    hardware.bluetooth.powerOnBoot = true;
-  };
-}
diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
deleted file mode 100644
index d946ba0..0000000
--- a/modules/desktop/desktop.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosModules.desktop = {
-    imports = with inputs.self.nixosModules; [
-      bluetooth
-      fonts
-      gpu-amd
-      input
-      printing
-      sound
-      miscapps
-    ];
-  };
-}
diff --git a/modules/desktop/fonts/fonts.nix b/modules/desktop/fonts/fonts.nix
deleted file mode 100644
index 7dd18d4..0000000
--- a/modules/desktop/fonts/fonts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.fonts = { pkgs-unstable, ... }: {
-    environment.systemPackages = with pkgs-unstable; [
-      ibm-plex
-      adwaita-fonts
-    ];
-  };
-}
diff --git a/modules/desktop/gpu-amd/gpu-amd.nix b/modules/desktop/gpu-amd/gpu-amd.nix
deleted file mode 100644
index e7765fa..0000000
--- a/modules/desktop/gpu-amd/gpu-amd.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }: {
-  flake.nixosModules.gpu-amd = { pkgs, ... }: {
-    boot.initrd.kernelModules = [ "amdgpu" ];
-    boot.kernelModules = [ "amdgpu" ];
-
-    hardware.amdgpu.initrd.enable = true;
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
-
-    environment.systemPackages = with pkgs; [
-      vulkan-tools
-    ];
-  };
-}
diff --git a/modules/desktop/input/input.nix b/modules/desktop/input/input.nix
deleted file mode 100644
index 2275044..0000000
--- a/modules/desktop/input/input.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.nixosModules.input = {
-    services.libinput.enable = true;
-  };
-}
diff --git a/modules/desktop/miscapps/miscapps.nix b/modules/desktop/miscapps/miscapps.nix
deleted file mode 100644
index 365854b..0000000
--- a/modules/desktop/miscapps/miscapps.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }: {
-  flake.nixosModules.miscapps = { pkgs, ... }: {
-    environment.systemPackages = with pkgs; [
-      vesktop
-      pciutils
-      aha
-    ];
-  };
-}
diff --git a/modules/desktop/printing/printing.nix b/modules/desktop/printing/printing.nix
deleted file mode 100644
index 920c348..0000000
--- a/modules/desktop/printing/printing.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }: {
-  flake.nixosModules.printing = {
-    services.printing.enable = true;
-  };
-}
diff --git a/modules/desktop/sound/sound.nix b/modules/desktop/sound/sound.nix
deleted file mode 100644
index 2b7a3c9..0000000
--- a/modules/desktop/sound/sound.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }: {
-  flake.nixosModules.sound = { ... }: {
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-  };
-}
diff --git a/modules/disks/singledisk/singledisk.nix b/modules/disks/singledisk/singledisk.nix
deleted file mode 100644
index 7360371..0000000
--- a/modules/disks/singledisk/singledisk.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ ... }: {
-  flake.nixosModules.singledisk = {
-    fileSystems."/" = {
-      device = "/dev/disk/by-label/root";
-      fsType = "xfs";
-    };
-
-    fileSystems."/boot" = {
-      device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-    swapDevices = [{
-      device = "/var/lib/swapfile";
-      size = 16 * 1024;
-    }];
-  };
-}
diff --git a/modules/gaming/controller/controller.nix b/modules/gaming/controller/controller.nix
deleted file mode 100644
index 05cffb6..0000000
--- a/modules/gaming/controller/controller.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  flake.nixosModules.controller = { ... }: {
-    services.udev.extraRules = ''
-      ACTION=="add|change", KERNEL=="event[0-9]*", ATTRS{name}=="*Wireless Controller Touchpad", ENV{LIBINPUT_IGNORE_DEVICE}="1"
-    '';
-  };
-}
diff --git a/modules/gaming/jovian/jovian.nix b/modules/gaming/jovian/jovian.nix
deleted file mode 100644
index 2ef36d5..0000000
--- a/modules/gaming/jovian/jovian.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.jovian = { ... }:{
-    jovian.steam.enable = true;
-    jovian.steam.autoStart = true;
-    jovian.steam.user = deck;
-    jovian.steam.desktopSession = "gnome";
-  };
-}
diff --git a/modules/gaming/lact/lact.nix b/modules/gaming/lact/lact.nix
deleted file mode 100644
index 7e9d528..0000000
--- a/modules/gaming/lact/lact.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }: {
-  flake.nixosModules.lact = {
-   services.lact.enable = true;
-   hardware.amdgpu.overdrive.enable = true;
-  };
-}
diff --git a/modules/gaming/steam/steam.nix b/modules/gaming/steam/steam.nix
deleted file mode 100644
index cbd72d4..0000000
--- a/modules/gaming/steam/steam.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ ... }: {
-  flake.nixosModules.steam = { pkgs-unstable, ... }: {
-    programs.steam = {
-      enable = true;
-      extest.enable = true;
-      
-      extraCompatPackages = with pkgs-unstable; [
-        proton-ge-bin
-      ];
-
-      extraPackages = with pkgs-unstable; [
-        gamescope
-        mangohud
-      ];
-    };
-  };
-}
diff --git a/modules/gnome/gdm/gdm-mo.nix b/modules/gnome/gdm/gdm-mo.nix
deleted file mode 100644
index c726cf8..0000000
--- a/modules/gnome/gdm/gdm-mo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  flake.nixosModules.gdm-mo = { ... }:{
-    services.displayManager.gdm.enable = true;
-    services.displayManager.autoLogin.enable = true;
-    services.displayManager.autoLogin.user = "mo";
-  };
-}
diff --git a/modules/gnome/gdm/gdm.nix b/modules/gnome/gdm/gdm.nix
deleted file mode 100644
index 8a1e1db..0000000
--- a/modules/gnome/gdm/gdm.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  flake.nixosModules.gdm = { ... }:{
-    services.displayManager.gdm.enable = true;
-    #services.displayManager.autoLogin.enable = true;
-    #services.displayManager.autoLogin.user = user;
-  };
-}
diff --git a/modules/gnome/gnome-apps/gnome-apps.nix b/modules/gnome/gnome-apps/gnome-apps.nix
deleted file mode 100644
index 1ffc77a..0000000
--- a/modules/gnome/gnome-apps/gnome-apps.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }: {
-  flake.nixosModules.gnome-apps = { pkgs-unstable, ...}:{
-     environment.systemPackages = with pkgs-unstable; [
-       adw-gtk3
-       refine
-       nautilus
-       nautilus-python
-       sushi
-       gnome-text-editor
-       gnome-console
-       loupe
-       cine
-       tsukimi
-   ];
-  };
-}
diff --git a/modules/gnome/gnome-de/gnome-mo.nix b/modules/gnome/gnome-de/gnome-mo.nix
deleted file mode 100644
index 4ab186d..0000000
--- a/modules/gnome/gnome-de/gnome-mo.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ ... }: {
-  flake.homeModules.gnome-mo = { ... }: {
-    dconf.settings = {
-      "org/gnome/shell/keybindings" = {
-        focus-active-notification = [];
-        open-new-window-application-1 = [];
-        open-new-window-application-2 = [];
-        open-new-window-application-3 = [];
-        open-new-window-application-4 = [];
-        open-new-window-application-5 = [];
-        open-new-window-application-6 = [];
-        open-new-window-application-7 = [];
-        open-new-window-application-8 = [];
-        open-new-window-application-9 = [];
-        toggle-message-tray = ["<Super>N"];
-      };
-      "org/gnome/settings-daemon/plugins/media-keys" = {
-        help = [];
-        home = ["<Super>E"];
-        screenreader = [];
-        magnifier = [];
-        magnifier-zoom-in = [];
-        magnifier-zoom-out = [];
-      };
-      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-        command = ["kgx --tab"];
-        name = ["Console"];
-      };
-      "org/gnome/desktop/wm/keybindings" = {
-        activate-window-menu = [];
-        always-on-top = ["<Super>T"];
-        begin-move = ["<Super>M"];
-        begin-resize = ["<Super>R"];
-        close = ["<Super>Q"];
-        cycle-group = [];
-        cycle-group-backward = [];
-        cycle-panels = [];
-        cycle-panels-backward = [];
-        cycle-windows = [];
-        cycle-windows-backward = [];
-        lower = [];
-        maximize = [];
-        maximize-horizontally = [];
-        minimize = ["<Super>Down"];
-        move-to-monitor-down = [];
-        move-to-monitor-left = [];
-        move-to-monitor-right = [];
-        move-to-monitor-up = [];
-        move-to-workspace-1 = [];
-        move-to-workspace-down = [];
-        move-to-workspace-last = [];
-        move-to-workspace-left = [];
-        move-to-workspace-right = [];
-        move-to-workspace-up = [];
-        show-desktop = ["<Super>D"];
-        switch-applications = ["<Alt>Tab"];
-        switch-applications-backward = ["<Shift><Alt>Tab"];
-        switch-group = ["<Super>Tab"];
-        switch-group-backward = ["<Shift><Super>Tab"];
-        panel-run-dialog = ["<Alt>Space"];
-        switch-input-source = [];
-        switch-input-source-backward = [];
-        switch-panels = [];
-        switch-panels-backward = [];
-        switch-to-workspace-1 = [];
-        switch-to-workspace-down = [];
-        switch-to-workspace-last = [];
-        switch-to-workspace-left = [];
-        switch-to-workspace-right = [];
-        switch-to-workspace-up = [];
-        toggle-fullscreen = ["<Super>F"];
-        toggle-maximized = ["<Super>Up"];
-        toggle-on-all-workspaces = ["<Super>S"];
-        unmaximize = [];
-      };
-      "org/gnome/mutter" = {
-        experimental-features = ["variable-refresh-rate"];
-        center-new-windows = true;
-        edge-tiling = true;
-        dynamic-workspaces = true;
-      };
-      "org/gnome/desktop/interface" = {
-        font-name = "IBM Plex Sans 11";
-        document-font-name = "IBM Plex Sans 11";
-        monospace-font-name = "IBM Plex Mono 11";
-        gtk-theme = "adw-gtk3";
-        enable-hot-corners = false;
-        cursor-theme = "Adwaita";
-      };
-      "org/gnome/shell/extensions/rounded-window-corners-reborn" = {
-        border-width = -2;
-        skip-libadwaita-app = false;
-      };
-      "org/gnome/shell/extensions/clipboard-indicator" = {
-        toggle-menu = ["<Super>V"];
-      };
-      "org/gnome/shell/extensions/azwallpaper" = {
-        slideshow-use-absolute-time-for-duration = true;
-      };
-      "org/gnome/desktop/background" = {
-        color-shading-type = "solid";
-        picture-options = "zoom";
-      };
-      "org/gnome/shell/extensions/nightthemeswitcher/commands" = {
-        enabled = true;
-        sunrise = "gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3' && gsettings set org.gnome.desktop.interface color-scheme 'default'";
-        sunset = "gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' && gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'";
-      };
-      "org/gnome/shell" = {
-        enabled-extensions = [
-          "light-style@gnome-shell-extensions.gcampax.github.com"
-          "clipboard-indicator@tudmotu.com"
-          "AlphabeticalAppGrid@stuarthayhurst"
-          "rounded-window-corners@fxgn"
-          "appindicatorsupport@rgcjonas.gmail.com"
-          "nightthemeswitcher@romainvigier.fr"
-          "azwallpaper@azwallpaper.gitlab.com"
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/gnome/gnome-de/gnome.nix b/modules/gnome/gnome-de/gnome.nix
deleted file mode 100644
index 12c511c..0000000
--- a/modules/gnome/gnome-de/gnome.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.gnome = { pkgs, ... }: {
-    services.desktopManager.gnome.enable = true;
-    services.gnome.core-apps.enable = false;
-    services.gnome.core-developer-tools.enable = false;
-    services.gnome.games.enable = false;
-  };
-}
diff --git a/modules/hosts/computer-mo/hardware.nix b/modules/hosts/computer-mo/hardware.nix
deleted file mode 100644
index 1f88e94..0000000
--- a/modules/hosts/computer-mo/hardware.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }: {
-  flake.nixosModules.computer-mo = { system, ... }: {
-    boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-    boot.kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" "udev.log_priority=3" ];
-    nixpkgs.hostPlatform = system;
-    hardware.cpu.amd.updateMicrocode = true;
-  };
-}
diff --git a/modules/hosts/computer-mo/imports.nix b/modules/hosts/computer-mo/imports.nix
deleted file mode 100644
index 8827306..0000000
--- a/modules/hosts/computer-mo/imports.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ inputs, config, ... }: {
-  flake.nixosModules.computer-mo = { ... }: {
-    imports = with inputs.self.nixosModules; [
-      base
-      brave
-      controller
-      desktop
-      gdm
-      gdm-mo
-      gnome
-      gnome-apps
-      lact
-      mo
-      onepassword
-      secure-boot
-      singledisk
-      sops-nix
-      steam
-    ];
-    home-manager.users.mo.imports = with config.flake.homeModules; [
-      base
-      gnome-mo
-    ];
-  };
-}
diff --git a/modules/hosts/computer-mo/nixosConfigurations.nix b/modules/hosts/computer-mo/nixosConfigurations.nix
deleted file mode 100644
index 5b3d355..0000000
--- a/modules/hosts/computer-mo/nixosConfigurations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosConfigurations."computer-mo" = inputs.self.lib.mkHost {
-    system = "x86_64-linux";
-    host   = "computer-mo";
-  };
-}
diff --git a/modules/platform/flake-parts.nix b/modules/platform/flake-parts.nix
deleted file mode 100644
index 0242d20..0000000
--- a/modules/platform/flake-parts.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.home-manager.flakeModules.home-manager
-  ];
-}
diff --git a/modules/platform/mkhost.nix b/modules/platform/mkhost.nix
deleted file mode 100644
index c3ddd4e..0000000
--- a/modules/platform/mkhost.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ inputs, ... }: {
-  flake.lib.mkHost = { system, host, extraModules ? [] }:
-    inputs.nixpkgs.lib.nixosSystem {
-      inherit system;
-      specialArgs = {
-        inherit host system;
-        pkgs-unstable = import inputs.nixpkgs-unstable {
-          inherit system;
-          config.allowUnfree = true;
-        };
-      };
-      modules = [ inputs.self.nixosModules.${host} ] ++ extraModules;
-    };
-}
diff --git a/modules/platform/nixsettings.nix b/modules/platform/nixsettings.nix
deleted file mode 100644
index eede17e..0000000
--- a/modules/platform/nixsettings.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ inputs, ... }: {
-  systems = [
-    "x86_64-linux"
-  ];
-
-  perSystem = { system, ... }: {
-    _module.args.pkgs = import inputs.nixpkgs {
-      inherit system;
-      config.allowUnfree = true;
-    };
-
-    _module.args.pkgs-unstable = import inputs.nixpkgs-unstable {
-      inherit system; 
-      config.allowUnfree = true;
-    };
-  };
-}
diff --git a/modules/security/secure-boot/secure-boot.nix b/modules/security/secure-boot/secure-boot.nix
deleted file mode 100644
index 227ef1e..0000000
--- a/modules/security/secure-boot/secure-boot.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosModules.secure-boot = { pkgs, lib, ... }: {
-    imports = [
-      inputs.lanzaboote.nixosModules.lanzaboote
-    ];
-
-    environment.systemPackages = [ pkgs.sbctl ];
-
-    boot.loader.systemd-boot.enable = lib.mkForce false;
-
-    boot.lanzaboote = {
-      enable = true;
-      pkiBundle = "/var/lib/sbctl";
-    };
-  };
-}
diff --git a/modules/security/sops-nix/.sops.yaml b/modules/security/sops-nix/.sops.yaml
deleted file mode 100644
index de89d5e..0000000
--- a/modules/security/sops-nix/.sops.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-keys:
-  - &computer-mo age1yw3dt8myjpq3hek6gadzy8jd04l30ladgva7p74ktl7plfkwqs8qmk8c4x
-  - &mo age1nkqrkx782x6hnn5l8trh2e4v5pgygkx2ql4w8m20pc9jzsq244zs8d44qw
-creation_rules:
-  - path_regex: secrets/secrets.yaml$
-    key_groups:
-    - age:
-      - *computer-mo
-      - *mo
diff --git a/modules/security/sops-nix/secrets/secrets.yaml b/modules/security/sops-nix/secrets/secrets.yaml
deleted file mode 100644
index b40f500..0000000
--- a/modules/security/sops-nix/secrets/secrets.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-users:
-    mo:
-        password: ENC[AES256_GCM,data:fMGtx/NHXyw+zEeedTwnWTsW7SsiheGWAix1kGhPugVn+i9jaa4XazvIRvy4/TKR7naKHUXdeXJtpRvnNIusfZi0vxC6OT82lA==,iv:EVKCYKOj2GOE4FznqNPFXO0vMFYgJSYvTc+7xoFvMaU=,tag:NsMd2OBP4XLynSdRofkpEA==,type:str]
-        intern:
-            public: ENC[AES256_GCM,data:jbuP/i/iK/baGnHrVsXY4OQy0FYiTfOCKSXLd+8DscvMC4gndUpJBH2Jz2JOjMo/W/T5ZLvLfcqzC+d8pe1BofDN7qglc2VIT5nS4+CXq9U=,iv:7tBQilMyisvsAzWh5nAzY7Nyd/ucngt4+Wzn/0Wa8Y8=,tag:QK//7g44v0q2tO8d6VcBrA==,type:str]
-        extern:
-            public: ENC[AES256_GCM,data:Z7WsJxQWrnhLi+Lim9RIZvteyath+Z+e/17fAtvQT+2IZ4D5C1XRpmRG7D0knAMueXciK2sRPgAmkOVNAo7msDFnAqybb879Oyd7ms1dd6I=,iv:cmNClicrACt1lyvTrZRMiZv1EjbGl62GtHK/I2DVgiE=,tag:tH6nnWXowfSrJc8S9gpi+w==,type:str]
-            private: ENC[AES256_GCM,data:GVoLC4n6NGYzHqY6MFPsnquJmrkpmWbrGvDvjmFr8Z1aCr9I1ltKZd2RrrrRJ33KFh/U3x+vwirmdpSOXB8cDynau4XaP9cS+Hgs6LlYHMmAsWiiT5axjTmRvihgNE4mgWpIBZkeI7vrUamdiMt2Bis2JS9qXdLORxyB0Fo9ieQ0B47H17Y75t9AACfpGIRWAd9TGXtycKqxZ5yYmpwmE+Psxhh1VZCk3FPCVt/hxcwd37qmUnbaJKvcyk0J3/fD/JTn6wiNHbLsBpOrk59WclVIosGMI/UWzq24uSEP0WPd4ULyY3jOTIQmh6krsWfjuS3ytTyDJCDocT9zcOJC2GFgTOLSzOzvuQC4LegMuwxchWq7/1jMdLg/DOXG6XuaiVspHhgdsQodJGjz74z7w1TkObNRSMdm9oqbBzt1HWUf/fIYZv57QIPLprMS3H7+qTYan+DjSR7vq0xizTFNzvoMDhhWwGkDkjLROrKCNIVJPHYKWD53p+8Q+wpSnrmAKoOfYKARtsV7vGt/6A5o8z0K2fvZm1FIk9BBbRHan2zbYuqTeMeWbPwuZec5KWyyhB24omY7yMNauuQ04TJEXIUsEEh5CskjsJPW8pr6b1STvkINNZCKSsUZW48xwGi/,iv:UWwcQhaF0KR+waF7wHLEA9T0+K53TYoghs+9LrU8/jo=,tag:l4ndlXfLqdHu/zNF5e+YOw==,type:str]
-sops:
-    age:
-        - recipient: age1yw3dt8myjpq3hek6gadzy8jd04l30ladgva7p74ktl7plfkwqs8qmk8c4x
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDMzF6WTZXRitScFpKdG1m
-            aHBnaThnTmkyanYrL0pIWGlSRXhlTUVzQ1RFCnJYZXBXeHBnN3dWSjFUbDdCb2tZ
-            NU5ZTE82VXltMVJLT3YzSVRIRWpUWkUKLS0tIHhtcno4WmJ6d0Y2NWkrOTZiWkNS
-            Y2xSUE0veVdCaERFUXpVeHdoVUd5V2MKV3DDB8WfAJkZ91MdWzz5Yi0D2u8ozeEi
-            AQY7by2kpV4oJWG96zu6grR1FU/jNqaC+qTCtIcb3/e7pK9pHdstow==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1nkqrkx782x6hnn5l8trh2e4v5pgygkx2ql4w8m20pc9jzsq244zs8d44qw
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvTFcwZnB5RGNNZWQyY2JR
-            ekg1c05BSU9Qay9RYlkxT3pCWlB4T2VJd1VJCmpuc08yZlhZRS93cnpoS0lBeFVY
-            ME1xQUtIcDc0aHJqVmJjUy9BbjhCMG8KLS0tIHpsMGVLSlhKc3JUTlhnTE1HbVUv
-            RVVGdEM3UFg5Y0ZhQmlJTGg1eUQxU1UK0U3aR79JWeFyvQRDVVmyICh1UTDIIeai
-            6E87FDE9XRhAbneR5sHw4ujnZCSyX7njfDMpN23dpWX3smRRKVIsNQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-03T15:55:44Z"
-    mac: ENC[AES256_GCM,data:PLOC5V43pfPcAzE1ZHAFrRedhNkxU4KXO9NU4Hw6PyrYoy9UiTN8H4bJEle5k9YH70hoqk/mAO4rM7B5UZUuz17JktoSaW0AESqi1V9H9LlWPKtJVTXlLm/OeZ456ExdHbocfZ+wKTNRwM1jVhzqqUZfAskuflRQjpIS5sOuJJ8=,iv:E8KIP+WyRt0VmpkfPHKEszYzUwoZAn4/oSShisBMqL0=,tag:Yrfg4uaqnwPirD3E9J5uSg==,type:str]
-    unencrypted_suffix: _unencrypted
-    version: 3.12.1
diff --git a/modules/security/sops-nix/sops-nix.nix b/modules/security/sops-nix/sops-nix.nix
deleted file mode 100644
index 281bc1e..0000000
--- a/modules/security/sops-nix/sops-nix.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosModules.sops-nix = { pkgs, ... }: {
-    imports = [ inputs.sops-nix.nixosModules.sops ];
-
-    environment.systemPackages = [ pkgs.age pkgs.sops ];
-
-    sops.defaultSopsFile = ./secrets/secrets.yaml;
-  };
-}
diff --git a/modules/users/mo.nix b/modules/users/mo.nix
deleted file mode 100644
index 85fd587..0000000
--- a/modules/users/mo.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ inputs, ... }: {
-  flake.nixosModules.mo = { pkgs, config, ... }: {
-    home-manager.extraSpecialArgs = {};
-
-    sops.secrets."users/mo/password" = {
-      neededForUsers = true;
-    };
-    users.mutableUsers = false;     
-    users.users.mo = {
-      isNormalUser = true;
-      description = "Mohamed Chrayed";
-      extraGroups = [ "networkmanager" "wheel" "video" "audio" ];
-      shell = pkgs.zsh;
-      hashedPasswordFile = config.sops.secrets."users/mo/password".path;
-    };
-
-    home-manager.users.mo = {
-      home.username = "mo";
-      home.homeDirectory = "/home/mo";
-      home.stateVersion = "25.11";
-    };
-  };
-}