     (setq epa-pinentry-mode 'loopback))
 
 ;; eshell settings
-;; eshell prompt
-(defun my-system-name ()
+(defun my/system-name ()
   "Returns system-name without a '.*' suffix"
     (if (cl-search "." system-name)
 	(car (split-string system-name "\\."))
       (system-name)))
+
+(defun my/pwd ()
+  "Returns the last two or less directories of the current working directory"
+  (let ((epwd (split-string (eshell/pwd) "/")))
+    (if (<= (length epwd) 2)
+	(mapconcat 'identity epwd "/")
+      (mapconcat 'identity (last epwd 2) "/"))))
 
 (setq eshell-prompt-function
       (lambda ()
         (concat
          (propertize (user-login-name) 'face '(:foreground "CadetBlue1"))
          (propertize "@" 'face '(:foreground "white"))
-         (propertize (my-system-name) 'face '(:foreground "MediumPurple1"))
+         (propertize (my/system-name) 'face '(:foreground "MediumPurple1"))
          " "
-         (propertize (eshell/pwd) 'face '(:foreground "SpringGreen1"))
-         " $ "))
-      eshell-prompt-regexp "^.+?@.+? .+ \$ ")
+         (propertize (my/pwd) 'face '(:foreground "SpringGreen1"))
+         " λ "))
+      eshell-prompt-regexp "^.+?@.+? .+ \λ ")
 ;; Add to $PATH for eshell
 (add-to-list 'exec-path "/usr/local/bin")
 (add-to-list 'exec-path "/usr/local/sbin")
 (add-to-list 'exec-path "~/.dotfiles/bin")
+(add-hook 'eshell-mode-hook '(lambda ()
+			       (eshell/addpath "/usr/local/bin"
+					       "/usr/local/sbin"
+					       "~/.dotfiles/bin")
+			       (set-window-margins nil 1)
+			       (display-line-numbers-mode 0)))
 
 ;; Org-mode settings
 ;; Indent headings in org files

                                  (interactive)
                                  (split-window-right)
                                  (other-window 1)
                                  (find-file '"~/.emacs.d/init.el")))

;; avy bindings
(global-set-key (kbd "C-;") 'avy-goto-char)
(global-set-key (kbd "C-'") 'avy-goto-line)

;; use ibuffer to list buffers
(global-set-key (kbd "C-x C-b") 'ibuffer)


      ;; timeout exceeded
      (insert initial-key))))
(evil-define-key '(insert) 'global "j" 'my-jk)

;; easymotion binding
(evilem-default-keybindings "'")
