Add temp files, need to work on integrating

6 files changed, 30 insertions, 23 deletions

diff --git a/emacs/loader.org b/emacs/loader.org
index 1183215..b66488b 100644
--- a/emacs/loader.org
+++ b/emacs/loader.org
@@ -109,7 +109,7 @@ yes or no. Also stop the start up message from popping up and enter the scratch
 buffer instead.
 
 #+BEGIN_SRC emacs-lisp
-  ;;(setq warning-minimum-level :emergency)
+  (setq warning-minimum-level :emergency)
   (setq inhibit-startup-message t
         confirm-nonexistent-file-or-buffer nil
         default-directory "~/")
@@ -121,11 +121,18 @@ buffer instead.
   (fset 'yes-or-no-p 'y-or-n-p)
   (global-hl-line-mode 1)
   (add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
-  (when (string= system-type "darwin")
+  (when (eq system-type 'darwin)
     (setq dired-use-ls-dired nil))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
+  (when (eq system-type 'darwin)
+    (setq mac-right-option-modifier 'none
+          mac-option-key-is-meta nil
+          mac-command-key-is-meta t
+          mac-command-modifier 'meta
+          mac-option-modifier nil))
+
   (global-set-key (kbd "M-u")   #'upcase-dwim)
   (global-set-key (kbd "M-l")   #'downcase-dwim)
   (global-set-key (kbd "M-c")   #'capitalize-dwim)
@@ -447,6 +454,15 @@ Define utility functions to make the reader work.
 #+END_SRC
 
 * Utility
+** Zettelkasten
+
+#+begin_src emacs-lisp
+  (when (file-directory-p "~/Projects/emacs-zettelkasten")
+    (add-to-list 'load-path "~/Projects/emacs-zettelkasten")
+    (require 'zettelkasten)
+    (zettelkasten-mode t))
+#+end_src
+
 ** Navigation
 
 Set navigation commands in all the buffers
diff --git a/install.sh b/install.sh
index f7c0022..2bd7b26 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+SCRIPT_DIR=$(pwd)
 
 function print_help {
   echo "Install configuration options to the correct paths."
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