diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index f5b965b..6736293 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -257,6 +257,11 @@ if [ -d /root/.config ]; then
     rm -Rv /root/.config
 fi
 
+# shell-fish
+
+chsh -s /usr/bin/fish root
+chsh -s /usr/bin/fish ${username}
+
 # mirrorlist
 cp /opt/${repo}/mirrorlist_libre /etc/pacman.d/mirrorlist_libre
 cp /opt/${repo}/mirrorlist /etc/pacman.d/mirrorlist
@@ -529,6 +534,9 @@ if [ "${vollinstallation}" != "n" ]; then
     sed "s|%OS_NAME%|${repo}|g;" /opt/${repo}/bash.bashrc > /etc/bash.bashrc
     cp /opt/${repo}/.bashrc /root/
 
+    # config.fish
+    cp /opt/${repo}/config.fish /root/.config/fish/config.fish
+
     # btrfs-swapfile
     cp /opt/${repo}/btrfs-swapon.service /etc/systemd/system/
     cp /opt/${repo}/btrfs-swapon /usr/bin/
diff --git a/config.fish b/config.fish
new file mode 100644
index 0000000..08b8822
--- /dev/null
+++ b/config.fish
@@ -0,0 +1,17 @@
+alias reboot="sudo systemctl reboot"
+alias poweroff="sudo systemctl poweroff"
+alias halt="sudo systemctl halt"
+alias hibernate="sudo systemctl hibernate"
+alias hybrid="sudo systemctl hybrid-sleep"
+alias suspend="sudo systemctl suspend"
+
+function fish_prompt
+    powerline-shell --shell bare $status
+end
+
+# Start X at login
+if status is-login
+    if test -z "$DISPLAY" -a $XDG_VTNR = 1
+        exec startx -- -keeptty
+    end
+end
diff --git a/packages_cinnamon.txt b/packages_cinnamon.txt
index f11c08b..28fcff4 100755
--- a/packages_cinnamon.txt
+++ b/packages_cinnamon.txt
@@ -36,6 +36,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_gnome.txt b/packages_gnome.txt
index 946d680..c6a70f3 100755
--- a/packages_gnome.txt
+++ b/packages_gnome.txt
@@ -35,6 +35,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_kde.txt b/packages_kde.txt
index e062177..320a5f2 100755
--- a/packages_kde.txt
+++ b/packages_kde.txt
@@ -35,6 +35,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_libre.txt b/packages_libre.txt
index 10d8fa5..da3bc7a 100755
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -25,6 +25,7 @@ exfat-utils
 fail2ban
 ffmpeg
 filezilla
+fish
 freeciv
 gdisk
 git
diff --git a/packages_lxde.txt b/packages_lxde.txt
index 79b27d3..7d62716 100755
--- a/packages_lxde.txt
+++ b/packages_lxde.txt
@@ -35,6 +35,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_lxqt.txt b/packages_lxqt.txt
index c2d8e9b..ac12dd4 100755
--- a/packages_lxqt.txt
+++ b/packages_lxqt.txt
@@ -36,6 +36,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_mate.txt b/packages_mate.txt
index a20884a..f7f56b8 100755
--- a/packages_mate.txt
+++ b/packages_mate.txt
@@ -35,6 +35,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git
diff --git a/packages_voll.txt b/packages_voll.txt
index 7eab8b1..57277d5 100755
--- a/packages_voll.txt
+++ b/packages_voll.txt
@@ -48,6 +48,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 gimp
diff --git a/packages_xfce4.txt b/packages_xfce4.txt
index 2abc1fe..05f0724 100755
--- a/packages_xfce4.txt
+++ b/packages_xfce4.txt
@@ -35,6 +35,7 @@ file-roller
 filezilla
 firefox
 firefox-i18n-de
+fish
 freeciv
 gdisk
 git