 	      ("C-c a"   . go-test-current-project)
 	      ("C-c h ." . hydra-lsp/body))
   :hook ((go-mode . lsp-deferred)
-	 (go-mode . yas-minor-mode)
-	 (before-save . gofmt-before-save)))
+	 (before-save . aim/lsp-go-install-save-hooks)))
 
 (use-package go-add-tags)
-
-;; (add-hook 'go-mode-hook
-;;           (lambda ()
-;;             (set (make-local-variable 'company-backends)
-;;                  '((company-dabbrev-code company-yasnippet)))))
-
-(eval-after-load "dumb-jump"
-  (add-hook 'go-mode 'my-dumb-jump-mode-hook))
-
-;; Set up before-save hooks to format buffer and add/delete imports.
-;; Make sure you don't have other gofmt/goimports hooks enabled.
-;; (defun lsp-go-install-save-hooks ()
-;;   "Fix the slow LSP format buffer."
-;;   (add-hook 'before-save-hook #'lsp-format-buffer t t)
-;;   (add-hook 'before-save-hook #'lsp-organize-imports t t))
-;;(remove-hook 'go-mode-hook #'lsp-go-install-save-hooks)
-;; (add-hook 'before-save-hook 'gofmt-before-save)
-;; ;;Prefer go-mode's gofmt over LSP sluggishness
-;; (add-hook 'before-save-hook 'lsp-organize-imports)
-;; (add-hook 'before-save-hook 'lsp-format-buffer)
 
 (use-package hl-line
   :hook

  :defer nil
  :bind
  (("C-x C-j" . dired-jump))
  :config
  (add-hook 'dired-mode-hook #'dired-omit-mode))


	lsp-enable-snippet nil
	lsp-prefer-capf t
	lsp-prefer-flymake nil)
  :config
  (add-to-list 'lsp-file-watch-ignored "[/\\\\]\\.direnv$")
  (lsp-enable-which-key-integration t)
