diff --git a/run_onchange_after_install_main_deps.sh.tmpl b/run_onchange_after_install_main_deps.sh.tmpl
index 67a8483..3b61944 100644
--- a/run_onchange_after_install_main_deps.sh.tmpl
+++ b/run_onchange_after_install_main_deps.sh.tmpl
@@ -3,7 +3,7 @@
 STEPS=15
 PAD_LEN=4
 
-BASE_PACKAGES="gnupg curl wget git direnv"
+BASE_PACKAGES="gnupg curl wget git"
 ACT_PACKAGES="ripgrep unzip htop fzf bat gawk jq nnn tmux mc nethogs ngrep mtr gcc"
 
 #Colors
@@ -100,7 +100,7 @@ new_line "Update caches and upgrade packages"
 	fi
     brew update 2>&1|pad
 
-{{ else if eq .chezmoi.osRelease.id "fedora"  -}}
+{{ else if eq .chezmoi.osRelease.id "fedora" "almalinux" -}}
     sudo dnf update -y 2>&1|pad
 
 {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
@@ -118,8 +118,12 @@ new_line "Install base packages"
 {{ if eq .chezmoi.os "darwin" -}}
   brew install -q $BASE_PACKAGES python pipx 2>&1|pad
 
-{{ else if eq .chezmoi.osRelease.id "fedora"  -}}
-    sudo dnf install $BASE_PACKAGES kitty-terminfo util-linux-user python3-pipx -y 2>&1|pad
+{{ else if eq .chezmoi.osRelease.id "fedora" -}}
+    sudo dnf install $BASE_PACKAGES direnv kitty-terminfo util-linux-user python3-pipx -y 2>&1|pad
+
+{{ else if eq .chezmoi.osRelease.id "almalinux" -}}
+    sudo dnf install epel-release -y 2>&1|pad
+    sudo dnf install $BASE_PACKAGES kitty-terminfo util-linux-user pipx -y 2>&1|pad
 
 {{ else if eq .chezmoi.osRelease.id "debian" "ubuntu" -}}
     sudo apt-get install $BASE_PACKAGES kitty-terminfo direnv pipx python3-venv -y 2>&1|pad
@@ -182,6 +186,11 @@ new_line "Install neovim, fish, atuin, jump and the rest"
 new_line "via NIX"
 	nix-env -iA nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
 
+{{ else if eq .chezmoi.osRelease.id "almalinux"  -}}
+    sudo dnf install neovim fish $ACT_PACKAGES fd-find pam_ssh_agent_auth -y  2>&1|pad
+new_line "via NIX"
+	nix-env -iA nixpkgs.fish nixpkgs.direnv nixpkgs.atuin nixpkgs.jump nixpkgs.du-dust nixpkgs.lazygit 2>&1|pad
+
 {{ else if eq .chezmoi.osRelease.id "arch" "archarm" -}}
     sudo pacman -Sy --noconfirm neovim fish atuin $ACT_PACKAGES fd skim lazygit 2>&1|pad
 new_line "via NIX"
@@ -193,15 +202,8 @@ new_line "via NIX"
 	sudo apt-get install $ACT_PACKAGES libpam-ssh-agent-auth -y 2>&1|pad
 
 new_line "via NIX"
-	nix-env -iA nixpkgs.neovim nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad
+	nix-env -iA nixpkgs.neovim nixpkgs.lazygit nixpkgs.jump nixpkgs.skim nixpkgs.du-dust nixpkgs.atuin 2>&1|pad
 
-new_line "manually installing LazyGit"
-	LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
-	curl --silent -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz" 2>&1|pad
-	tar xf lazygit.tar.gz lazygit 2>&1|pad
-	sudo install lazygit /usr/local/bin 2>&1|pad
-	rm ~/lazygit
-	rm ~/lazygit.tar.gz
 {{ end -}}
 
 new_line "Installing my authorized_keys"