diff --git a/hm-configs/files-all.nix b/hm-configs/files-all.nix
index 1927fe4..f127bbb 100644
--- a/hm-configs/files-all.nix
+++ b/hm-configs/files-all.nix
@@ -1,6 +1,6 @@
 {
   ".config/fish/fishfile".text = ''
-    laughedelic/pisces
+    jorgebucaran/autopair.fish
     joehillen/to-fish
     jethrokuan/z
     decors/fish-colored-man
@@ -8,15 +8,15 @@
     haslersn/fish-nix-completions
     gyakovlev/fish-fzy
     joseluisq/gitnow
-    edc/bass
+    jorgebucaran/replay.fish
     fishpkg/fish-get
     fishpkg/fish-spin
     oh-my-fish/plugin-bang-bang
     fishpkg/fish-humanize-duration
     jorgebucaran/fish-getopts
     matthewess/fish-autovenv
+    Gazorby/fish-abbreviation-tips
   '';
-  ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
   # ".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish;
   ".config/fish/functions/colortest.fish".source = ../assets/colortest.fish;
   ".config/fish/functions/mkdcd.fish".text = ''
@@ -32,10 +32,4 @@
       unzip -d $target $target
     end
   '';
-  ".config/pijul/config.toml".text = ''
-    [author]
-    name = "mat"
-    full_name = "mat"
-    email = "mat@mat.services"
-  '';
 }
diff --git a/hm-configs/files.nix b/hm-configs/files.nix
index 62e9c29..d646fe8 100644
--- a/hm-configs/files.nix
+++ b/hm-configs/files.nix
@@ -18,4 +18,11 @@
   '';
   ".config/kitty/theme.conf".source = ../assets/kitty-theme.conf;
   ".config/rofi/theme.rasi".source = ../assets/sidetab.rasi;
+  ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
+  ".config/pijul/config.toml".text = ''
+    [author]
+    name = "mat"
+    full_name = "mat"
+    email = "mat@mat.services"
+  '';
 }
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index fff927e..33fd890 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -18,13 +18,9 @@ in {
         bottom
         dbus
         du-dust
-        fzy
-        httpie
         imagemagick
-        jq
         mdcat
-        neofetch
-        procs
+        pijul
         unrar
         wireguard-tools
         # graphical applications
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 57f4a57..27652d1 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -21,9 +21,12 @@ in {
         # command line utils
         dnsutils
         fd
+        fzy
+        httpie
+        jq
+        neofetch
         rlwrap
         tealdeer
-        pijul
       ];
       file = import ../hm-configs/files-all.nix;
     };