aboutsummaryrefslogtreecommitdiffstats
path: root/zsh
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2020-03-16 20:51:06 +0000
committerYann Herklotz <git@yannherklotz.com>2020-03-16 20:51:06 +0000
commita9bb367d8117fb92d966eca6d5aefe1c70036a4b (patch)
treeb104f4ff23943f63353487ed2e5b89b11ed03df1 /zsh
parentf763fb20585973b1c7cd5691607fdfd984ce27f9 (diff)
downloaddotfiles-a9bb367d8117fb92d966eca6d5aefe1c70036a4b.tar.gz
dotfiles-a9bb367d8117fb92d966eca6d5aefe1c70036a4b.zip
Add temp files, need to work on integrating
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zsh/export.zsh12
-rw-r--r--zsh/.zsh/function.zsh6
-rw-r--r--zsh/.zsh/startup.zsh10
-rw-r--r--zsh/.zshrc3
4 files changed, 11 insertions, 20 deletions
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