Fix conflicts between laptop and Desktop

.gitignore

@@ -6,3 +6,4 @@
 /var/
 tramp
 /elpy/
+/elpa/

elpa/archives/gnu/archive-contents.signed

@@ -1 +0,0 @@
-Good signature from 066DAFCB81E42C40 GNU ELPA Signing Agent (2019) <elpasign@elpa.gnu.org> (trust undefined) created at 2021-09-26T05:05:02-0400 using RSA

init.el

@@ -60,9 +60,20 @@
 (use-package no-littering
 	     :demand t)
 
-;;;; Science Related
+;; Version control
-(use-package conda)
+(use-package magit)
-;;;; End Science Related
+
+;;;; Nix Related
+
+;; Nix direnv support
+(use-package direnv
+  :demand t
+  :config
+  (direnv-mode))
+
+(use-package nix-mode)
+
+;;;; End Nix Related
 
 ;;;; Web Related
 (use-package web-mode
@@ -140,7 +151,7 @@
 (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
 ;; projectile
 
-; Python
+;; Python
 (use-package pyvenv
 	     :init
 	     (setenv "WORKON_HOME" "~/.pyenv/versions")
@@ -149,11 +160,11 @@
 		    )
 	     )
 
-; C related
+;; C related
 (use-package company-ctags)
 (use-package company-c-headers)
 
-; Haskell
+;; Haskell
 (use-package company-ghci)
 ;;;; End Company Related
 
@@ -168,9 +179,7 @@
 ;;;; End Haskell Related
 
 ;;;; NEURON Related
-(use-package nrnhoc
+;; -- TODO
-  :straight (:package nrnhoc :type git :host github :repo "davidcsterratt/neuron-emacs"))
-
 ;;;; END NEURON Related
 
 ;;; Lisp / Parentheses Related
@@ -203,14 +212,45 @@
 ;;;; End Racket Related
 
 ;;;; Org Related
-;; (use-package org)
+
-(use-package org-contrib)
+;; Completion engine
+(use-package ivy-bibtex)
+;; Interactive menus
+(use-package helm-bibtex)
+;; PDF preview etc.
+(use-package pdf-tools)
+;; References etc.
+(use-package org-ref)
+
 (use-package org
+	     :straight (:type built-in)
 	     :config
 	     (require 'doi-utils)
 	     (require 'org-ref)
-
+	     (require 'org-ref-ivy)
+	     (require 'org-ref-helm)
 	     (require 'org-tempo)
+
+	     (setq org-src-fontify-natively t
+		   org-confirm-babel-evaluate nil
+		   org-src-preserve-indentation t)
+	     
+	     (setq bibtex-completion-bibliography
+		   (list (expand-file-name "~/Documents/Bibliography/references.bib")))
+
+	     (setq org-ref-bibliography-notes "~/Documents/Bibliography/notes.org"
+		   org-ref-default-bibliography '("~/Documents/Bibliography/references.bib")
+		   org-ref-pdf-directory "~/Documents/Bibliography/bibtex-pdfs/")
+
+	     (setq org-ref-insert-link-function 'org-ref-insert-link-hydra/body
+		   org-ref-insert-cite-function 'org-ref-cite-insert-helm
+		   org-ref-insert-label-function 'org-ref-insert-label-link
+		   org-ref-insert-ref-function 'org-ref-insert-ref-link
+		   org-ref-cite-onclick-function (lambda (_) (org-ref-citation-hydra/body)))
+
+	     (define-key org-mode-map (kbd "C-c ]") 'org-ref-insert-link)
+	     (define-key org-mode-map (kbd "s-[") 'org-ref-insert-link-hydra/body)
+	     
 	     (tempo-define-template
 	      "Lab Template" '("#+TITLE: PHY324: LAB TITLE"n
 			       "#+AUTHOR: ***REMOVED*** | ***REMOVED***"n
@@ -251,28 +291,19 @@
 			    )
 	       
 	       (setq org-latex-pdf-process
-	'("%latex -shell-escape -interaction nonstopmode -output-directory %o %f" "%latex -shell-escape -interaction nonstopmode -output-directory %o %f" "bibtex %b" "%latex -shell-escape -interaction nonstopmode -output-directory %o %f" "%latex -shell-escape -interaction nonstopmode -output-directory %o %f")))
+		     '("%latex -shell-escape -interaction nonstopmode -output-directory %o %f"
-
+		       "%latex -shell-escape -interaction nonstopmode -output-directory %o %f"
-  )
+		       "bibtex %b"
-; References etc.
+		       "%latex -shell-escape -interaction nonstopmode -output-directory %o %f"
-(use-package org-ref
+		       "%latex -shell-escape -interaction nonstopmode -output-directory %o %f")))
-  :config
-  (setq reftex-default-bibliography '("~/Documents/Bibliography/references.bib"))
-  ;; see org-ref for use of these variables
-  (setq org-ref-bibliography-notes "~/Documents/Bibliography/notes.org"
-	org-ref-default-bibliography '("~/Documents/Bibliography/references.bib")
-	org-ref-pdf-directory "~/Documents/Bibliography/bibtex-pdfs/")
 	     )
 (use-package ox-pandoc
 	     :after org)
-; PDF preview etc.
+;; better TEX
-(use-package pdf-tools)
-
-; better TEX
 (use-package auctex
 	     :after org)
 
-; Plotting support
+;; Plotting support
 (use-package gnuplot)
 
 ;;Org Auto Wrap Config