From 009174919698505e35100f621b9015f779de5e96 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sun, 8 Mar 2020 18:29:16 +0000
Subject: Add emacs support for mac

---
 zsh/.zshrc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'zsh')

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 9c02e6a..b854793 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -23,17 +23,19 @@ setopt HIST_IGNORE_DUPS
 setopt HIST_IGNORE_SPACE
 setopt HIST_FIND_NO_DUPS
 
-(cat ~/.cache/wal/sequences &)
+if [ -d ~/.cache/wal ]; then
+  (cat ~/.cache/wal/sequences &)
+fi
 
 # Sourcing everything
-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
-source $HOME/.zsh/export.zsh
-source $HOME/.zsh/minimal.zsh
-source $HOME/.zsh/function.zsh
-source $HOME/.zsh/startup.zsh
-source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh
-source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+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
+if [ -e $HOME/.zsh/startup.zsh ]; then source $HOME/.zsh/startup.zsh; fi
+if [ -e $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh ]; then source $HOME/.zsh/zsh-history-substring-search/zsh-history-substring-search.zsh; fi
+if [ -e $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh ]; then source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh; fi
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
 bindkey -M emacs '^P' history-substring-search-up
-- 
cgit 


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 ----------
 zsh/.zshrc            |  3 +++
 4 files changed, 11 insertions(+), 20 deletions(-)

(limited to '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
diff --git a/zsh/.zshrc b/zsh/.zshrc
index b854793..ae0ee35 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -43,3 +43,6 @@ bindkey -M emacs '^N' history-substring-search-down
 
 # opam configuration
 test -r /home/yannherklotz/.opam/opam-init/init.zsh && . /home/yannherklotz/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
+
+# added by travis gem
+[ -f /Users/yannherklotz/.travis/travis.sh ] && source /Users/yannherklotz/.travis/travis.sh
-- 
cgit