diff --git a/home/modules/fish.nix b/home/modules/fish.nix
index 6d95e864..d3733d6d 100644
--- a/home/modules/fish.nix
+++ b/home/modules/fish.nix
@@ -16,66 +16,74 @@ in {
       enable = true;
       # functions = {};
       # plugins = [];
-      shellAbbrs = {
-        c = "clear";
-        q = "exit";
-        h = "history | bat";
-        r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";
+      shellAbbrs = let
+        hasBat = config.programs.bat.enable;
+        hasExa = config.programs.exa.enable;
+        hasRanger = config.modules.ranger.enable;
+        hasProtonVPN = contains config.home.packages pkgs.protonvpn-cli;
 
-        cd = "z";
-        cp = "cp -i";
-        ls = "exa --color always --group-directories-first -F --git --icons"; # color-ls
-        lsl = "exa --color always --group-directories-first -F -l --git --icons";
-        lsa = "exa --color always --group-directories-first -F -l -a --git --icons";
-        tre = "exa --color always --group-directories-first -F -T -L 2 ---icons";
-        mkd = "mkdir -p";
+        batify = string: string + (optionalString hasBat " | bat");
+      in mkMerge [
+        {
+          c = "clear";
+          q = "exit";
+          h = batify "history";
 
-        blk = "lsblk -o NAME,LABEL,UUID,FSTYPE,SIZE,FSUSE%,MOUNTPOINT,MODEL | bat";
-        fsm = "df -h | bat";
-        grp = "grep --color=auto -E";
-        fzp = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";
-        fre = "free -m";
-        wat = "watch -d -c -n -0.5";
-        dus = "sudo dust -r";
-        dsi = "sudo du -sch . | bat";
-        prc = "procs -t";
+          cd = "z";
+          cp = "cp -i";
+          mkd = "mkdir -p";
 
-        lg = "lazygit";
-        gs = "git status";
-        gcm = "git commit -m";
-        ga = "git add";
-        glg = "git log --graph --decorate --oneline";
-        gcl = "git clone";
+          blk = batify "lsblk -o NAME,LABEL,UUID,FSTYPE,SIZE,FSUSE%,MOUNTPOINT,MODEL";
+          fsm = batify "df -h";
+          grp = "grep --color=auto -E";
+          fzp = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";
+          fre = batify "free -m";
+          wat = "watch -d -c -n -0.5";
+          dus = batify "sudo dust -r";
+          dsi = batify "sudo du -sch .";
+          prc = "procs -t";
 
-        vpnat = "protonvpn-cli c --cc at";
-        vpnch = "protonvpn-cli c --cc ch";
-        vpnlu = "protonvpn-cli c --cc lu";
-        vpnus = "protonvpn-cli c --cc us";
-        vpnhk = "protonvpn-cli c --cc hk";
-        vpnkr = "protonvpn-cli c --cc kr";
-        vpnoff = "protonvpn-cli d";
+          lg = "lazygit";
+          gs = "git status";
+          gcm = "git commit -m";
+          ga = "git add";
+          glg = "git log --graph --decorate --oneline";
+          gcl = "git clone";
 
-        # This doesn't work at all, many things crash, no internet etc.
-        # gnome = "dbus-run-session gnome-session"; # Requires XDG_SESSION_TYPE to be set for wayland
+          # This doesn't work at all, many things crash, no internet etc.
+          # gnome = "dbus-run-session gnome-session"; # Requires XDG_SESSION_TYPE to be set for wayland
 
-        failed = "systemctl --failed";
-        errors = "journalctl -p 3 -xb";
+          failed = "systemctl --failed";
+          errors = "journalctl -p 3 -xb";
 
-        rsync = "rsync -chavzP --info=progress2";
-        performance = "sudo cpupower frequency-set -g performance && nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1";
-        powersave = "sudo cpupower frequency-set -g powersave && nvidia-settings -a [gpu:0]/GPUPowerMizerMode=0";
+          rsync = "rsync -chavzP --info=progress2";
+          xxhamster = "TERM=ansi ssh christoph@217.160.142.51";
 
-        xxhamster = "TERM=ansi ssh christoph@217.160.142.51";
+          mp4 = "yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' --recode-video mp4"; # the -f options are yt-dlp defaults
+          mp3 = "yt-dlp -f 'ba' --extract-audio --audio-format mp3";
+        }
 
-        mp4 = "yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' --recode-video mp4"; # the -f options are yt-dlp defaults
-        mp3 = "yt-dlp -f 'ba' --extract-audio --audio-format mp3";
-      };
+        (optionalAttrs hasExa {
+          ls = "exa --color always --group-directories-first -F --git --icons"; # color-ls
+          lsl = "exa --color always --group-directories-first -F -l --git --icons";
+          lsa = "exa --color always --group-directories-first -F -l -a --git --icons";
+          tre = "exa --color always --group-directories-first -F -T -L 2 ---icons";
+        })
 
-      shellAliases = {
-        # ".." = "cd ..";
-        "please" = "sudo !!";
-        "yeet" = "rm -rf";
-      };
+        (optionalAttrs hasRanger {
+          r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";
+        })
+
+        (optionalAttrs hasProtonVPN {
+          vpnat = "protonvpn-cli c --cc at";
+          vpnch = "protonvpn-cli c --cc ch";
+          vpnlu = "protonvpn-cli c --cc lu";
+          vpnus = "protonvpn-cli c --cc us";
+          vpnhk = "protonvpn-cli c --cc hk";
+          vpnkr = "protonvpn-cli c --cc kr";
+          vpnoff = "protonvpn-cli d";
+        })
+      ];
 
       shellInit = ''
         set -e fish_greeting