From 678c222df137ee82892ca1d10ec989245a5bb9df Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sat, 24 Oct 2020 19:15:37 +0100
Subject: Update zshrc and tmux config

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

(limited to 'zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index b6a400f..1ab8d04 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -1,9 +1,10 @@
 os=$(uname -s)
 
-. $HOME/.nix-profile/etc/profile.d/nix.sh
-
 [ -n "$SSH_CLIENT" ] && export MINIMAL_USER_CHAR="$(hostname)"
 
+. $HOME/.nix-profile/etc/profile.d/nix.sh
+export NIX_IGNORE_SYMLINK_STORE=1
+
 export GITHUB_HOME=$HOME/Projects
 export FZF_DEFAULT_COMMAND='fd --type file --hidden --no-ignore'
 export ALTERNATE_EDITOR="emacs -nw -Q"
@@ -33,6 +34,7 @@ prepend_path "${HOME}/.yarn/bin"
 prepend_path "${HOME}/.cargo/bin"
 prepend_path "${HOME}/.cabal/bin"
 prepend_path "${HOME}/.local/bin"
+prepend_path "/usr/local/opt/llvm/bin"
 
 append_path "/opt/Xilinx/Vivado/2019.1/bin"
 append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
-- 
cgit 


From b6a6e18b0ae8c81f85a84df4d050c75f9eb6e379 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 1 Dec 2020 18:15:18 +0000
Subject: Update zsrhc python path on mac

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

(limited to 'zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 1ab8d04..307b09e 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -25,7 +25,7 @@ if [ $os = "Darwin" ]; then
     prepend_path "/Library/TeX/texbin"
     prepend_path "/usr/local/opt/bison/bin"
 
-    append_path "${HOME}/Library/Python/3.8/bin"
+    append_path "${HOME}/Library/Python/3.9/bin"
 fi
 
 prepend_path "/usr/local/bin"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ccf9080..8f7c2ae 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -40,3 +40,4 @@ bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M emacs '^P' history-substring-search-up
 bindkey -M emacs ^N history-substring-search-down
+
-- 
cgit 


From 3bde28128b255274d4067411ff45790d1c92b3bf Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Tue, 12 Jan 2021 10:25:47 +0000
Subject: Remove llvm path for now

---
 zsh/.zsh/export.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index 307b09e..a4392bc 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -34,7 +34,7 @@ prepend_path "${HOME}/.yarn/bin"
 prepend_path "${HOME}/.cargo/bin"
 prepend_path "${HOME}/.cabal/bin"
 prepend_path "${HOME}/.local/bin"
-prepend_path "/usr/local/opt/llvm/bin"
+# prepend_path "/usr/local/opt/llvm/bin"
 
 append_path "/opt/Xilinx/Vivado/2019.1/bin"
 append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
-- 
cgit 


From a8fd139a791364b8484b9f82669bd31a0f55153e Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sat, 3 Jul 2021 12:43:58 +0200
Subject: Update configurations

---
 zsh/.zsh/export.zsh | 2 ++
 zsh/.zshrc          | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'zsh')

diff --git a/zsh/.zsh/export.zsh b/zsh/.zsh/export.zsh
index a4392bc..8186e73 100644
--- a/zsh/.zsh/export.zsh
+++ b/zsh/.zsh/export.zsh
@@ -38,6 +38,8 @@ prepend_path "${HOME}/.local/bin"
 
 append_path "/opt/Xilinx/Vivado/2019.1/bin"
 append_path "/opt/intelFPGA_lite/18.1/quartus/bin"
+append_path "$HOME/projects/vericert/bin"
+append_path "/opt/bin"
 
 export PATH
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8f7c2ae..a8739a9 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -27,9 +27,11 @@ setopt HIST_FIND_NO_DUPS
 
 if [ -d ~/.cache/wal ]; then (cat ~/.cache/wal/sequences &) fi
 
+export MINIMAL_MAGIC_ENTER=no
+
 # Sourcing everything
-if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi
-if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi
+#if [ -e /usr/share/fzf/key-bindings.zsh ]; then source /usr/share/fzf/key-bindings.zsh; fi
+#if [ -e /usr/share/fzf/completion.zsh ]; then source /usr/share/fzf/completion.zsh; fi
 if [ -e $HOME/.zsh/export.zsh ]; then source $HOME/.zsh/export.zsh; fi
 if [ -e $HOME/.zsh/minimal.zsh ]; then source $HOME/.zsh/minimal.zsh; fi
 if [ -e $HOME/.zsh/function.zsh ]; then source $HOME/.zsh/function.zsh; fi
@@ -40,4 +42,3 @@ bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M emacs '^P' history-substring-search-up
 bindkey -M emacs ^N history-substring-search-down
-
-- 
cgit