diff --git a/dot_config/fish/conf.d/00-init.fish.tmpl b/dot_config/fish/conf.d/00-init.fish.tmpl
index 547a83f..28e8f32 100644
--- a/dot_config/fish/conf.d/00-init.fish.tmpl
+++ b/dot_config/fish/conf.d/00-init.fish.tmpl
@@ -26,9 +26,5 @@ set -gx EDITOR nvim
 set -gx VISUAL "$EDITOR"
 set -gx SUDO_EDITOR "$EDITOR"
 
-{{ if eq .osid "linux-debian" }}
-fish_add_path "/opt/nvim/linux64/bin"
-{{ end }}
-
 # Use vi key bindings.
 set -g fish_key_bindings fish_vi_key_bindings
diff --git a/dot_config/fish/conf.d/10-apple-keyboard.fish.tmpl b/dot_config/fish/conf.d/10-apple-keyboard.fish.tmpl
deleted file mode 100644
index 53bf08d..0000000
--- a/dot_config/fish/conf.d/10-apple-keyboard.fish.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-#!/usr/bin/env fish
diff --git a/dot_config/fish/conf.d/20-gpg.fish b/dot_config/fish/conf.d/20-gpg.fish
index 870d96f..66731ab 100644
--- a/dot_config/fish/conf.d/20-gpg.fish
+++ b/dot_config/fish/conf.d/20-gpg.fish
@@ -1,6 +1,6 @@
 #!/usr/bin/env fish
 
 if test "$(command -v gpgconf &>/dev/null)"
-    set -gx GPG_TTY (tty)
+    set -Ux GPG_TTY (tty)
     gpgconf --launch gpg-agent
 end
diff --git a/dot_config/fish/conf.d/30-git.fish b/dot_config/fish/conf.d/30-git.fish
index 2feb5b8..e35b753 100644
--- a/dot_config/fish/conf.d/30-git.fish
+++ b/dot_config/fish/conf.d/30-git.fish
@@ -1,7 +1,6 @@
 #!/usr/bin/env fish
 
 abbr -a g --position command git
-abbr -a d --position command dotfiles
 
 ################################################################################
 #                                  Functions                                   #
diff --git a/dot_config/fish/conf.d/30-glamour.fish b/dot_config/fish/conf.d/30-glamour.fish.tmpl
similarity index 50%
rename from dot_config/fish/conf.d/30-glamour.fish
rename to dot_config/fish/conf.d/30-glamour.fish.tmpl
index 115440f..b577361 100644
--- a/dot_config/fish/conf.d/30-glamour.fish
+++ b/dot_config/fish/conf.d/30-glamour.fish.tmpl
@@ -1,3 +1,5 @@
 #!/usr/bin/env fish
 
+# hardcoded theme bc rose-pine doesn't have a glow theme
+# TODO: make a rose-pine glow theme
 set -gx GLAMOUR_STYLE "~/.config/glow/themes/catppuccin-macchiato.json"