From a9bb367d8117fb92d966eca6d5aefe1c70036a4b Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Mon, 16 Mar 2020 20:51:06 +0000
Subject: Add temp files, need to work on integrating

---
 zsh/.zsh/export.zsh   | 12 ++++++++----
 zsh/.zsh/function.zsh |  6 ------
 zsh/.zsh/startup.zsh  | 10 ----------
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'zsh/.zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index a395d92..c488153 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -1,21 +1,25 @@
-export GITHUB_HOME=$HOME/Github
+. $HOME/.nix-profile/etc/profile.d/nix.sh
+
+export GITHUB_HOME=$HOME/Projects
 export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore'
 export ALTERNATE_EDITOR="emacs -nw -Q"
 export EDITOR='emacsclient -nw'
 export VISUAL='emacsclient -c'
 export TERM='xterm-256color'
+export CLICOLOR=1
 
 export PATH="${HOME}/.gem/ruby/2.6.0/bin:/usr/local/bin:${PATH}"
-export PATH="/usr/bin:${PATH}"
 export PATH="${HOME}/.yarn/bin:${PATH}"
 export PATH="${PATH}:/opt/Xilinx/Vivado/2019.1/bin"
 export PATH="${PATH}:/opt/intelFPGA_lite/18.1/quartus/bin"
 export PATH="${HOME}/.local/bin:${PATH}"
 export PATH="${HOME}/.cargo/bin:${PATH}"
 export PATH="${HOME}/.cabal/bin:${PATH}"
+export PATH="/usr/local/bin:${PATH}"
+export PATH="/Library/TeX/texbin:${PATH}"
+export PATH="${PATH}:/Users/yannherklotz/Library/Python/3.7/bin"
 
 # Stop dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-# Fix java windows for tiling window managers
-export _JAVA_AWT_WM_NONREPARENTING=1
+eval "$(direnv hook zsh)"
diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh
index fdd6980..06a8e43 100644
--- a/zsh/.zsh/function.zsh
+++ b/zsh/.zsh/function.zsh
@@ -1,9 +1,3 @@
-alias fdisk='fdisk --color=always'
-alias grep='grep --color=always'
-alias ls='ls --color=always'
-alias l='ls -la --color=always'
-alias vi='nvim'
-alias vim='nvim'
 alias emc='emacsclient -c -a ""'
 alias em='emacsclient -nw -a ""'
 alias ff='firefox'
diff --git a/zsh/.zsh/startup.zsh b/zsh/.zsh/startup.zsh
index e8caf69..e69de29 100644
--- a/zsh/.zsh/startup.zsh
+++ b/zsh/.zsh/startup.zsh
@@ -1,10 +0,0 @@
-# Nix
-if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then
-  . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh'
-fi
-
-# direnv
-
-eval "$(direnv hook zsh)"
-
-# End Nix
-- 
cgit 


From e97c6f93f83fa8d668577cd3721fdc5bbb886951 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Fri, 27 Mar 2020 15:51:47 +0000
Subject: Add PATH for bison and cargo

---
 zsh/.zsh/export.zsh   | 4 ++++
 zsh/.zsh/function.zsh | 1 +
 2 files changed, 5 insertions(+)

(limited to 'zsh/.zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index c7e34f8..7aa4e8b 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -19,6 +19,7 @@ if [[ -d "${HOME}/.gem/ruby/2.7.0/bin" ]]; then export PATH="${HOME}/.gem/ruby/2
 export PATH="/usr/local/bin:${PATH}"
 export PATH="/Library/TeX/texbin:${PATH}"
 export PATH="${PATH}:/Users/yannherklotz/Library/Python/3.7/bin"
+export PATH="/usr/local/opt/bison/bin:$PATH"
 
 # Stop dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
@@ -38,3 +39,6 @@ if [[ "$?" -eq 0 ]]; then
     test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
     eval "$(opam env)";
 fi
+
+# Load rust environment
+if [[ -f $HOME/.cargo/env ]]; then source $HOME/.cargo/env; fi
diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh
index 20dc12d..be9dd79 100644
--- a/zsh/.zsh/function.zsh
+++ b/zsh/.zsh/function.zsh
@@ -1,6 +1,7 @@
 alias emc='emacsclient -c -a ""'
 alias em='emacsclient -nw -a ""'
 alias ff='firefox'
+alias vim=nvim
 # alias lspasscp='lpass show -c --password $(lpass ls  | fzf | awk '{print $(NF)}' | sed 's/\\]//g')'
 
 # fixing pdflatex
-- 
cgit 


From a3c386f8f24214b12c6d9ce1ad06c98d7735878a Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Fri, 3 Apr 2020 21:06:50 +0100
Subject: Clean up zsh exports

---
 zsh/.zsh/export.zsh | 55 +++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

(limited to 'zsh/.zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 7aa4e8b..671bf5c 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -1,5 +1,9 @@
+os=$(uname -s)
+
 . $HOME/.nix-profile/etc/profile.d/nix.sh
 
+[ -n $SSH_CLIENT ] && export MINIMAL_USER_CHAR="$(hostname)"
+
 export GITHUB_HOME=$HOME/Projects
 export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore'
 export ALTERNATE_EDITOR="emacs -nw -Q"
@@ -8,37 +12,52 @@ export VISUAL='emacsclient -c'
 export TERM='xterm-256color'
 export CLICOLOR=1
 
-export PATH="${HOME}/.gem/ruby/2.6.0/bin:/usr/local/bin:${PATH}"
-export PATH="${HOME}/.yarn/bin:${PATH}"
-export PATH="${PATH}:/opt/Xilinx/Vivado/2019.1/bin"
-export PATH="${PATH}:/opt/intelFPGA_lite/18.1/quartus/bin"
-export PATH="${HOME}/.local/bin:${PATH}"
-export PATH="${HOME}/.cargo/bin:${PATH}"
-export PATH="${HOME}/.cabal/bin:${PATH}"
-if [[ -d "${HOME}/.gem/ruby/2.7.0/bin" ]]; then export PATH="${HOME}/.gem/ruby/2.7.0/bin:${PATH}"; fi
-export PATH="/usr/local/bin:${PATH}"
-export PATH="/Library/TeX/texbin:${PATH}"
-export PATH="${PATH}:/Users/yannherklotz/Library/Python/3.7/bin"
-export PATH="/usr/local/opt/bison/bin:$PATH"
+prepend_path() {
+    test -d "$1" && PATH="$1:$PATH"
+}
+
+append_path() {
+    test -d "$1" && PATH="$PATH:$1"
+}
+
+if [ $os = "Darwin" ]; then
+    prepend_path "/Library/TeX/texbin"
+    prepend_path "/usr/local/opt/bison/bin"
+
+    append_path "${HOME}/Library/Python/3.7/bin"
+fi
+
+prepend_path "/usr/local/bin"
+prepend_path "${HOME}/.gem/ruby/2.7.0/bin"
+prepend_path "${HOME}/.yarn/bin"
+prepend_path "${HOME}/.cargo/bin"
+prepend_path "${HOME}/.cabal/bin"
+prepend_path "${HOME}/.local/bin"
+
+append_path "/opt/Xilinx/Vivado/2019.1/bin"
+append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
+
+export PATH
 
 # Stop dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 # Fix java windows for tiling window managers
-if [[ $(uname -r) = "Linux" ]]; then export _JAVA_AWT_WM_NONREPARENTING=1; fi
-
-[ -f "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
+[ $os = "Linux" ] && export _JAVA_AWT_WM_NONREPARENTING=1
 
 # Direnv hook setup
 command -v direnv >/dev/null 2>&1
-if [[ "$?" -eq 0 ]]; then eval "$(direnv hook zsh)"; fi
+[ "$?" -eq 0 ] && eval "$(direnv hook zsh)"
 
 # Opam hook setup and initialising it
 command -v opam >/dev/null 2>&1
-if [[ "$?" -eq 0 ]]; then
+if [ "$?" -eq 0 ]; then
     test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
     eval "$(opam env)";
 fi
 
 # Load rust environment
-if [[ -f $HOME/.cargo/env ]]; then source $HOME/.cargo/env; fi
+[ -r $HOME/.cargo/env ] && source $HOME/.cargo/env
+
+# Travis
+[ -r "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
-- 
cgit 


From 37dc8f0fa5ba1779d45dae1abf6d4b44850cfda1 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Mon, 6 Apr 2020 20:43:36 +0100
Subject: Regularise the configuration

---
 zsh/.zsh/export.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'zsh/.zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 671bf5c..4e1de6d 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -2,7 +2,7 @@ os=$(uname -s)
 
 . $HOME/.nix-profile/etc/profile.d/nix.sh
 
-[ -n $SSH_CLIENT ] && export MINIMAL_USER_CHAR="$(hostname)"
+[ -n "$SSH_CLIENT" ] && export MINIMAL_USER_CHAR="$(hostname)"
 
 export GITHUB_HOME=$HOME/Projects
 export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore'
@@ -13,11 +13,11 @@ export TERM='xterm-256color'
 export CLICOLOR=1
 
 prepend_path() {
-    test -d "$1" && PATH="$1:$PATH"
+    [ -d "$1" ] && PATH="$1:$PATH"
 }
 
 append_path() {
-    test -d "$1" && PATH="$PATH:$1"
+    [ -d "$1" ] && PATH="$PATH:$1"
 }
 
 if [ $os = "Darwin" ]; then
@@ -57,7 +57,7 @@ if [ "$?" -eq 0 ]; then
 fi
 
 # Load rust environment
-[ -r $HOME/.cargo/env ] && source $HOME/.cargo/env
+[ -r "$HOME/.cargo/env" ] && source $HOME/.cargo/env
 
 # Travis
 [ -r "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh"
-- 
cgit 


From 39c0a34f3c967545aaea1510f594fb92bf8e0166 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 18 Aug 2020 11:33:00 +0100
Subject: Update python and add 'exa'

---
 zsh/.zsh/export.zsh   | 2 +-
 zsh/.zsh/function.zsh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'zsh/.zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 4e1de6d..9f898a4 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -24,7 +24,7 @@ if [ $os = "Darwin" ]; then
     prepend_path "/Library/TeX/texbin"
     prepend_path "/usr/local/opt/bison/bin"
 
-    append_path "${HOME}/Library/Python/3.7/bin"
+    append_path "${HOME}/Library/Python/3.8/bin"
 fi
 
 prepend_path "/usr/local/bin"
diff --git a/zsh/.zsh/function.zsh b/zsh/.zsh/function.zsh
index be9dd79..809471e 100644
--- a/zsh/.zsh/function.zsh
+++ b/zsh/.zsh/function.zsh
@@ -1,5 +1,6 @@
 alias emc='emacsclient -c -a ""'
 alias em='emacsclient -nw -a ""'
+alias ls='exa'
 alias ff='firefox'
 alias vim=nvim
 # alias lspasscp='lpass show -c --password $(lpass ls  | fzf | awk '{print $(NF)}' | sed 's/\\]//g')'
-- 
cgit