From 214ec62d23705ea3fbbbef8cc36dd66023e018a5 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Sat, 22 Aug 2020 15:01:08 -0400
Subject: [PATCH] Fish: clean cd, dl, xsquash

---
 .config/fish/functions/cd.fish      | 49 ++---------------------------
 .config/fish/functions/dl.fish      |  8 ++---
 .config/fish/functions/xsquash.fish |  3 --
 3 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 .config/fish/functions/xsquash.fish

diff --git a/.config/fish/functions/cd.fish b/.config/fish/functions/cd.fish
index cf52851..53d8395 100644
--- a/.config/fish/functions/cd.fish
+++ b/.config/fish/functions/cd.fish
@@ -1,48 +1,3 @@
-# Defined in /tmp/fish.3yeuaV/cd.fish @ line 4
-function cd --description 'Change directory'
-	set -l MAX_DIR_HIST 25
-
-    if test (count $argv) -gt 1
-        printf "%s\n" (_ "Too many args for cd command")
-        return 1
-    end
-
-    # Skip history in subshells.
-    if status --is-command-substitution
-	builtin cd (realpath $argv 2> /dev/null)
-        return $status
-    end
-
-    # Avoid set completions.
-    set -l previous $PWD
-
-    if test "$argv" = "-"
-        if test "$__fish_cd_direction" = "next"
-            nextd
-        else
-            prevd
-        end
-        return $status
-    end
-
-    # allow explicit "cd ." if the mount-point became stale in the meantime
-    if test "$argv" = "."
-        cd "$PWD"
-        return $status
-    end
-
-    builtin cd (realpath $argv 2> /dev/null)
-    set -l cd_status $status
-
-    if test $cd_status -eq 0 -a "$PWD" != "$previous"
-        set -q dirprev
-        or set -l dirprev
-        set -q dirprev[$MAX_DIR_HIST]
-        and set -e dirprev[1]
-        set -g -a dirprev $previous
-        set -e dirnext
-        set -g __fish_cd_direction prev
-    end
-
-    return $cd_status
+function cd
+builtin cd (realpath $argv 2> /dev/null)
 end
diff --git a/.config/fish/functions/dl.fish b/.config/fish/functions/dl.fish
index 3a317c5..a91d759 100644
--- a/.config/fish/functions/dl.fish
+++ b/.config/fish/functions/dl.fish
@@ -1,7 +1,3 @@
-function dl -w aria2c
-	if test $argv
-       aria2c --file-allocation=none -c -x 16 -s 16 $argv
-   else
-	cd ~/Downloads/
-   end
+function dl --wraps=aria2c
+	test $argv && aria2c --file-allocation=none -c -x 16 -s 16 $argv || cd ~/Downloads/
 end
diff --git a/.config/fish/functions/xsquash.fish b/.config/fish/functions/xsquash.fish
deleted file mode 100644
index 4a28148..0000000
--- a/.config/fish/functions/xsquash.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function xsquash -w mksquashfs
-	mksquashfs . ../(basename (pwd))Squash -comp xz -b 1M -Xdict-size 1M $argv
-end