diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix
index 6a84695..1c2fbac 100755
--- a/.config/nix/flake.nix
+++ b/.config/nix/flake.nix
@@ -10,6 +10,7 @@
       mecca = nixpkgs.lib.nixosSystem { 
         system = "x86_64-linux"; 
         specialArgs = {inherit inputs;}; modules = [ 
+          ./hosts/common.nix
           ./hosts/mecca/configuration.nix 
           inputs.stylix.nixosModules.stylix 
         ]; 
@@ -18,6 +19,7 @@
         system = "x86_64-linux"; 
         specialArgs = {inherit inputs;}; 
         modules = [ 
+          ./hosts/common.nix  
           ./hosts/syntheticnexus/configuration.nix 
           inputs.stylix.nixosModules.stylix 
         ]; 
diff --git a/.config/nix/hosts/generic-linux/home.nix b/.config/nix/hosts/generic-linux/home.nix
deleted file mode 100644
index e69de29..0000000
diff --git a/.config/nix/hosts/mecca/configuration.nix b/.config/nix/hosts/mecca/configuration.nix
index 9de416f..a8217f1 100644
--- a/.config/nix/hosts/mecca/configuration.nix
+++ b/.config/nix/hosts/mecca/configuration.nix
@@ -150,7 +150,6 @@
     terminus_font # font
     neovim # Terminal text editor
     wget # coreutil for some script compatibility
-    htop # Resource manager
     waybar # Status bar
     libnotify # Desktop notifications
     swww # Wallpaper manager
diff --git a/.config/nix/hosts/mecca/home.nix b/.config/nix/hosts/mecca/home.nix
deleted file mode 100644
index 1978690..0000000
--- a/.config/nix/hosts/mecca/home.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "lunita";
-  home.homeDirectory = "/home/lunita";
-
-  home.stateVersion = "25.05";
-
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases = {
-      c = "clear";
-      nf = "neofetch";
-      hmc = "nvim ~/dotfiles/.config/nix/hosts/mecca/home.nix";
-      nxr = "sudo nixos-rebuild switch --flake ~/.config/nix#${config.home.sessionVariables.HOSTNAME}";
-      v = "nvim";
-      d = "cd ~/Documents";
-      D = "cd ~/Downloads";
-    };
-
-    initContent = ''
-      # '~' => goto base of user home directory
-      alias ~='cd ~'
-      # Vim keybinds
-      bindkey -v 
-      # Preferred editor for local and remote sessions
-      if [[ -n $SSH_CONNECTION ]]; then
-        export EDITOR='vim'
-      else 
-        export EDITOR='nvim'
-      fi 
-      # Set TERM for Ghostty ssh workaround
-      if [[ "$TERM_PROGRAM" == "ghostty" ]]; then
-        export TERM=xterm-256color
-      fi
-    '';
-
-    history.size = 10000;
-
-    oh-my-zsh = {
-      enable = true;
-      plugins = [ "git" ];
-      theme = "lambda";
-    };
-  };
-
-  programs.git = {
-    enable = true;
-    userName = "lulusilly";
-    userEmail = "lunita@puppygirl.onl";
-    aliases = {
-      ci = "commit";
-      co = "checkout";
-      s = "status";
-      pu = "push origin master"
-    };
-  };
- 
-  programs.waybar = {
-    enable = true;
-    package = pkgs.waybar;
-
-    # Define the Waybar style.css content here
-    style = ''
-      * {
-        font-family: "Miracode", monospace;
-        font-size: 13px;
-      }
-
-      #window {
-        background-color: #333333;
-        color: #FF7300;
-        border-radius: 8px;
-        padding: 0 10px;
-      }
-    '';
-
-    # Define the Waybar config content here (JSON format)
-    settings = {
-      mainBar = {
-        layer = "top";
-        position = "top";
-        modules-left = [ "hyprland/workspaces" "hyprland/window" ];
-        modules-center = [ "clock" ];
-        modules-right = [ "network" "pulseaudio" "battery" ];
-      };
-    };
-  };
-   
-  nixpkgs.config.allowUnfree = true;
-  home.packages = with pkgs; [
-    tree # Nice file tree views w/permissions
-    neofetch # Muh epic r1ce!!!
-    btop # Resource manager
-    stow # For dotfiles deployment. May use home.file in future 
-    imagemagick # For converting images into other fmts
-    sxiv # Minimal image viewer
-    mpv # Video player
-    zathura # PDF/CBZ/EPUB/DJVU reader
-    tmux # Tride and true terminal multiplexer
-    obsidian # For epic note taking (really just mediocre journaling)
-    keepassxc # Secure password manager
-    syncthing # Self explanatory
-
-    # Fonts
-    nerd-fonts.jetbrains-mono
-    miracode
-    monocraft
-  ];
-
-  fonts.fontconfig.enable = true;
-
-  home.file = {
-  };
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    HOSTNAME = builtins.getEnv "HOSTNAME";
-  };
-  programs.home-manager.enable = true;
-}