From 1a5a9e4c604a726519db2dedb2f4be6d561542f0 Mon Sep 17 00:00:00 2001
From: Christopher James Hayward <chris@chrishayward.xyz>
Date: Sun, 31 Jan 2021 11:38:57 -0500
Subject: [PATCH] Cleanup

---
 README.org | 36 +++++++++++++++++++-----------------
 init.el    |  7 ++++++-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/README.org b/README.org
index a34a3cc..7b6f341 100644
--- a/README.org
+++ b/README.org
@@ -923,23 +923,6 @@ https://www.emacswiki.org/emacs/PythonProgrammingInEmacs
           (dap-python-debugger 'debugpy))
 #+end_src
 
-*** Rust
-
-Full *IDE* experience for Rust within Emacs.
-+ Completion via =lsp-mode=
-+ Debugging via =dap-mode=
-
-https://github.com/brotzeit/rustic
-+ Install via ~lsp-install-server~
-
-#+begin_src shell :tangle no
-rustup default nightly
-#+end_src  
-
-#+begin_src emacs-lisp
-(use-package rustic)
-#+end_src
-
 *** Go
 
 Full *IDE* experience for Rust within Emacs.
@@ -952,6 +935,12 @@ Install the =gopls= language server.
 GO111MODULE=on go get golang.org/x/tools/gopls@latest
 #+end_src
 
+Set the ~GOPATH~ environment variable prior to loading, this allows us to change the default value of ~$HOME/go~ to ~$HOME.go~.
+
+#+begin_src emacs-lisp
+(setenv "GOPATH" "$HOME/.go/")
+#+end_src
+
 #+begin_src emacs-lisp
 (use-package go-mode
   :hook (go-mode . lsp))
@@ -971,6 +960,7 @@ Apply some custom behaviour before saving:
 #+begin_src emacs-lisp
 (add-hook 'go-mode-hook #'dotfiles/go-hook)
 #+end_src
+
 * Interface
 :PROPERTIES:
 :header-args: :tangle ~/.local/source/dotfiles/init.el :results silent
@@ -1075,6 +1065,12 @@ Load a theme with =SPC t t=.
   "tt" '(load-theme t t :which-key "Theme"))
 #+end_src
 
+** Browser
+
+#+begin_src emacs-lisp
+(setenv "BROWSER" "flatpak run org.mozilla.firefox")
+#+end_src
+
 ** Ligatures
 
 Enable font ligatures via [[https://github.com/jming422/fira-code-mode][fira-code-mode]], perform this action *only* when ~Fira Code~ is set as the current font.
@@ -1085,6 +1081,11 @@ Enable font ligatures via [[https://github.com/jming422/fira-code-mode][fira-cod
 ;;   (global-fira-code-mode))
 #+end_src
 
+#+begin_src emacs-lisp
+(use-package fira-code-mode
+  :hook prog-mode)
+#+end_src
+
 ** Dashboard
 
 Present a dashboard when first launching Emacs.
@@ -1111,3 +1112,4 @@ When running in *daemon* mode, ensure that the dashboard is the initial buffer.
       (lambda ()
         (get-buffer "*dashboard*")))
 #+end_src
+
diff --git a/init.el b/init.el
index 82c3221..1dd9588 100644
--- a/init.el
+++ b/init.el
@@ -446,7 +446,7 @@
           (dap-python-executable "python3")    ;; Same as above.
           (dap-python-debugger 'debugpy))
 
-(use-package rustic)
+(setenv "GOPATH" "$HOME/.go/")
 
 (use-package go-mode
   :hook (go-mode . lsp))
@@ -491,10 +491,15 @@
 (dotfiles/leader
   "tt" '(load-theme t t :which-key "Theme"))
 
+(setenv "BROWSER" "flatpak run org.mozilla.firefox")
+
 ;; (use-package fira-code-mode
 ;;   :config
 ;;   (global-fira-code-mode))
 
+(use-package fira-code-mode
+  :hook prog-mode)
+
 (use-package dashboard
   :config
   (setq dashboard-center-content t