From e7c3c21903b4a954c2f9be7572090984a2cc79ee Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Fri, 21 Dec 2018 18:14:12 -0500
Subject: [PATCH] Rearrange a bunch of functions and delete unused

---
 .config/fish/config.fish                               | 2 +-
 .config/fish/fishd.aperture                            | 2 +-
 .config/fish/functions/3ds.fish                        | 6 ++++--
 .config/fish/functions/3dsmount.fish                   | 4 ----
 .config/fish/functions/ac.fish                         | 4 ----
 .config/fish/functions/bat.fish                        | 4 ----
 .config/fish/functions/botwdata.fish                   | 4 ----
 .config/fish/functions/build.fish                      | 5 ++++-
 .config/fish/functions/cdir.fish                       | 4 ----
 .config/fish/functions/cf.fish                         | 4 ----
 .config/fish/functions/cfo.fish                        | 5 -----
 .config/fish/functions/cmuswin.fish                    | 4 ----
 .config/fish/functions/discord.fish                    | 4 ----
 .config/fish/functions/ex.fish                         | 4 ----
 .config/fish/functions/filter.fish                     | 5 -----
 .config/fish/functions/flushswap.fish                  | 5 -----
 .config/fish/functions/{updatefonts.fish => font.fish} | 2 +-
 .config/fish/functions/fuckgit.fish                    | 4 ++--
 .config/fish/functions/ga.fish                         | 2 +-
 .config/fish/functions/gb.fish                         | 2 +-
 .config/fish/functions/gg.fish                         | 2 +-
 .config/fish/functions/giveme.fish                     | 4 ++--
 .config/fish/functions/gl.fish                         | 2 +-
 .config/fish/functions/gsu.fish                        | 5 +++--
 .config/fish/functions/gu.fish                         | 2 +-
 .config/fish/functions/gupall.fish                     | 4 ++--
 .config/fish/functions/jdownloader.fish                | 5 -----
 .config/fish/functions/{lsa.fish => la.fish}           | 2 +-
 .config/fish/functions/launcher.fish                   | 4 ++++
 .config/fish/functions/lc.fish                         | 4 ----
 .config/fish/functions/m.fish                          | 4 ----
 .config/fish/functions/mc.fish                         | 4 ++--
 .config/fish/functions/mcr.fish                        | 4 ++--
 .config/fish/functions/mcrcon.fish                     | 4 ----
 .config/fish/functions/mcs.fish                        | 5 +++--
 .config/fish/functions/mcserver.fish                   | 4 ----
 .config/fish/functions/megacrypt.fish                  | 4 ----
 .config/fish/functions/minecraft.fish                  | 4 ----
 .config/fish/functions/minecraftserver.fish            | 5 -----
 .config/fish/functions/mkc.fish                        | 4 ----
 .config/fish/functions/mount3ds.fish                   | 6 ------
 .config/fish/functions/nf.fish                         | 4 ----
 .config/fish/functions/pg.fish                         | 4 ----
 .config/fish/functions/pia-manager.fish                | 4 ----
 .config/fish/functions/pia.fish                        | 4 ++--
 .config/fish/functions/piaport.fish                    | 4 ----
 .config/fish/functions/rufus.fish                      | 4 ----
 .config/fish/functions/shutdownh.fish                  | 4 ----
 .config/fish/functions/swift.fish                      | 5 -----
 .config/fish/functions/timer.fish                      | 4 ----
 .config/fish/functions/tmpfiles.fish                   | 1 -
 .config/fish/functions/torsearch.fish                  | 5 -----
 .config/fish/functions/ts.fish                         | 4 ----
 .config/fish/functions/vboxusb.fish                    | 4 ++--
 .config/fish/functions/vimtutor.fish                   | 4 ----
 .config/fish/functions/vitutor.fish                    | 4 ----
 .config/fish/functions/vw.fish                         | 4 ----
 .config/fish/functions/wall0.fish                      | 5 -----
 .config/fish/functions/we.fish                         | 4 ----
 .config/fish/functions/weather.fish                    | 4 ----
 .config/fish/functions/weatherg.fish                   | 4 ----
 .config/fish/functions/wg.fish                         | 4 ----
 .config/fish/functions/windows2usb.fish                | 4 ----
 .config/fish/functions/xci.fish                        | 5 -----
 .config/fish/functions/xci1.fish                       | 4 ----
 .config/fish/functions/xci2.fish                       | 4 ----
 66 files changed, 41 insertions(+), 218 deletions(-)
 delete mode 100644 .config/fish/functions/3dsmount.fish
 delete mode 100755 .config/fish/functions/ac.fish
 delete mode 100755 .config/fish/functions/bat.fish
 delete mode 100755 .config/fish/functions/botwdata.fish
 delete mode 100755 .config/fish/functions/cdir.fish
 delete mode 100755 .config/fish/functions/cf.fish
 delete mode 100755 .config/fish/functions/cfo.fish
 delete mode 100755 .config/fish/functions/cmuswin.fish
 delete mode 100755 .config/fish/functions/discord.fish
 delete mode 100755 .config/fish/functions/ex.fish
 delete mode 100755 .config/fish/functions/filter.fish
 delete mode 100755 .config/fish/functions/flushswap.fish
 rename .config/fish/functions/{updatefonts.fish => font.fish} (78%)
 delete mode 100755 .config/fish/functions/jdownloader.fish
 rename .config/fish/functions/{lsa.fish => la.fish} (83%)
 create mode 100644 .config/fish/functions/launcher.fish
 delete mode 100755 .config/fish/functions/lc.fish
 delete mode 100755 .config/fish/functions/m.fish
 delete mode 100755 .config/fish/functions/mcrcon.fish
 delete mode 100755 .config/fish/functions/mcserver.fish
 delete mode 100755 .config/fish/functions/megacrypt.fish
 delete mode 100755 .config/fish/functions/minecraft.fish
 delete mode 100755 .config/fish/functions/minecraftserver.fish
 delete mode 100755 .config/fish/functions/mkc.fish
 delete mode 100644 .config/fish/functions/mount3ds.fish
 delete mode 100755 .config/fish/functions/nf.fish
 delete mode 100755 .config/fish/functions/pg.fish
 delete mode 100755 .config/fish/functions/pia-manager.fish
 delete mode 100755 .config/fish/functions/piaport.fish
 delete mode 100755 .config/fish/functions/rufus.fish
 delete mode 100755 .config/fish/functions/shutdownh.fish
 delete mode 100755 .config/fish/functions/swift.fish
 delete mode 100644 .config/fish/functions/timer.fish
 delete mode 100755 .config/fish/functions/torsearch.fish
 delete mode 100755 .config/fish/functions/ts.fish
 delete mode 100644 .config/fish/functions/vimtutor.fish
 delete mode 100644 .config/fish/functions/vitutor.fish
 delete mode 100644 .config/fish/functions/vw.fish
 delete mode 100755 .config/fish/functions/wall0.fish
 delete mode 100644 .config/fish/functions/we.fish
 delete mode 100644 .config/fish/functions/weather.fish
 delete mode 100644 .config/fish/functions/weatherg.fish
 delete mode 100644 .config/fish/functions/wg.fish
 delete mode 100755 .config/fish/functions/windows2usb.fish
 delete mode 100755 .config/fish/functions/xci.fish
 delete mode 100755 .config/fish/functions/xci1.fish
 delete mode 100755 .config/fish/functions/xci2.fish

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f134b7e..e875aac 100755
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -9,7 +9,7 @@ switch (tty)
 
 # PATHS #
 set -gx ANDROID_HOME $D/Source/android/sdk
-set -gx fish_user_paths ~/.local/bin $ANDROID_HOME/platform-tools /usr/local/bin /usr/sbin /sbin /usr/local/sbin $PLAN9/bin
+set -gx fish_user_paths ~/.local/bin $ANDROID_HOME/platform-tools /usr/bin /usr/local/bin /bin /usr/sbin /usr/local/sbin /sbin $PLAN9/bin
 set -gx ENV .profile
 
 # PROGRAM SETTINGS #
diff --git a/.config/fish/fishd.aperture b/.config/fish/fishd.aperture
index a02670c..be9feae 100755
--- a/.config/fish/fishd.aperture
+++ b/.config/fish/fishd.aperture
@@ -7,7 +7,7 @@ SET_EXPORT FZF_DEFAULT_COMMAND:ff
 SET GOPATH:\x2ego
 SET_EXPORT PAGER:nvim\x20\x2dc\x20\x27set\x20ft\x3dman\x27\x20\x2d
 SET_EXPORT PATH:/usr/local/bin\x1e/mnt/LocalDiskD/Source/android/sdk/platform\x2dtools/\x1e/sbin\x1e/bin\x1e/usr/sbin\x1e/usr/bin\x1e/snap/bin\x1e/mnt/LocalDiskD/Source/plan9port/bin
-SET_EXPORT PLAN9:/mnt/LocalDiskD/Source/plan9port
+SET_EXPORT PLAN9:\x1d
 SET __fish_init_2_39_8:\x1d
 SET __fish_init_2_3_0:\x1d
 SET e:/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/usr/local/bin\x1e/home/glados/\x2elocal/bin
diff --git a/.config/fish/functions/3ds.fish b/.config/fish/functions/3ds.fish
index 81bf663..e661f42 100644
--- a/.config/fish/functions/3ds.fish
+++ b/.config/fish/functions/3ds.fish
@@ -1,4 +1,6 @@
-# Defined in /tmp/fish.VTAv1N/3ds.fish @ line 1
+# Defined in /tmp/fish.qyLQlB/mount3ds.fish @ line 2
 function 3ds
-	mount3ds
+    mkdir $D/Games/Roms/3DS $D/Installs/Backup/3DS/sd
+    mount_sd --movable ~/.3ds/movable.sed $D/Installs/Backup/3DS/Nintendo\ 3DS $D/Installs/Backup/3DS/sd
+    mount_titledir $D/Installs/Backup/3DS/sd/b81f00ba4783ae5a534430320002544d/title/ $D/Games/Roms/3DS
 end
diff --git a/.config/fish/functions/3dsmount.fish b/.config/fish/functions/3dsmount.fish
deleted file mode 100644
index 1969fdf..0000000
--- a/.config/fish/functions/3dsmount.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.Iu1xHu/3dsmount.fish @ line 1
-function 3dsmount
-	mount3ds
-end
diff --git a/.config/fish/functions/ac.fish b/.config/fish/functions/ac.fish
deleted file mode 100755
index 68f5e27..0000000
--- a/.config/fish/functions/ac.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.Ff7fjo/ac.fish @ line 2
-function ac
-	asciinema rec -i 1 $argv
-end
diff --git a/.config/fish/functions/bat.fish b/.config/fish/functions/bat.fish
deleted file mode 100755
index 1d28c9d..0000000
--- a/.config/fish/functions/bat.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.59f8PN/bat.fish @ line 1
-function bat
-	mog $argv
-end
diff --git a/.config/fish/functions/botwdata.fish b/.config/fish/functions/botwdata.fish
deleted file mode 100755
index 7cffb3e..0000000
--- a/.config/fish/functions/botwdata.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.pL85ov/botwdata.fish @ line 2
-function botwdata
-	cd $D/Games/Emulators/Cemu/botwData
-end
diff --git a/.config/fish/functions/build.fish b/.config/fish/functions/build.fish
index b3eb81f..d1b6baf 100755
--- a/.config/fish/functions/build.fish
+++ b/.config/fish/functions/build.fish
@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.g6wC1F/build.fish @ line 2
+# Defined in /tmp/fish.kRzbVF/build.fish @ line 2
 function build
 	s printf \ 
     gp
@@ -7,4 +7,7 @@ function build
     cmake .
     make
     s make install
+    meson build
+    ninja -C build
+    sudo ninja -C build install
 end
diff --git a/.config/fish/functions/cdir.fish b/.config/fish/functions/cdir.fish
deleted file mode 100755
index 463344b..0000000
--- a/.config/fish/functions/cdir.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.hYM5bH/cdir.fish @ line 1
-function cdir
-	mkdir $argv; cd $argv
-end
diff --git a/.config/fish/functions/cf.fish b/.config/fish/functions/cf.fish
deleted file mode 100755
index c89b775..0000000
--- a/.config/fish/functions/cf.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.gtdPle/cf.fish @ line 2
-function cf
-	cd (ffd $argv | head -1)
-end
diff --git a/.config/fish/functions/cfo.fish b/.config/fish/functions/cfo.fish
deleted file mode 100755
index bc8d35f..0000000
--- a/.config/fish/functions/cfo.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.w7O4D3/cfo.fish @ line 1
-function cfo
-	cf $argv
-co
-end
diff --git a/.config/fish/functions/cmuswin.fish b/.config/fish/functions/cmuswin.fish
deleted file mode 100755
index ee3b431..0000000
--- a/.config/fish/functions/cmuswin.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in - @ line 1
-function cmuswin
-	st -e cmus
-end
diff --git a/.config/fish/functions/discord.fish b/.config/fish/functions/discord.fish
deleted file mode 100755
index f06131b..0000000
--- a/.config/fish/functions/discord.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.qhdqSf/discord.fish @ line 2
-function discord
-	qb https://discordapp.com/channels/@me
-end
diff --git a/.config/fish/functions/ex.fish b/.config/fish/functions/ex.fish
deleted file mode 100755
index 9cc55f5..0000000
--- a/.config/fish/functions/ex.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.of4bzw/ex.fish @ line 1
-function ex
-	exit $argv
-end
diff --git a/.config/fish/functions/filter.fish b/.config/fish/functions/filter.fish
deleted file mode 100755
index 9a65e11..0000000
--- a/.config/fish/functions/filter.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.IaHetC/filter.fish @ line 1
-function filter
-	funced ff
-funcsave ff
-end
diff --git a/.config/fish/functions/flushswap.fish b/.config/fish/functions/flushswap.fish
deleted file mode 100755
index f019f53..0000000
--- a/.config/fish/functions/flushswap.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.Wq2WEU/flushswap.fish @ line 2
-function flushswap
-	s swapoff -a
-    s swapon -a
-end
diff --git a/.config/fish/functions/updatefonts.fish b/.config/fish/functions/font.fish
similarity index 78%
rename from .config/fish/functions/updatefonts.fish
rename to .config/fish/functions/font.fish
index 7ee9f75..d4805d2 100755
--- a/.config/fish/functions/updatefonts.fish
+++ b/.config/fish/functions/font.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.dvX0Rn/updatefonts.fish @ line 2
-function updatefonts
+function font
 	fc-cache -f -v
 end
diff --git a/.config/fish/functions/fuckgit.fish b/.config/fish/functions/fuckgit.fish
index f5bfac3..298878b 100755
--- a/.config/fish/functions/fuckgit.fish
+++ b/.config/fish/functions/fuckgit.fish
@@ -1,5 +1,5 @@
 # Defined in /tmp/fish.5KyO71/fuckgit.fish @ line 2
 function fuckgit
-	git reset --hard
-	git clean -fdx
+	g reset --hard
+	g clean -fdx
 end
diff --git a/.config/fish/functions/ga.fish b/.config/fish/functions/ga.fish
index a554b0e..7c64d96 100644
--- a/.config/fish/functions/ga.fish
+++ b/.config/fish/functions/ga.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.82JlO9/ga.fish @ line 1
 function ga
-	git commit -a $argv
+	g commit -a $argv
 end
diff --git a/.config/fish/functions/gb.fish b/.config/fish/functions/gb.fish
index 7b9ca92..ec9cfb8 100644
--- a/.config/fish/functions/gb.fish
+++ b/.config/fish/functions/gb.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.Hll5zs/gb.fish @ line 1
 function gb
-	git branch $argv
+	g branch $argv
 end
diff --git a/.config/fish/functions/gg.fish b/.config/fish/functions/gg.fish
index 2e577c8..027188b 100644
--- a/.config/fish/functions/gg.fish
+++ b/.config/fish/functions/gg.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.6oIQ1v/gg.fish @ line 1
 function gg
-	git clone $argv
+	g clone $argv
 end
diff --git a/.config/fish/functions/giveme.fish b/.config/fish/functions/giveme.fish
index 1108e47..ef95597 100755
--- a/.config/fish/functions/giveme.fish
+++ b/.config/fish/functions/giveme.fish
@@ -1,6 +1,6 @@
-# Defined in /tmp/fish.e5MYKq/giveme.fish @ line 2
+# Defined in /tmp/fish.NfLGo1/giveme.fish @ line 2
 function giveme
 	for i in (ff)
-        s chown glados $i
+        s chown $USER $i
     end
 end
diff --git a/.config/fish/functions/gl.fish b/.config/fish/functions/gl.fish
index b052f42..6e1776c 100644
--- a/.config/fish/functions/gl.fish
+++ b/.config/fish/functions/gl.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.qBXhXo/gl.fish @ line 1
 function gl
-	git log $argv
+	g log $argv
 end
diff --git a/.config/fish/functions/gsu.fish b/.config/fish/functions/gsu.fish
index 689be20..b9e79b6 100644
--- a/.config/fish/functions/gsu.fish
+++ b/.config/fish/functions/gsu.fish
@@ -1,4 +1,5 @@
-# Defined in /tmp/fish.ASZhcy/gsu.fish @ line 1
+# Defined in /tmp/fish.bDC1Cu/gsu.fish @ line 2
 function gsu
-	git submodule foreach --recursive git pull origin master $argv
+	g submodule foreach --recursive 
+        g pull origin master $argv
 end
diff --git a/.config/fish/functions/gu.fish b/.config/fish/functions/gu.fish
index b40bfec..554322e 100644
--- a/.config/fish/functions/gu.fish
+++ b/.config/fish/functions/gu.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.iJlPcC/gu.fish @ line 2
 function gu
-	git push $argv
+	g push $argv
 end
diff --git a/.config/fish/functions/gupall.fish b/.config/fish/functions/gupall.fish
index a3e80df..69d907a 100644
--- a/.config/fish/functions/gupall.fish
+++ b/.config/fish/functions/gupall.fish
@@ -1,8 +1,8 @@
-# Defined in /tmp/fish.xOFV2s/gupall.fish @ line 1
+# Defined in /tmp/fish.SQEYNE/gupall.fish @ line 2
 function gupall
 	for i in *
         cd $i
-        git pull
+        g pull
         cd ..
     end
 end
diff --git a/.config/fish/functions/jdownloader.fish b/.config/fish/functions/jdownloader.fish
deleted file mode 100755
index 6efb3e6..0000000
--- a/.config/fish/functions/jdownloader.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.k3zVYQ/jdownlaoder.fish @ line 1
-function jdownloader
-	$D/Tools/JDownloader
-java -jar JDownloader.jar
-end
diff --git a/.config/fish/functions/lsa.fish b/.config/fish/functions/la.fish
similarity index 83%
rename from .config/fish/functions/lsa.fish
rename to .config/fish/functions/la.fish
index 21e57e0..507db7c 100644
--- a/.config/fish/functions/lsa.fish
+++ b/.config/fish/functions/la.fish
@@ -1,4 +1,4 @@
 # Defined in /tmp/fish.8wDs2h/lsa.fish @ line 1
-function lsa
+function la
 	ls -a $argv
 end
diff --git a/.config/fish/functions/launcher.fish b/.config/fish/functions/launcher.fish
new file mode 100644
index 0000000..ca93dac
--- /dev/null
+++ b/.config/fish/functions/launcher.fish
@@ -0,0 +1,4 @@
+# Defined in /tmp/fish.NlAEWQ/launcher.fish @ line 1
+function launcher
+	rofi -combi-modi "drun,run" -show combi -modi "combi,window" -drun-icon-theme Papirus $argv
+end
diff --git a/.config/fish/functions/lc.fish b/.config/fish/functions/lc.fish
deleted file mode 100755
index 60e66ae..0000000
--- a/.config/fish/functions/lc.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.G9V44P/lc.fish @ line 2
-function lc
-	lolcat $argv
-end
diff --git a/.config/fish/functions/m.fish b/.config/fish/functions/m.fish
deleted file mode 100755
index c55a447..0000000
--- a/.config/fish/functions/m.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.lQPGYW/m.fish @ line 1
-function m
-	murder $argv
-end
diff --git a/.config/fish/functions/mc.fish b/.config/fish/functions/mc.fish
index 697dd72..87c5c40 100755
--- a/.config/fish/functions/mc.fish
+++ b/.config/fish/functions/mc.fish
@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.scyW8e/mc.fish @ line 1
+# Defined in /tmp/fish.Y3P4Il/minecraft.fish @ line 1
 function mc
-	minecraft
+	cd ~/.minecraft; java -jar launcher.jar
 end
diff --git a/.config/fish/functions/mcr.fish b/.config/fish/functions/mcr.fish
index 2265ff1..44220fa 100755
--- a/.config/fish/functions/mcr.fish
+++ b/.config/fish/functions/mcr.fish
@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.VgI3wL/mcr.fish @ line 1
+# Defined in /tmp/fish.9GKs9x/mcrcon.fish @ line 2
 function mcr
-	mcrcon $argv
+	eval $D/Games/Minecraft/Server/mcrcon -t -H localhost -P 25575 -p password $argv
 end
diff --git a/.config/fish/functions/mcrcon.fish b/.config/fish/functions/mcrcon.fish
deleted file mode 100755
index ccf532c..0000000
--- a/.config/fish/functions/mcrcon.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.9GKs9x/mcrcon.fish @ line 2
-function mcrcon
-	eval $D/Games/Minecraft/Server/mcrcon -t -H localhost -P 25575 -p password $argv
-end
diff --git a/.config/fish/functions/mcs.fish b/.config/fish/functions/mcs.fish
index 5142f88..3937f06 100755
--- a/.config/fish/functions/mcs.fish
+++ b/.config/fish/functions/mcs.fish
@@ -1,4 +1,5 @@
-# Defined in /tmp/fish.Wai4Lr/mcs.fish @ line 1
+# Defined in /tmp/fish.iAzJE2/minecraftserver.fish @ line 2
 function mcs
-	mcserver
+	cd $D/Games/Minecraft/Server
+        java -Xmx8G -Xms128M -XX:+UseConcMarkSweepGC -jar server.jar nogui
 end
diff --git a/.config/fish/functions/mcserver.fish b/.config/fish/functions/mcserver.fish
deleted file mode 100755
index be81660..0000000
--- a/.config/fish/functions/mcserver.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.e745iu/mcserver.fish @ line 1
-function mcserver
-	minecraftserver
-end
diff --git a/.config/fish/functions/megacrypt.fish b/.config/fish/functions/megacrypt.fish
deleted file mode 100755
index 09bbd02..0000000
--- a/.config/fish/functions/megacrypt.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.NwUwdx/megacrypt.fish @ line 1
-function megacrypt
-	qb (echo "$argv" | base64 -d)
-end
diff --git a/.config/fish/functions/minecraft.fish b/.config/fish/functions/minecraft.fish
deleted file mode 100755
index cdb6de9..0000000
--- a/.config/fish/functions/minecraft.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.Y3P4Il/minecraft.fish @ line 1
-function minecraft
-	cd ~/.minecraft; java -jar launcher.jar
-end
diff --git a/.config/fish/functions/minecraftserver.fish b/.config/fish/functions/minecraftserver.fish
deleted file mode 100755
index ad5c74e..0000000
--- a/.config/fish/functions/minecraftserver.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.iAzJE2/minecraftserver.fish @ line 2
-function minecraftserver
-	cd $D/Games/Minecraft/Server
-        java -Xmx8G -Xms128M -XX:+UseConcMarkSweepGC -jar server.jar nogui
-end
diff --git a/.config/fish/functions/mkc.fish b/.config/fish/functions/mkc.fish
deleted file mode 100755
index 9556de3..0000000
--- a/.config/fish/functions/mkc.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.URcWLL/mkc.fish @ line 1
-function mkc
-	mkdir $argv; cd $argv
-end
diff --git a/.config/fish/functions/mount3ds.fish b/.config/fish/functions/mount3ds.fish
deleted file mode 100644
index 9ea1abe..0000000
--- a/.config/fish/functions/mount3ds.fish
+++ /dev/null
@@ -1,6 +0,0 @@
-# Defined in /tmp/fish.qyLQlB/mount3ds.fish @ line 2
-function mount3ds
-	mkdir $D/Games/Roms/3DS $D/Installs/Backup/3DS/sd
-    mount_sd --movable ~/.3ds/movable.sed $D/Installs/Backup/3DS/Nintendo\ 3DS $D/Installs/Backup/3DS/sd
-    mount_titledir $D/Installs/Backup/3DS/sd/b81f00ba4783ae5a534430320002544d/title/ $D/Games/Roms/3DS
-end
diff --git a/.config/fish/functions/nf.fish b/.config/fish/functions/nf.fish
deleted file mode 100755
index 8be2885..0000000
--- a/.config/fish/functions/nf.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.oczbtc/nf.fish @ line 1
-function nf
-	neofetch $argv
-end
diff --git a/.config/fish/functions/pg.fish b/.config/fish/functions/pg.fish
deleted file mode 100755
index 76d7596..0000000
--- a/.config/fish/functions/pg.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.ocvVOF/pg.fish @ line 1
-function pg
-	s mtr $argv
-end
diff --git a/.config/fish/functions/pia-manager.fish b/.config/fish/functions/pia-manager.fish
deleted file mode 100755
index 9815cb3..0000000
--- a/.config/fish/functions/pia-manager.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.e1WPCz/pia-manager.fish @ line 2
-function pia-manager
-	eval $D/Source/pia/pia-manager.py
-end
diff --git a/.config/fish/functions/pia.fish b/.config/fish/functions/pia.fish
index 4e8bb27..82c27db 100755
--- a/.config/fish/functions/pia.fish
+++ b/.config/fish/functions/pia.fish
@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.msZ5xK/pia.fish @ line 2
+# Defined in /tmp/fish.e1WPCz/pia-manager.fish @ line 2
 function pia
-	pia-manager $argv
+	eval $D/Source/pia/pia-manager.py
 end
diff --git a/.config/fish/functions/piaport.fish b/.config/fish/functions/piaport.fish
deleted file mode 100755
index bba59a0..0000000
--- a/.config/fish/functions/piaport.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.2thzVW/piaport.fish @ line 2
-function piaport
-	eval $D/Source/pia-manager/port-forwarding.sh
-end
diff --git a/.config/fish/functions/rufus.fish b/.config/fish/functions/rufus.fish
deleted file mode 100755
index bda3ad9..0000000
--- a/.config/fish/functions/rufus.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.6nxaK9/rufus.fish @ line 1
-function rufus
-	windows2usb $arv
-end
diff --git a/.config/fish/functions/shutdownh.fish b/.config/fish/functions/shutdownh.fish
deleted file mode 100755
index b61532f..0000000
--- a/.config/fish/functions/shutdownh.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.ib0WXg/shutdownh.fish @ line 1
-function shutdownh
-	shutdown (math "60*"$argv)
-end
diff --git a/.config/fish/functions/swift.fish b/.config/fish/functions/swift.fish
deleted file mode 100755
index f4575d9..0000000
--- a/.config/fish/functions/swift.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.Cx4pgF/swift.fish @ line 1
-function swift
-	$D/Installs/Backup/oandbackups
-rm -r *Swift*
-end
diff --git a/.config/fish/functions/timer.fish b/.config/fish/functions/timer.fish
deleted file mode 100644
index 80e2810..0000000
--- a/.config/fish/functions/timer.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.EAIy1T/timer.fish @ line 1
-function timer
-	sleep 1200; notify-send "20 minutes have passed!"
-end
diff --git a/.config/fish/functions/tmpfiles.fish b/.config/fish/functions/tmpfiles.fish
index 65bfac9..68e44fe 100644
--- a/.config/fish/functions/tmpfiles.fish
+++ b/.config/fish/functions/tmpfiles.fish
@@ -1,4 +1,3 @@
-# Defined in /home/glados/.config/fish/functions/tmpfiles.fish @ line 2
 function tmpfiles
 	sudo systemd-tmpfiles --create $argv
 end
diff --git a/.config/fish/functions/torsearch.fish b/.config/fish/functions/torsearch.fish
deleted file mode 100755
index 5dd9c08..0000000
--- a/.config/fish/functions/torsearch.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.yRsTV3/torsearch.fish @ line 2
-function torsearch
-	cd $D/Docs/TorrentCSV/
-    ./search.sh "$argv"
-end
diff --git a/.config/fish/functions/ts.fish b/.config/fish/functions/ts.fish
deleted file mode 100755
index 64891fb..0000000
--- a/.config/fish/functions/ts.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.Jr7deq/ts.fish @ line 1
-function ts
-	torsearch $argv
-end
diff --git a/.config/fish/functions/vboxusb.fish b/.config/fish/functions/vboxusb.fish
index 15fe6ea..3858bc7 100755
--- a/.config/fish/functions/vboxusb.fish
+++ b/.config/fish/functions/vboxusb.fish
@@ -1,4 +1,4 @@
-# Defined in /tmp/fish.4rR45u/vboxusb.fish @ line 1
+# Defined in /tmp/fish.q736uF/vboxusb.fish @ line 2
 function vboxusb
-	s usermod -aG vboxusers glados
+	s usermod -aG vboxusers $USER
 end
diff --git a/.config/fish/functions/vimtutor.fish b/.config/fish/functions/vimtutor.fish
deleted file mode 100644
index 199e5b0..0000000
--- a/.config/fish/functions/vimtutor.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.Yn7d6H/vimtutor.fish @ line 2
-function vimtutor
-	vi +Tutor
-end
diff --git a/.config/fish/functions/vitutor.fish b/.config/fish/functions/vitutor.fish
deleted file mode 100644
index 27eb3ee..0000000
--- a/.config/fish/functions/vitutor.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.6sayVd/vitutor.fish @ line 1
-function vitutor
-	vimtutor
-end
diff --git a/.config/fish/functions/vw.fish b/.config/fish/functions/vw.fish
deleted file mode 100644
index 86d1b81..0000000
--- a/.config/fish/functions/vw.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.r1heUj/vw.fish @ line 2
-function vw
-	vi (which $argv[1]) $argv[2..-1]
-end
diff --git a/.config/fish/functions/wall0.fish b/.config/fish/functions/wall0.fish
deleted file mode 100755
index 873538c..0000000
--- a/.config/fish/functions/wall0.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.UVN1rF/wall0.fish @ line 2
-function wall0
-	rm ~/.config/wall0
-	cp $argv ~/.config/wall0
-end
diff --git a/.config/fish/functions/we.fish b/.config/fish/functions/we.fish
deleted file mode 100644
index 9cded27..0000000
--- a/.config/fish/functions/we.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.bp0O81/we.fish @ line 1
-function we
-	weather
-end
diff --git a/.config/fish/functions/weather.fish b/.config/fish/functions/weather.fish
deleted file mode 100644
index 24be1bd..0000000
--- a/.config/fish/functions/weather.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.aFIptQ/weather.fish @ line 1
-function weather
-	curl 'http://wttr.in/jfk?m'
-end
diff --git a/.config/fish/functions/weatherg.fish b/.config/fish/functions/weatherg.fish
deleted file mode 100644
index cf4f4e4..0000000
--- a/.config/fish/functions/weatherg.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.cmNbzA/weatherg.fish @ line 2
-function weatherg
-	st -g 125x40 fish -c 'weather | less'
-end
diff --git a/.config/fish/functions/wg.fish b/.config/fish/functions/wg.fish
deleted file mode 100644
index 69a1944..0000000
--- a/.config/fish/functions/wg.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.SJ8gn7/wg.fish @ line 2
-function wg
-	weatherg
-end
diff --git a/.config/fish/functions/windows2usb.fish b/.config/fish/functions/windows2usb.fish
deleted file mode 100755
index f6c8382..0000000
--- a/.config/fish/functions/windows2usb.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.pMmQL7/windows2usb.fish @ line 2
-function windows2usb
-	eval $D/Tools/windows2usb $argv
-end
diff --git a/.config/fish/functions/xci.fish b/.config/fish/functions/xci.fish
deleted file mode 100755
index cf73ec9..0000000
--- a/.config/fish/functions/xci.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defined in /tmp/fish.Ymql3J/xci.fish @ line 2
-function xci
-	xci1 $argv
-  xci2 $argv
-end
diff --git a/.config/fish/functions/xci1.fish b/.config/fish/functions/xci1.fish
deleted file mode 100755
index 92d242c..0000000
--- a/.config/fish/functions/xci1.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.P4iOJR/xci1.fish @ line 2
-function xci1
-	hactool -k ~/.local/share/yuzu/keys/prod.keys -txci --securedir="xciDecrypted" "$argv"
-end
diff --git a/.config/fish/functions/xci2.fish b/.config/fish/functions/xci2.fish
deleted file mode 100755
index 0b14095..0000000
--- a/.config/fish/functions/xci2.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defined in /tmp/fish.GVKGKz/xci2.fish @ line 2
-function xci2
-	hactool -k ~/.local/share/yuzu/keys/prod.keys --exefsdir="xciDecrypted" --romfs="xciDecrypted/romfs.romfs" xciDecrypted/(ls xciDecrypted/ -S1 | head -n 1)
-end