diff --git a/init.el b/init.el
index 269cbed..cee6bbd 100644
--- a/init.el
+++ b/init.el
@@ -69,6 +69,7 @@
 (require '+custom-lang-kotlin "$HOME/.emacs.d/lang/kotlin.el")
 (require '+custom-lang-purescript "$HOME/.emacs.d/lang/purescript.el")
 (require '+custom-lang-php "$HOME/.emacs.d/lang/php.el")
+(require '+custom-lang-golang "$HOME/.emacs.d/lang/golang.el")
 (require '+custom-lang-markdown "$HOME/.emacs.d/lang/markdown.el")
 (require '+custom-lang-other "$HOME/.emacs.d/lang/other.el")
 
diff --git a/lang/golang.el b/lang/golang.el
new file mode 100644
index 0000000..32ebcbb
--- /dev/null
+++ b/lang/golang.el
@@ -0,0 +1,29 @@
+;;; golang.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;; golang mode stuff
+
+;;; Code:
+
+(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el")
+
+(use-package go-mode
+  :requires (lsp-mode lsp-ui)
+  :defer t
+  :straight t)
+
+(defun activate-golang-mode ()
+  (set-indent 8)
+  (column-enforce-n 80)
+  (lsp))
+
+(add-hook 'go-mode-hook 'activate-golang-mode)
+
+(provide '+custom-lang-golang)
+;;; golang.el ends here
diff --git a/lang/other.el b/lang/other.el
index d4fd557..5565898 100644
--- a/lang/other.el
+++ b/lang/other.el
@@ -19,7 +19,7 @@
 
 ;; Text files
 (use-package yaml-mode :straight t :defer t)
-(use-package gitignore-mode
+(use-package git-modes
   :straight t
   :defer t
   :hook ((gitignore-mode . whitespace-mode)
diff --git a/straight/versions/default.el b/straight/versions/default.el
index feeafe2..65538ea 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -1,70 +1,70 @@
 (("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
- ("apropospriate-theme" . "e84255cf485004b6b2cb37ce9e0be62fd6512f8b")
+ ("apropospriate-theme" . "008cd61d8b42367316b147eef2a81636f01faeee")
  ("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
  ("base16-emacs" . "9836cc26c2f8ed9d809feee2bfd8c082cfdbd033")
  ("buffer-move" . "cb517ecf8409b5fdcda472d7190c6021f0c49751")
  ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
  ("caml-mode" . "2905a436e956c5bba16c4633a6e4c4fceefa6535")
  ("cfrs" . "c1f639d7bfd3e728cf85dbe224b06a4be76158f4")
- ("cider" . "0a9d0ef429e76ee36c34e116c4633c69cea96c67")
- ("clj-refactor.el" . "4cb75bd6a2fcb376455e8b4f3edee509f87b86b8")
- ("clojure-mode" . "e1dc7caee76d117a366f8b8b1c2da7e6400636a8")
+ ("cider" . "83b7e84cbc3f932618c670434a1da686d5fe6176")
+ ("clj-refactor.el" . "2efbee40f5bd67f6d2bd2f2e7318ea830b15a78b")
+ ("clojure-mode" . "feb03a603b2080b36492b538aeb2041bac4d129c")
  ("column-enforce-mode" . "14a7622f2268890e33536ccd29510024d51ee96f")
- ("company-mode" . "4c08ef468678bbf3b3c9e750f6e694eea1aa8423")
+ ("company-mode" . "91624227a6b70621c50eec0c37682442b64c0a97")
  ("counsel-projectile" . "e30150792a96968f55f34638cbfe63eaa30839cc")
- ("dap-mode" . "01e8f0fa8687e0cee5ac1f7ceb82a7d18a18416e")
- ("dash-at-point" . "4d795a23a8428c421d5107f1b005c9d8e0d1816c")
+ ("dap-mode" . "a18f29e3d1a3a945ec5dfc7dea98927ecb022c34")
+ ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55")
  ("dash.el" . "da167c51e9fd167a48d06c7c0ee8e3ac7abd9718")
  ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296")
  ("diminish.el" . "6ec6ebc391371418efc6c98d70b013f34af5a2ee")
  ("dockerfile-mode" . "5db94549ce8b000ae35adf511c820ad228178052")
- ("dune" . "71e65a2c9b09a32f8a0ff235954ed78b72a3dba2")
+ ("dune" . "cb6b71459113b6d9c80348f0570a59f84cf0ac1e")
  ("edit-indirect" . "bdc8f542fe8430ba55f9a24a7910639d4c434422")
- ("el-get" . "b5a5a405d04f61ec9c5fcb19357a50a4b9e36a25")
+ ("el-get" . "960f3fb962c35d3196bab20b2a3f6d6228119277")
  ("elisp-refs" . "c06aec4486c034d0d4efae98cb7054749f9cc0ec")
  ("emacs-ansible" . "40af0d2bbb6c5bbcf7aa9269ac9a07e22622d263")
- ("emacs-dashboard" . "77eff49a054e08a474608237f0faae13acb4489b")
+ ("emacs-dashboard" . "a19868f2fb8f7fc4132b4e9bfac5cdd65f245181")
  ("emacs-elixir" . "907ef434a0ce0f94dbd0c77f09bdfcdc779bca73")
- ("emacs-fsharp-mode" . "882d70dde3c066947b0acc51c72ff2f3a903f100")
+ ("emacs-fsharp-mode" . "e92e270c6c987497041fac65cded82146cd41dde")
  ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2")
  ("emacs-hcl-mode" . "e4d9eef631e8a386341ae8f94f7c2579586e65b5")
  ("emacs-racer" . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c")
  ("emacs-which-key" . "4790a14683a2f3e4f72ade197c78e4c0af1cdd4b")
- ("emacsmirror-mirror" . "a9ed25e60078b9ee50d544e170a67a73ec0d4239")
+ ("emacsmirror-mirror" . "b267ef5d8e5e395162f29801d92b04ba347e9824")
  ("enhanced-ruby-mode" . "e960bf941d9fa9d92eabf7c03a8bbb51ba1ac453")
  ("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
- ("exec-path-from-shell" . "0a07f5489c66f76249e6207362614b595b80c230")
+ ("exec-path-from-shell" . "3a8d97c096c2c5714b667130fd8a80d5622ee067")
  ("f.el" . "50af874cd19042f17c8686813d52569b1025c76a")
  ("flycheck" . "784f184cdd9f9cb4e3dbb997c09d93e954142842")
  ("flycheck-rust" . "a139cd53c5062697e9ed94ad80b803c37d999600")
- ("git-modes" . "433e1c57a63c88855fc41a942e29d7bc8c9c16c7")
+ ("git-modes" . "62fbf2e5b84ca789e7bc2f87939386023b5ba3df")
  ("gleam-mode" . "60c0102e9a905027eb88600fef7d60bd3fbdaab1")
- ("gnu-elpa-mirror" . "4ccd8364a6d796f0c0781dd79adfd86231de21ad")
+ ("gnu-elpa-mirror" . "955f0a1144c307ea3a4d95ed2ffd7855c7349233")
  ("groovy-emacs-modes" . "84f89b68ec8f79bce0b3f5b29af155a85124e3a6")
  ("haskell-mode" . "8402caa341d90b4236f5c0a802751f9023ccfbe7")
- ("helpful" . "7e4b1f0d5572a4e2b8ee7a9b084ef863d0315a73")
+ ("helpful" . "8df39c15d290cd499ef261de868191d3fc84f75a")
  ("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87")
  ("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1")
  ("jenkinsfile-mode" . "65bf3925852c35c6bd499978f08f83c1193f4347")
- ("js2-mode" . "e6a9059fc823a17496e1a5114652d92a9071a78f")
+ ("js2-mode" . "d2636f95ebe4d423dc9b4311aff248c7688271c5")
  ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941")
  ("keyfreq" . "7bb36e910ae04ff1dce387e3ce73b669d299680b")
  ("kotlin-mode" . "3e0c34087ba4965a8bf08d3f27325f0a1e631bfb")
  ("let-alist" . "d2d0cac92851d4480328bc3f41d30c518beb1f99")
  ("lsp-haskell" . "4e62cf897dd9e9fcef25c6e8e483490a07a5d439")
- ("lsp-mode" . "8fe3f3a7636b8cc6e6543da0be8ae7a8083b524f")
+ ("lsp-mode" . "2e5ef753ca14418e2ddee9885410725642ea1cac")
  ("lsp-treemacs" . "7bf3d52bccb4a5fdce4fdde9ff61bc75161b97af")
- ("lsp-ui" . "d08c5528ba0a63433a466c2fa1265ec3250fcef1")
+ ("lsp-ui" . "dd4c181a22d19a28236c442cf6c9cd4bbd6d85f8")
  ("macrostep" . "424e3734a1ee526a1bd7b5c3cd1d3ef19d184267")
- ("magit" . "aba0a596115b42fbd60347d893bcc319020ce5a2")
+ ("magit" . "7d154b1f29214a6d6f2ebfb1af050d737c43e8b0")
  ("map" . "7ef991a4e234195f125dc2b2ad4cad5a1d11a7d5")
- ("markdown-mode" . "7360efc6bcfd4eb01aa5a8330f8073fa7e64805a")
- ("melpa" . "768bc3014e0ef793bec7cce46a2e1e0cfce555cb")
- ("merlin" . "e4791e22986993c36c3f5c91e8dff93494cc232e")
+ ("markdown-mode" . "c3c2f0d473a3f8ca8c4ffb2ecc094d5c3541769f")
+ ("melpa" . "c59ae78dc09225b8def8757d52c52988708638fa")
+ ("merlin" . "27600243558e2596a6bbdc52540389c298488adb")
  ("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b")
  ("multiple-cursors.el" . "588daf8c520f4545323e36b8900f02693ddcf5d3")
  ("nginx-mode" . "a2bab83c2eb233d57d76b236e7c141c2ccc97005")
- ("otp" . "f0cf38a32b957d956be4170e24ad72f8fca3e3f6")
+ ("otp" . "5c331cb128ffb0cd2c50b33ef298e5eb601b4e8e")
  ("paredit" . "8330a41e8188fe18d3fa805bb9aa529f015318e8")
  ("parseclj" . "a8c4cf30fb68b66ae51541462a8b21753229a6e5")
  ("parseedn" . "e5ba280d1fb7b408d54062d4eac545326e850172")
@@ -72,8 +72,8 @@
  ("php-mode" . "535aec81739e8e766e0420fda616efc8846f2911")
  ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
  ("pos-tip" . "179cc126b363f72ca12fab1e0dc462ce0ee79742")
- ("posframe" . "f97c4aff2c2c376ca62276d5597aa108546633a9")
- ("projectile" . "7f64570d3e6829d767d340c8584f3e4f3472ee81")
+ ("posframe" . "c153c288a462e10fc468d7474f0082e6c8f5c527")
+ ("projectile" . "584ff420b2c5637b05be5c4808754d6e947ab6c1")
  ("purescript-mode" . "0acd1af446424ba855153161fe07a20f67dc0a89")
  ("queue" . "130c2d656cd5d7376552272fab9e50a7c37d0c4a")
  ("rainbow-delimiters" . "d576e6694ad3a3e88b2bb1363305b38fa364c149")
@@ -82,10 +82,10 @@
  ("rich-minority" . "a03e693f6f9232cf75363aaaf1cb041f21675c19")
  ("rspec-mode" . "92ef785010f6a68cbf73861e75ac6cf4e1832291")
  ("ruby-end.el" . "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0")
- ("rust-mode" . "163d6406476b90b9d3cc09f2081438afca8d7bd4")
+ ("rust-mode" . "3b81e81097463e7161de047ad340e4fe572dcc2a")
  ("s.el" . "08661efb075d1c6b4fa812184c1e5e90c08795a9")
  ("sesman" . "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77")
- ("slime" . "0470fc048fbd7987a25413be37f4e0efd93c204f")
+ ("slime" . "88d39e241bf6f6a2a1daced6d93c8e35692e8889")
  ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72")
  ("smart-mode-line" . "abcb0ab6f7110a03d6c7428bae67cf8731496433")
  ("speed-type" . "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21")
@@ -94,8 +94,8 @@
  ("straight.el" . "af5437f2afd00936c883124d6d3098721c2d306c")
  ("swiper" . "1c6b3da377a840e898b14020133f59fca9ceea1c")
  ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730")
- ("transient" . "45975c24e1ab08bb32e9bdc06f5c5efe7c256e16")
- ("treemacs" . "4fb0480ae6c110a74b7365fb59b84d31ca38ded2")
+ ("transient" . "349116159f707a474926b47e5f6b6240e8997a4d")
+ ("treemacs" . "d1176098c1b47ddaad9b66da68d559abfb1c6f13")
  ("tuareg" . "00faf47a7c65e4cdcf040f38add1c6a08cd2ee2f")
  ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
  ("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
@@ -103,7 +103,7 @@
  ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e")
  ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71")
  ("web-mode" . "61f057a6baeba6b3595e412ba79b3080dca17dcc")
- ("with-editor" . "8d52f933e50624c7bca3880f57297ac17ba4ac2d")
+ ("with-editor" . "cfe70f43c551852125bc139df467e28e1b6087df")
  ("yaml-mode" . "63b637f846411806ae47e63adc06fe9427be1131")
  ("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
  ("yasnippet-snippets" . "f50b4c16ca2a73fd04ebd301f0bf2f5ab6107d88"))