diff --git a/dot_config/fish/conf.d/30-man.fish b/dot_config/fish/conf.d/30-man.fish
index ef4ba10..a50fd85 100644
--- a/dot_config/fish/conf.d/30-man.fish
+++ b/dot_config/fish/conf.d/30-man.fish
@@ -1,5 +1,5 @@
 #!/usr/bin/env fish
 
-if command -v nvim &>/dev/null
-    set -gx MANPAGER "nvim +Man!"
+if command -v most &>/dev/null
+    set -gx MANPAGER most
 end
diff --git a/dot_config/fish/functions/cpkey.fish b/dot_config/fish/functions/cpkey.fish
index 349091c..c80c2ef 100644
--- a/dot_config/fish/functions/cpkey.fish
+++ b/dot_config/fish/functions/cpkey.fish
@@ -1,11 +1,18 @@
 #!/usr/bin/env fish
 
 function cpkey -d "Copy the id_ed25519 public key to clipboard, generating the keypair if needed"
-    if ! [ -O "~/.ssh/id_ed25519.pub" ]
+    if ! [ -O "$HOME/.ssh/id_ed25519.pub" ]
         echo "=> Generating id_ed25519 keypair..."
-        ssh-keygen -f "~/.ssh/id_ed25519"
+        ssh-keygen -f "$HOME/.ssh/id_ed25519"
     end
 
-    more "~/.ssh/id_ed25519.pub" | copyq copy -
+    if command -v copyq &>/dev/null
+        more "$HOME/.ssh/id_ed25519.pub" | copyq copy -
+    else if command -v pbcopy &>/dev/null
+        more "$HOME/.ssh/id_ed25519.pub" | pbcopy
+    else
+        echo "=> Unsupported OS - please add your copy command to this script :)"
+        return 1
+    end
     echo "=> Public key copied to clipbard"
 end
diff --git a/dot_config/packages/archgirlie b/dot_config/packages/archgirlie
index 2af459a..c650bb8 100644
--- a/dot_config/packages/archgirlie
+++ b/dot_config/packages/archgirlie
@@ -1,3 +1,4 @@
+ -> Avoid running yay as root/sudo.
 aic94xx-firmware
 alsa-utils
 amfora
@@ -115,6 +116,7 @@ meilisearch
 mesa
 mods
 morgen-bin
+most
 mpc
 mpd
 mythes-en