From 8c8f6569283ec68b641427ce2067fd42e6da4270 Mon Sep 17 00:00:00 2001
From: "Marcel Kapfer (mmk2410)" <marcelmichaelkapfer@yahoo.co.nz>
Date: Wed, 14 Dec 2016 09:22:27 +0100
Subject: [PATCH 1/2] Emacs: Added fish-mode and hugo packages

---
 emacs.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs.el b/emacs.el
index b940db7..938de75 100644
--- a/emacs.el
+++ b/emacs.el
@@ -68,7 +68,7 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-    (stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
+    (fish-mode hugo stumpwm-mode slime muttrc-mode diff-hl magit wanderlust ## auctex yaml-mode typescript sass-mode php-mode outlined-elisp-mode monokai-theme markdown-mode fill-column-indicator edit-server dracula-theme dart-mode coffee-mode auto-complete atom-one-dark-theme atom-dark-theme)))
  '(send-mail-function (quote smtpmail-send-it)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

From 438d595a779fce7f4e8144506803a31628996474 Mon Sep 17 00:00:00 2001
From: "Marcel Kapfer (mmk2410)" <marcelmichaelkapfer@yahoo.co.nz>
Date: Wed, 14 Dec 2016 09:45:28 +0100
Subject: [PATCH 2/2] Fish: Changes

---
 fish/config.fish                |  6 +++
 fish/fish_history               | 66 ---------------------------------
 fish/functions/fish_prompt.fish |  7 ++++
 3 files changed, 13 insertions(+), 66 deletions(-)
 delete mode 100644 fish/fish_history
 create mode 100644 fish/functions/fish_prompt.fish

diff --git a/fish/config.fish b/fish/config.fish
index 82fd37d..8e929b5 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -34,6 +34,8 @@ alias q=' exit'
 alias Q=' exit'
 alias x=' exit'
 alias cd..='cd ..'
+alias mmk2410='~/.mmk2410'
+
 if [ -z $SSH_CLIENT ]
 	~/.mmk2410
 end
@@ -46,3 +48,7 @@ if [ -z $VISUAL ]
 	set -Ux VISUAL nvim
 end
 
+if [ -z $GOPATH ]
+	set -Ux GOPATH ~/.go
+end
+
diff --git a/fish/fish_history b/fish/fish_history
deleted file mode 100644
index 7a4cdcc..0000000
--- a/fish/fish_history
+++ /dev/null
@@ -1,66 +0,0 @@
-- cmd: ls /usr/bin/
-  when: 1462367636
-  paths:
-    - /usr/bin/
-- cmd: pub
-  when: 1462367761
-- cmd: dart
-  when: 1462367764
-- cmd: cd rtlwifi_new/
-  when: 1462368025
-  paths:
-    - rtlwifi_new/
-- cmd: sudo make uninstall
-  when: 1462368036
-- cmd: sudo update-initramfs -u
-  when: 1462368061
-- cmd: man su
-  when: 1462368073
-- cmd: sudo update-grub
-  when: 1462368103
-- cmd: sudo update-grub2
-  when: 1462368119
-- cmd: cd
-  when: 1462368640
-- cmd: l dotfiles/
-  when: 1462368644
-  paths:
-    - dotfiles/
-- cmd: cd .config/
-  when: 1462368648
-  paths:
-    - .config/
-- cmd: l
-  when: 1462368649
-- cmd: ln -s ~/dotfiles/fish/
-  when: 1462368659
-- cmd: ls
-  when: 1462368662
-- cmd: ll fish/
-  when: 1462368666
-  paths:
-    - fish/
-- cmd: ll
-  when: 1462368669
-- cmd: rm -rf fish/
-  when: 1462368672
-  paths:
-    - fish/
-- cmd: ln -s ~/dotfiles/fish/
-  when: 1462368677
-- cmd: ll
-  when: 1462368679
-- cmd: ls fish/
-  when: 1462368682
-  paths:
-    - fish/
-- cmd: exit
-  when: 1462368684
-- cmd: bah
-  when: 1462368688
-- cmd: bash
-  when: 1462368690
-- cmd: exit
-  when: 1462368909
-- cmd: exit
-  when: 1462368949
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..c298096
--- /dev/null
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,7 @@
+function fish_prompt --description 'Write out the prompt'
+	if test -z $WINDOW
+   printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+ else
+   printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+ end
+end