From f1d40e2b1c542c6117c85a40c202a2398c283e5e Mon Sep 17 00:00:00 2001
From: Phuntsok Drak-pa <phundrak@phundrak.fr>
Date: Sun, 3 Nov 2019 12:43:01 +0100
Subject: [PATCH] removed `install' abbreviation, emacsclient now launched in
 GUI when possible, fixed org title

---
 .config/fish/README.org  | 15 +++++----------
 .config/fish/config.fish |  4 +---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.config/fish/README.org b/.config/fish/README.org
index 49e9ad2..e4def3f 100644
--- a/.config/fish/README.org
+++ b/.config/fish/README.org
@@ -1,4 +1,4 @@
-#+TITLE: Phundrak’s dotfiles
+#+TITLE: Phundrak’s fish config
 #+AUTHOR: Lucien "Phundrak” Cartier-Tilet
 #+EMAIL: phundrak@phundrak.fr
 #+OPTIONS: H:4 broken_links:mark email:t ^:{} auto-id:t
@@ -155,11 +155,11 @@
     set -gx SUDO_ASKPASS ~/.local/bin/askpass
   #+END_SRC
 
-  Now, let’s declare our editor of choice,  EmacsClient. Now, we want it to run
-  in the terminal,  since it will most  often be just quick  edits, nothing too
-  heavy, if it is called from the =EDITOR= variable (from Git, for example).
+  Now, let’s declare  our editor of choice, EmacsClient; not  Emacs itself since
+  it will  most often be just  quick edits, nothing  too heavy, if it  is called
+  from the =EDITOR= variable (from Git, for example).
   #+BEGIN_SRC fish
-    set -gx EDITOR emacsclient -c -nw
+    set -gx EDITOR emacsclient -c
   #+END_SRC
 
   Finally, some development  packages require the =PKG_CONFIG_PATH=  to be set,
@@ -234,11 +234,6 @@
       abbr remove 'sudo pacman -Rscnd'
     #+END_SRC
 
-    And if I want to install something, I just have to type =install=.
-    #+BEGIN_SRC fish
-      abbr install 'sudo pacman -Sy'
-    #+END_SRC
-
     But if I just  want to run =pacman= as sudo, then I  could always just type
     =p=.
     #+BEGIN_SRC fish
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 2291cc3..e4ea3d3 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -21,7 +21,7 @@ set -gx PATH $HOME/.local/bin $HOME/go/bin $HOME/.cargo/bin $PATH
 
 set -gx SUDO_ASKPASS ~/.local/bin/askpass
 
-set -gx EDITOR emacsclient -c -nw
+set -gx EDITOR emacsclient -c
 
 set -gx PKG_CONFIG_PATH /usr/local/lib/pkgconfig/ $PKG_CONFIG_PATH
 
@@ -42,8 +42,6 @@ abbr psmem10 'ps auxf | sort -nr -k 4 | head -10'
 
 abbr remove 'sudo pacman -Rscnd'
 
-abbr install 'sudo pacman -Sy'
-
 abbr p 'sudo -A pacman'
 
 abbr purge 'yay -Sc'