diff --git a/home.nix b/home.nix
index 5c5974d..033d1ef 100644
--- a/home.nix
+++ b/home.nix
@@ -32,6 +32,7 @@ in
     imagemagick
     k9s
     kubectl
+    android-tools
     mosh
     neofetch
     pre-commit
@@ -45,7 +46,7 @@ in
   programs.jq.enable = true;
   programs.pandoc.enable = true;
 
-  # Misc Configuration
+  # SQLite Configuration
   home.file.".sqliterc".text = ''
     .headers on
     .mode column
diff --git a/kitty/config/kitty.conf b/kitty/config/kitty.conf
index 3cd3d88..ce9f316 100644
--- a/kitty/config/kitty.conf
+++ b/kitty/config/kitty.conf
@@ -4,7 +4,7 @@
 
 font_family              MesloLGM Nerd Font Mono
 font_size                18.0
-hide_window_decorations  yes
+hide_window_decorations  titlebar-only
 shell                    /Users/evanreichard/.nix-profile/bin/bash --login
 tab_bar_style            powerline
 
diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua
index 0b757fd..a829a1b 100644
--- a/nvim/config/lua/lsp-config.lua
+++ b/nvim/config/lua/lsp-config.lua
@@ -80,6 +80,14 @@ nvim_lsp.eslint.setup {
     cmd = {nix_vars.vscodels .. "/bin/vscode-eslint-language-server", "--stdio"}
 }
 
+-- Go LSP Configuration
+nvim_lsp.gopls.setup {
+    on_attach = on_attach_no_formatting,
+    flags = lsp_flags,
+    capabilities = capabilities,
+    cmd = {nix_vars.gopls .. "/bin/gopls"}
+}
+
 ------------------------------------------------------
 --------------------- Null-LS LSP --------------------
 ------------------------------------------------------
@@ -90,7 +98,7 @@ null_ls.setup({
         null_ls.builtins.completion.spell,
         null_ls.builtins.formatting.nixpkgs_fmt,
         null_ls.builtins.formatting.lua_format,
-        null_ls.builtins.formatting.prettier,
+        null_ls.builtins.formatting.prettier, null_ls.builtins.formatting.gofmt,
         null_ls.builtins.diagnostics.sqlfluff
             .with({extra_args = {"--dialect", "ansi"}}),
         null_ls.builtins.formatting.sqlfluff
diff --git a/nvim/default.nix b/nvim/default.nix
index fabc541..a7474da 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -112,6 +112,7 @@ in
       nodePackages.typescript
       nodePackages.typescript-language-server
       nodePackages.vscode-langservers-extracted
+      gopls
 
       # Formatters
       luaformatter
@@ -142,6 +143,7 @@ in
         tsserver = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server",
         tslib = "${pkgs.nodePackages.typescript}/lib/node_modules/typescript/lib/",
         vscodels = "${pkgs.nodePackages.vscode-langservers-extracted}",
+        gopls = "${pkgs.gopls}",
       }
       return nix_vars
     '';