diff --git a/roles/setup/tasks/system/zsh.yml b/roles/setup/tasks/system/zsh.yml
index fd7a518..5435775 100644
--- a/roles/setup/tasks/system/zsh.yml
+++ b/roles/setup/tasks/system/zsh.yml
@@ -1,49 +1,30 @@
 ---
-
 - name: Install zsh
   become: true
-  package:
+  ansible.builting.package:
     name: zsh
     state: present
 
 - name: Install oh-my-zsh
   become: true
   become_user: noahk
-  shell: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+  ansible.builtin.command: sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+  changed_when: true
 
 - name: Install zsh-syntax-highlighting
   become: true
-  become_user: noahk
-  git:
-    repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
-    dest: /home/noahk/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting
-    update: true
+  ansible.builtin.package:
+    name: zsh-syntax-highlighting
+    state: present
 
 - name: Install zsh-autosuggestions
   become: true
-  become_user: noahk
-  git:
-    repo: https://github.com/zsh-users/zsh-autosuggestions.git
-    dest: /home/noahk/.oh-my-zsh/custom/plugins/zsh-autosuggestions
-    update: true
+  ansible.builtin.package:
+    name: zsh-autosuggestions
+    state: present
 
 - name: Install starship
   become: true
   become_user: noahk
-  shell: sh -c "$(curl -fsSL https://starship.rs/install.sh)"
-
-- name: Configure ZSH
-  become: true
-  become_user: noahk
-  template:
-    src: zshrc.j2
-    dest: /home/noahk/.zshrc
-    owner: noahk
-    group: noahk
-    mode: 0644
-
-- name: Install nushell
-  become: true
-  package:
-    name: nushell
-    state: present
+  ansible.builtin.command: sh -c "$(curl -fsSL https://starship.rs/install.sh)"
+  changed_when: true
diff --git a/roles/setup/templates/zshrc.j2 b/roles/setup/templates/zshrc.j2
deleted file mode 100644
index 4877784..0000000
--- a/roles/setup/templates/zshrc.j2
+++ /dev/null
@@ -1,147 +0,0 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-# Path to your oh-my-zsh installation.
-ZSH=/usr/share/oh-my-zsh/
-
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="amuse"
-
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in $ZSH/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
-
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment the following line to disable bi-weekly auto-update checks.
-DISABLE_AUTO_UPDATE="true"
-
-# Uncomment the following line to automatically update without prompting.
-# DISABLE_UPDATE_PROMPT="true"
-
-# Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
-
-# Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS="true"
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(
-	zsh-autosuggestions
-	zsh-syntax-highlighting
-	git
-
-	cp
-	docker
-	docker-compose
-	dotenv
-	extract
-	git-auto-fetch
-	gitignore
-	golang
-	helm
-	jsontools
-	kubectl
-	nvm
-	rust
-	rsync
-	sudo
-	systemd
-	themes
-	tmux
-	vscode
-	nmap
-)
-
-
-# User configuration
-
-# Set the XDG_CONFIG_HOME in this file
-XDG_CONFIG_HOME=${XDG_CONFIG_HOME:=${HOME}/.config}
-
-# Source the env variables from the XDG_CONFIG_HOME
-source $XDG_CONFIG_HOME/zsh/.zshenv
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='mvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch x86_64"
-
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Custom aliases
-alias zshrc="nvim ~/.zshrc && source ~/.zshrc"
-source $XDG_CONFIG_HOME/zsh/.aliases
-
-ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
-if [[ ! -d $ZSH_CACHE_DIR ]]; then
-  mkdir $ZSH_CACHE_DIR
-fi
-
-source $ZSH/oh-my-zsh.sh
-
-# For sharship rs loading
-eval "$(starship init zsh)"
-
-# tabtab source for packages
-# uninstall by removing these lines
-[[ -f ~/.config/tabtab/zsh/__tabtab.zsh ]] && . ~/.config/tabtab/zsh/__tabtab.zsh || true