diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..db0599c
--- /dev/null
+++ b/.config/fish/functions/fish_prompt.fish
@@ -0,0 +1,20 @@
+function fish_prompt --description 'Informative prompt'
+    #Save the return status of the previous command
+    set -l last_pipestatus $pipestatus
+    set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
+
+    if functions -q fish_is_root_user; and fish_is_root_user
+        printf '%s@%s %s%s%s# ' $USER (prompt_hostname) (set -q fish_color_cwd_root
+                                                         and set_color $fish_color_cwd_root
+                                                         or set_color $fish_color_cwd) \
+            (prompt_pwd) (set_color normal)
+    else
+        set -l status_color (set_color $fish_color_status)
+        set -l statusb_color (set_color --bold $fish_color_status)
+        set -l pipestatus_string (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
+
+        printf '[%s] %s%s@%s %s%s %s%s%s \n> ' (date "+%H:%M:%S") (set_color brblue) \
+            $USER (prompt_hostname) (set_color $fish_color_cwd) $PWD $pipestatus_string \
+            (set_color normal)
+    end
+end
diff --git a/.config/fish/functions/p.fish b/.config/fish/functions/p.fish
index 8088da8..a8eff6e 100644
--- a/.config/fish/functions/p.fish
+++ b/.config/fish/functions/p.fish
@@ -1,4 +1,4 @@
 function p --wraps=pikaur --description 'alias p pikaur'
-  pikaur $argv
+  paru $argv
         
 end
diff --git a/.config/fish/functions/yeet.fish b/.config/fish/functions/yeet.fish
index 5c03e04..25c604b 100644
--- a/.config/fish/functions/yeet.fish
+++ b/.config/fish/functions/yeet.fish
@@ -1,4 +1,4 @@
 function yeet --wraps='pikaur -Rsn' --description 'alias yeet=pikaur -Rsn'
-  pikaur -Rsn $argv
+  paru -Rsn $argv
         
 end