change aliases and add archey3

4 files changed, 78 insertions, 47 deletions

diff --git a/Shell/fish/functions b/Shell/fish/aliases
index dcc6cb7..1e8b28e 100644
--- a/Shell/fish/functions
+++ b/Shell/fish/aliases
@@ -137,3 +137,4 @@ function msexcel; /usr/share/playonlinux/playonlinux --run "Microsoft Excel 2010
 function msword; /usr/share/playonlinux/playonlinux --run "Microsoft Word 2010"; end
 
 
+
diff --git a/Shell/fish/config.fish b/Shell/fish/config.fish
index 802e903..e60e419 100644
--- a/Shell/fish/config.fish
+++ b/Shell/fish/config.fish
@@ -1,5 +1,5 @@
 #source ~/.bash_aliases
-source ~/.config/fish/functions
+source ~/.config/fish/aliases
 source ~/.config/fish/fish_prompt.fish
 set PATH ~/bin $PATH
 #set EDITOR vim
diff --git a/Shell/fish/fish_history b/Shell/fish/fish_history
index d211637..365b4d3 100644
--- a/Shell/fish/fish_history
+++ b/Shell/fish/fish_history
@@ -298,10 +298,6 @@
   when: 1455621402
   paths:
     - config.fish
-- cmd: v functions 
-  when: 1455621429
-  paths:
-    - functions
 - cmd: v test.txt
   when: 1455621458
 - cmd: vim functions 
@@ -719,8 +715,6 @@
   when: 1455895635
   paths:
     - io.h
-- cmd: .
-  when: 1455895643
 - cmd: gcc -o test main.c 
   when: 1455895988
   paths:
@@ -1852,22 +1846,12 @@
   when: 1456369012
 - cmd: sudo ~/bin/hostup 
   when: 1456369018
-- cmd: cd .config/fish/
-  when: 1456369041
-  paths:
-    - .config/fish/
-- cmd: v config.fish 
-  when: 1456369046
-  paths:
-    - config.fish
 - cmd: sh
   when: 1456369121
 - cmd: vim ~/.config/fish/config.fish 
   when: 1456369177
 - cmd: v ~/.config/fish/config.fish 
   when: 1456369197
-- cmd: ls
-  when: 1456369209
 - cmd: hostup
   when: 1456369210
 - cmd: sudo hostup
@@ -2002,8 +1986,6 @@
   when: 1456461006
   paths:
     - Torrents/
-- cmd: ..
-  when: 1456461008
 - cmd: cd Downloads/
   when: 1456461009
   paths:
@@ -2042,8 +2024,6 @@
   when: 1456584317
 - cmd: xset r rate 170 60
   when: 1456584635
-- cmd: exit
-  when: 1456584636
 - cmd: pass paypal 
   when: 1456584672
 - cmd: cd .password-store/
@@ -2066,41 +2046,88 @@
   when: 1456584765
 - cmd: mutt
   when: 1456584909
-- cmd: clear
-  when: 1456584911
-- cmd: vps
-  when: 1456584913
-- cmd: cd dotfiles/
-  when: 1456584918
-- cmd: git status
-  when: 1456584919
 - cmd: git commit -a -m 'addiitions'
   when: 1456584930
-- cmd: git push
-  when: 1456584932
-- cmd: ls
-  when: 1456584935
 - cmd: .
   when: 1456584939
 - cmd: ..
   when: 1456584940
-- cmd: vps
-  when: 1456585015
-- cmd: vps
-  when: 1456585092
+- cmd: git add Shell/fish/
+  when: 1456585567
+  paths:
+    - Shell/fish/
+- cmd: git commit -a -m 'add fish'
+  when: 1456585574
+- cmd: git push
+  when: 1456585576
 - cmd: exit
-  when: 1456585226
-- cmd: vps
-  when: 1456585227
+  when: 1456585584
 - cmd: vps
-  when: 1456585240
+  when: 1456585586
+- cmd: cd .config/fish/
+  when: 1456585700
+  paths:
+    - .config/fish/
+- cmd: v functions 
+  when: 1456585702
+  paths:
+    - functions
+- cmd: mv functions aliases
+  when: 1456585730
+  paths:
+    - functions
 - cmd: cd dotfiles/
-  when: 1456585547
+  when: 1456585745
+- cmd: git add Shell/fish/aliases 
+  when: 1456585752
+  paths:
+    - Shell/fish/aliases
+- cmd: function fish_greeting; archey3;end
+  when: 1456585772
+- cmd: funcsave fish_greeting
+  when: 1456585781
+- cmd: clear
+  when: 1456585782
+- cmd: cd Shell/fish/
+  when: 1456585788
   paths:
-    - dotfiles/
+    - Shell/fish/
+- cmd: ls
+  when: 1456585789
+- cmd: v config.fish 
+  when: 1456585793
+  paths:
+    - config.fish
+- cmd: v aliases 
+  when: 1456585801
+  paths:
+    - aliases
 - cmd: git status
-  when: 1456585549
-- cmd: git add Shell/fish/
-  when: 1456585567
+  when: 1456585809
+- cmd: git add aliases 
+  when: 1456585812
   paths:
-    - Shell/fish/
+    - aliases
+- cmd: git add functions
+  when: 1456585814
+  paths:
+    - functions
+- cmd: cd functions/
+  when: 1456585815
+  paths:
+    - functions/
+- cmd: ls
+  when: 1456585816
+- cmd: cat fish_greeting.fish fish_greeting.fish 
+  when: 1456585819
+  paths:
+    - fish_greeting.fish
+    - fish_greeting.fish
+- cmd: exit
+  when: 1456585823
+- cmd: clear
+  when: 1456585831
+- cmd: cd dotfiles/
+  when: 1456585834
+  paths:
+    - dotfiles/
diff --git a/Shell/fish/functions/fish_greeting.fish b/Shell/fish/functions/fish_greeting.fish
new file mode 100644
index 0000000..5ff1d4a
--- /dev/null
+++ b/Shell/fish/functions/fish_greeting.fish
@@ -0,0 +1,3 @@
+function fish_greeting
+	archey3;
+end