Merge branch 'main' of https://gitlab.com/marcuskammer/emacs.d

.profile

@@ -37,7 +37,9 @@ if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
 fi
 
-export PATH="$HOME/.npm-packages/bin:$PATH"
+export PATH="$PATH:$HOME/.npm-packages/bin"
+export PATH="$PATH:/usr/local/go/bin"
+export PATH="$PATH:$HOME/go/bin"
 
 source ~/.apikeys
 source "$HOME/.cargo/env"

bundle/bundle--package.el

@@ -65,13 +65,15 @@ There are two things you can do about this warning:
 
 (use-package typescript-mode)
 
+(use-package go-mode)
+
 (use-package eglot
   :hook ((python-mode . eglot-ensure)
          (c-mode . eglot-ensure)
          (js-mode . eglot-ensure)
          (typescript-mode . eglot-ensure)
          (rust-mode . eglot-ensure)
-         (go-mode-hook . eglot-ensure)))
+         (go-mode . eglot-ensure)))
 
 (use-package ob-rust)
 
@@ -140,7 +142,8 @@ There are two things you can do about this warning:
                              ("shell" . sh)
                              ("C" . c)
                              ("sqlite" . sql)
-                             ("plantuml" . plantuml)))
+                             ("plantuml" . plantuml)
+                             ("rust" . rust)))
         org-use-property-inheritance nil
         org-export-with-sub-superscripts nil
         org-capture-templates (quote
@@ -168,8 +171,8 @@ There are two things you can do about this warning:
                                (plantuml . t)
                                (C . t)
                                (dot . t)
-                               (go . t)))))
-
+                               (go . t)
+                               (rust . t)))))
 
 (use-package helpful
   :bind (("C-h f" . #'helpful-callable)

bundle/custom_gnu.el

@@ -3,8 +3,8 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(Info-additional-directory-list nil)
- '(Info-default-directory-list '("~/Documents/info/" "/usr/share/info/"))
+ '(Info-additional-directory-list '("~/Documents/info/"))
+ '(Info-default-directory-list '("/usr/share/info/"))
  '(TeX-engine 'xetex)
  '(ansi-color-faces-vector
    [default default default italic underline success warning error])
@@ -14,25 +14,21 @@
  '(custom-enabled-themes '(dracula))
  '(custom-safe-themes
    '("81c3de64d684e23455236abde277cda4b66509ef2c28f66e059aa925b8b12534" "171d1ae90e46978eb9c342be6658d937a83aaa45997b1d7af7657546cae5985b" "9e39a8334e0e476157bfdb8e42e1cea43fad02c9ec7c0dbd5498cf02b9adeaf1" "fe36e4da2ca97d9d706e569024caa996f8368044a8253dc645782e01cd68d884" "1fbd63256477789327fe429bd318fb90a8a42e5f2756dd1a94805fc810ae1b62" "7bc40a2e714b4872ad5cd07f992eb8e06ef5e01a8877488b9ffc3067463ca721" "37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default))
- '(default-frame-alist
-    '((font . "Fira Code-11")
-      (width . 90)
-      (height . 60)
-      (alpha . 98)))
+ '(default-frame-alist '((font . "Fira Code-12") (width . 90) (height . 70)))
  '(delete-selection-mode nil)
  '(diary-file "~/Documents/diary/diary")
  '(fci-rule-color "#4C566A")
  '(gnus-init-file "~/.emacs.d/.gnus.el")
  '(hl-paren-colors '("#B9F" "#B8D" "#B7B" "#B69" "#B57" "#B45" "#B33" "#B11"))
  '(initial-buffer-choice "~/Documents/journal/notes.org")
- '(initial-frame-alist '((vertical-scroll-bars)))
+ '(initial-frame-alist '((fullscreen . maximized)))
  '(olivetti-body-width 82 nil nil "Customized with use-package olivetti")
  '(org-modules
    '(ol-bbdb ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m orgtbl-sqlinsert))
  '(org-plantuml-jar-path "~/.local/bin/plantuml.jar")
  '(package-enable-at-startup t)
  '(package-selected-packages
-   '(rust-mode spacemacs-theme dracula-theme jinja2-mode ac-emmet parse-csv csv atom-one-dark-theme arjen-grey-theme arc-dark-theme geiser all-the-icons-ivy all-the-icons-dired powershell forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit))
+   '(go-mode ob-rust rust-mode spacemacs-theme dracula-theme jinja2-mode ac-emmet parse-csv csv atom-one-dark-theme arjen-grey-theme arc-dark-theme geiser all-the-icons-ivy all-the-icons-dired powershell forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit))
  '(scroll-bar-mode nil)
  '(tab-bar-mode nil)
  '(tetris-x-colors

kitty.conf

@@ -22,7 +22,7 @@ italic_font      Fira Code Italic
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 11
+font_size 12
 
 #: Font size (in pts)