diff --git a/.bin/.e b/.bin/.e
index 05909fe..7929158 100755
--- a/.bin/.e
+++ b/.bin/.e
@@ -4,7 +4,6 @@ declare -A mapper=(
 	[".e"]="$HOME/.bin/.e"
 	[".t"]="$HOME/.bin/.t"
 	["alacritty"]="$HOME/.config/alacritty/alacritty.toml"
-	["astronvim"]="$HOME/.config/astronvim/lua/user/"
 	["autoinstall.toml"]="$HOME/.config/autoinstall.toml"
 	["autostart.toml"]="$HOME/.config/autostart.toml"
 	["backup"]="$HOME/.bin/host-backup-$(cat /proc/sys/kernel/hostname)"
@@ -17,8 +16,7 @@ declare -A mapper=(
 	["git-ignore"]="$HOME/.config/git/ignore"
 	["home-manager"]="$HOME/.config/home-manager/home.nix"
 	["hyprland"]="$HOME/.config/hypr/hyprland.conf"
-	["nvim"]="$HOME/.config/nvim/"
-	["nvim.packer"]="$HOME/.config/nvim/lua/plugins.lua"
+	["nvim"]="$HOME/.config/astronvim/lua/user/"
 	["polybar"]="$HOME/.config/polybar"
 	["qutebrowser"]="$HOME/.config/qutebrowser/config.py"
 	["qutebrowser-kiosk"]="$HOME/.config/qutebrowser/config_kiosk.py"
@@ -36,8 +34,6 @@ declare -A mapper=(
 )
 
 declare -A hooks=(
-	["nvim"]="nvim +PackerSync"
-	["nvim.packer"]="nvim +PackerSync"
 	["qutebrowser"]="qutebrowser :config-source"
 	["qutebrowser-kiosk"]="qutebrowser-kiosk :config-source" # broken due to qutebrowser-kiosk being an alias
 	["waybar"]="killall -SIGUSR2 waybar"
diff --git a/.config/astronvim/lua/user/plugins/treesitter.lua b/.config/astronvim/lua/user/plugins/treesitter.lua
index 18c6da6..a403144 100644
--- a/.config/astronvim/lua/user/plugins/treesitter.lua
+++ b/.config/astronvim/lua/user/plugins/treesitter.lua
@@ -4,6 +4,7 @@ return {
     -- add more things to the ensure_installed table protecting against community packs modifying it
     opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
       -- "lua"
+      "pkl"
     })
   end,
 }
diff --git a/.config/astronvim/lua/user/plugins/user.lua b/.config/astronvim/lua/user/plugins/user.lua
index 9bd70b8..100990d 100644
--- a/.config/astronvim/lua/user/plugins/user.lua
+++ b/.config/astronvim/lua/user/plugins/user.lua
@@ -15,7 +15,10 @@ return {
   --   end,
   -- },
 
-  "apple/pkl-neovim",
+  {
+    "apple/pkl-neovim",
+    lazy = false,
+  },
 
   {
     "wakatime/vim-wakatime",
diff --git a/.config/home-manager/nvim.nix b/.config/home-manager/nvim.nix
index b2badeb..87c3b92 100644
--- a/.config/home-manager/nvim.nix
+++ b/.config/home-manager/nvim.nix
@@ -3,21 +3,22 @@
 {
 	home.packages = with pkgs; [
 		nodejs # needed for lsp
+		neovim # editor
 		fzf # fuzzy finder
 	];
 
-	programs.neovim = {
-		enable = true;
-		extraLuaConfig = ''
-require("set")
-require("remap")
-require("plugins")
-require("utils")
-
-local status, ts_install = pcall(require, "nvim-treesitter.install")
-if(status) then
-	ts_install.compilers = { "${pkgs.gcc}/bin/gcc" }
-end
-			'';
-	};
+#	programs.neovim = {
+#		enable = true;
+#		extraLuaConfig = ''
+#require("set")
+#require("remap")
+#require("plugins")
+#require("utils")
+#
+#local status, ts_install = pcall(require, "nvim-treesitter.install")
+#if(status) then
+#	ts_install.compilers = { "${pkgs.gcc}/bin/gcc" }
+#end
+#			'';
+#	};
 }