diff --git a/.chezmoiscripts/run_once_after_20-pacman.sh b/.chezmoiscripts/run_once_after_20-pacman.sh
index 5929d39..0f35121 100644
--- a/.chezmoiscripts/run_once_after_20-pacman.sh
+++ b/.chezmoiscripts/run_once_after_20-pacman.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
-sudo pacman-key --init
-sudo pacman-key --populate archlinux
+if command -v pacman-key &>/dev/null; then
+  sudo pacman-key --init
+  sudo pacman-key --populate archlinux
+fi
diff --git a/dot_config/fish/conf.d/30-nvim.fish b/dot_config/fish/conf.d/30-nvim.fish
new file mode 100644
index 0000000..3006e02
--- /dev/null
+++ b/dot_config/fish/conf.d/30-nvim.fish
@@ -0,0 +1,3 @@
+#!/usr/bin/env fish
+
+fish_add_path "$HOME/.local/bin/nvim-linux64/bin"