diff --git a/Nordzy-cursors-lefthand.tar.gz b/Nordzy-cursors-lefthand.tar.gz
deleted file mode 100644
index 8b49afe..0000000
Binary files a/Nordzy-cursors-lefthand.tar.gz and /dev/null differ
diff --git a/setup/install.sh b/setup/install.sh
index 05a7907..1c51607 100644
--- a/setup/install.sh
+++ b/setup/install.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-
+bash ~/Dotfiles/setup/modules/*
diff --git a/setup/modules/core.sh b/setup/modules/core.sh
index 05a7907..dbfafa4 100644
--- a/setup/modules/core.sh
+++ b/setup/modules/core.sh
@@ -1,2 +1,10 @@
 #!/bin/bash
 
+#networkmanager setup
+echo "enabling NetworkManager"
+sudo systemctl enable NetworkManager.service
+
+#greetd setup
+echo "Installing greetd"
+sudo cp -f ~/Dotfiles/desktopenvs/hyprland/greetd-tuigreet/config.toml /etc/greetd/config.toml
+sudo systemctl enable greetd.service
diff --git a/setup/modules/base-packages.sh b/setup/modules/hyprland-packages.sh
similarity index 82%
rename from setup/modules/base-packages.sh
rename to setup/modules/hyprland-packages.sh
index 524a12b..d6c7e46 100644
--- a/setup/modules/base-packages.sh
+++ b/setup/modules/hyprland-packages.sh
@@ -2,3 +2,10 @@
 #install components
 echo "Installing required Packages"
 sudo pacman -S --noconfirm alacritty alsa-utils atftp base base-devel bash-language-server btop btrfs-progs bluez clang curl dolphin dunst ffmpeg fastfetch firefox flatpak fzf gcc git gnu-netcat greetd-tuigreet grim grub gst-plugin-pipewire htop hyfetch imagemagick inetutils iwd jq kitty ldns libpulse linux linux-firmware lua-language-server micro nano networkmanager nmap openssh pulsemixer pipewire nerd-fonts otf-font-awesome pipewire pipewire-alsa pipewire-jack pipewire-pulse polkit-kde-agent qt5-wayland qt6-wayland slurp smartmontools swww traceroute ttf-jetbrains-mono ufw unzip vim waybar wget wireless_tools wireplumber wireshark-qt wofi wpa_supplicant wl-clipboard qt6ct xdg-desktop-portal-hyprland xdg-utils xf86-video-amdgpu xf86-video-ati xf86-video-nouveau xf86-video-vmware xorg-server xorg-xinit yazi zip zram-generator z zsh nm-connection-editor qrencode neovim vnstat hyprland podman distrobox docker tree
+
+bash ~/Dotfiles/setup/modules/package-managers.sh
+
+#AUR list
+echo "Installing AUR packages"
+yay -Syu --answerdiff None --answerclean All hyprland-workspaces bluetuith tio fast-ssh uftpd nwg-dock-hyprland
+
diff --git a/setup/modules/hyprland.sh b/setup/modules/hyprland.sh
index 05a7907..c8b8838 100644
--- a/setup/modules/hyprland.sh
+++ b/setup/modules/hyprland.sh
@@ -1,2 +1,55 @@
 #!/bin/bash
 
+bash ~/Dotfiles/setup/modules/hyprland-packages.sh
+
+#eww compilation
+echo "compiling EWW"
+cd ~/install-tmp
+git clone https://github.com/elkowar/eww
+cd eww
+cargo build --release --no-default-features --features=wayland
+cd target/release
+chmod +x ./eww
+sudo cp ./eww /usr/bin
+
+sudo cp -r ~/Dotfiles/gtk-themes/cyberqueer /usr/share/themes
+sudo cp ~/Dotfiles/desktopenvs/hyprland/btop/themes/cyberqueer.theme /usr/share/btop/themes
+sudo cp -f ~/Dotfiles/desktopenvs/hyprland/greetd-tuigreet/config.toml /etc/greetd/config.toml
+
+cd ~/install-tmp
+mkdir ~/.icons
+wget https://github.com/guillaumeboehm/Nordzy-cursors/releases/download/v2.3.0/Nordzy-cursors-lefthand.tar.gz
+tar -zxvf Nordzy-cursors-lefthand.tar.gz -C $HOME/.icons/
+
+rm -rf ~/.config/kitty
+ln -s ~/Dotfiles/desktopenvs/hyprland/kitty/ ~/.config/
+
+rm -rf ~/.config/hypr
+ln -s ~/Dotfiles/desktopenvs/hyprland/hypr/ ~/.config/
+
+rm -rf ~/.config/wofi
+ln -s ~/Dotfiles/desktopenvs/hyprland/wofi/ ~/.config/
+
+rm -rf ~/.config/dunst
+ln -s ~/Dotfiles/desktopenvs/hyprland/dunst/ ~/.config/
+
+rm -rf ~/.config/alacritty
+ln -s ~/Dotfiles/desktopenvs/hyprland/alacritty ~/.config/
+
+rm -rf ~/.config/nwg-dock-hyprland
+ln -s ~/Dotfiles/desktopenvs/hyprland/nwg-dock-hyprland ~/.config/
+
+rm -rf ~/.config/btop
+ln -s ~/Dotfiles/desktopenvs/hyprland/btop ~/.config/
+#ln -s ~/Dotfiles/desktopenvs/hyprland/gtk/* ~/.config
+
+#ln -s ~/Dotfiles/desktopenvs/hyprland/eww/ ~/.config/
+#ln -s ~/Dotfiles/desktopenvs/hyprland/eww-nobattery/ ~/.config/eww
+
+read -n1 -p "Install eww bar with or without battery indicator? [y,n]" doit 
+case $doit in  
+  y|Y) ln -s ~/Dotfiles/desktopenvs/hyprland/eww/ ~/.config/ ;; 
+  n|N)  ln -s ~/Dotfiles/desktopenvs/hyprland/eww-nobattery/ ~/.config/eww ;; 
+  *) echo "enter a valid decision" ;; 
+esac
+
diff --git a/setup/modules/package-managers.sh b/setup/modules/package-managers.sh
index 05a7907..9bdb8d1 100644
--- a/setup/modules/package-managers.sh
+++ b/setup/modules/package-managers.sh
@@ -1,2 +1,29 @@
 #!/bin/bash
 
+#aur/yay setup
+echo "Installing yay"
+cd ~
+mkdir install-tmp
+cd install-tmp
+git clone https://aur.archlinux.org/yay.git
+cd yay
+makepkg -si
+yay --version
+cd ~/install-tmp
+# Download and install nvm:
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.2/install.sh | bash
+
+# in lieu of restarting the shell
+\. "$HOME/.nvm/nvm.sh"
+
+# Download and install Node.js:
+nvm install 22
+
+# Verify the Node.js version:
+node -v # Should print "v22.14.0".
+nvm current # Should print "v22.14.0".
+
+# Verify npm version:
+npm -v # Should print "10.9.2".
+
+
diff --git a/setup/modules/shell.sh b/setup/modules/shell.sh
index 05a7907..68c3cdf 100644
--- a/setup/modules/shell.sh
+++ b/setup/modules/shell.sh
@@ -1,2 +1,68 @@
 #!/bin/bash
 
+#cli dotfiles
+echo "Installing bash and zsh setting files"
+rm ~/.bashrc
+rm ~/.zshrc
+ln -s ~/Dotfiles/.bashrc ~/.bashrc
+ln -s ~/Dotfiles/.zshrc ~/.zshrc
+
+rm -rf ~/Dotfiles/starship.toml 
+ln -s ~/Dotfiles/starship.toml ~/.config/
+
+rm -rf ~/Dotfiles/micro/
+ln -s ~/Dotfiles/micro/ ~/.config/
+
+
+#vim plug installer
+curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+
+rm -rf ~/Dotfiles/nvim/
+ln -s ~/Dotfiles/nvim/ ~/.config/
+
+rm -rf ~/Dotfiles/yazi/
+ln -s ~/Dotfiles/yazi/ ~/.config/
+
+rm -rf ~/Dotfiles/spotify-tui/
+ln -s ~/Dotfiles/spotify-tui/ ~/.config/
+
+cp ~/Dotfiles/resources/fflogo.svg ~/Pictures/fflogo.svg
+
+cp ~/Dotfiles/desktopenvs/hyprland/hypr-usr/* ~/.config
+cp ~/Dotfiles/nvim/cyberqueer.vim ~/.local/share/nvim/site/plugged/vim-airline-themes/autoload/airline/themes/
+# Download and install nvm:
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.2/install.sh | bash
+
+# in lieu of restarting the shell
+\. "$HOME/.nvm/nvm.sh"
+
+# Download and install Node.js:
+nvm install 22
+
+# Verify the Node.js version:
+node -v # Should print "v22.14.0".
+nvm current # Should print "v22.14.0".
+
+# Verify npm version:
+npm -v # Should print "10.9.2".
+
+#zsh setup
+echo '
+    #starship setup
+    echo "Installing Starship"
+    curl -sS https://starship.rs/install.sh | sh
+
+    #ohmyzsh setup
+    echo "Installing oh my zsh"
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+
+    #ohmyzsh plugins
+    echo "Installing oh my zsh plugins"
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+' | zsh
+
+#zsh setup
+echo "Setting up zsh"
+chsh -s /usr/bin/zsh
+#homectl update --shell=/usr/bin/zsh