diff --git a/.bash_profile b/.bash_profile
index 5166ad2..4770ff4 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -2,9 +2,10 @@
 
 # Get the aliases and functions
 if [ -f ~/.bashrc ]; then
-	. ~/.bashrc
+    . ~/.bashrc
 fi
 
 # User specific environment and startup programs
 
-PATH="$HOME/.npm-global/bin:$PATH:$HOME/.cargo/bin"
+export GOPATH="$HOME/go"
+export PATH="$HOME/.npm-global/bin:$PATH:$HOME/.cargo/bin:$GOPATH/bin"
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index fd82276..bcc2eee 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -3,8 +3,8 @@ if status is-interactive
     set -g fish_greeting
 
     # Interactive environment variables
-    set -x EDITOR /usr/bin/nvim
-    set -x JULIA_NUM_THREADS 16
+    set -gx EDITOR /usr/bin/nvim
+    set -gx JULIA_NUM_THREADS 16
 
     # Setup
     ## Zoxide
diff --git a/.config/nvim/lua/plugins/lsp-cmp.lua b/.config/nvim/lua/plugins/lsp-cmp.lua
index 1cc1850..1a3e421 100644
--- a/.config/nvim/lua/plugins/lsp-cmp.lua
+++ b/.config/nvim/lua/plugins/lsp-cmp.lua
@@ -61,6 +61,11 @@ lspconfig["clangd"].setup({
 	on_attach = on_attach_with_formatting,
 })
 
+lspconfig["gopls"].setup({
+	capabilities = capabilities,
+	on_attach = on_attach_with_formatting,
+})
+
 -- null-ls
 local null_ls = require("null-ls")