diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
new file mode 100644
index 0000000..b2922fa
--- /dev/null
+++ b/.config/neofetch/config.conf
@@ -0,0 +1,87 @@
+print_info() {
+    info title
+    info underline
+    info "OS" distro
+    info "Host" model
+    #info "Kernel" kernel
+    info "Uptime" uptime
+    #info "Packages" packages
+    info "Shell" shell
+    info "Resolution" resolution
+    #info "DE" de
+    info "WM" wm
+    #info "Terminal" term
+    info "CPU" cpu
+    #info "GPU" gpu
+    info "Memory" memory
+    info "Disk" disk
+    info cols
+}
+title_fqdn="off"
+kernel_shorthand="on"
+distro_shorthand="off"
+os_arch="off"
+uptime_shorthand="on"
+memory_percent="on"
+memory_unit="gib"
+package_managers="on"
+shell_path="off"
+shell_version="off"
+speed_type="bios_limit"
+speed_shorthand="on"
+cpu_brand="on"
+cpu_speed="on"
+cpu_cores="logical"
+cpu_temp="on"
+gpu_brand="on"
+gpu_type="all"
+refresh_rate="on"
+gtk_shorthand="off"
+gtk2="on"
+gtk3="on"
+public_ip_host="http://ident.me"
+public_ip_timeout=2
+local_ip_interface=('auto')
+de_version="off"
+disk_show=('/')
+disk_subtitle="mount"
+disk_percent="on"
+music_player="auto"
+song_format="%artist% - %album% - %title%"
+song_shorthand="off"
+mpc_args=()
+colors=(distro)
+bold="on"
+underline_enabled="on"
+underline_char="-"
+separator=":"
+block_range=(0 15)
+color_blocks="on"
+block_width=3
+block_height=1
+col_offset="auto"
+bar_char_elapsed="-"
+bar_char_total="="
+bar_border="on"
+bar_length=15
+bar_color_elapsed="distro"
+bar_color_total="distro"
+memory_display="off"
+battery_display="off"
+disk_display="off"
+image_backend="ascii"
+image_source="auto"
+ascii_distro="GNU"
+ascii_colors=(distro)
+ascii_bold="on"
+image_loop="off"
+thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch"
+crop_mode="normal"
+crop_offset="center"
+image_size="auto"
+catimg_size="2"
+gap=3
+yoffset=0
+xoffset=0
+background_color=
+stdout="off"
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;
-}
diff --git a/.config/pulse/cookie b/.config/pulse/cookie
deleted file mode 100644
index 2320aaf..0000000
Binary files a/.config/pulse/cookie and /dev/null differ
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 100644
index 0000000..62799a2
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1,16 @@
+[
+  {
+    "layer": "top",
+    "modules-center": [
+      "clock"
+    ],
+    "modules-left": [
+      "hyprland/workspaces",
+      "hyprland/window"
+    ],
+    "modules-right": [
+      "battery"
+    ],
+    "position": "top"
+  }
+]
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
new file mode 100644
index 0000000..1757498
--- /dev/null
+++ b/.config/waybar/style.css
@@ -0,0 +1,12 @@
+* {
+  font-family: "JetBrainsMono Nerd Font", monospace;
+  font-size: 13px;
+}
+
+#window {
+  /* Example: style the window module */
+  background-color: #333333;
+  color: #fca944;
+  border-radius: 8px;
+  padding: 0 10px;
+}
diff --git a/.gitignore b/.gitignore
index 15c4580..c530b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ systemd
 fontconfig
 btop
 environment.d
+pulse