7 files changed, 85 insertions, 51 deletions

diff --git a/emacs/.config/emacs/arkta/arkta-progmodes.el b/emacs/.config/emacs/arkta/arkta-progmodes.el
index 6d3b28a..b862af6 100644
--- a/emacs/.config/emacs/arkta/arkta-progmodes.el
+++ b/emacs/.config/emacs/arkta/arkta-progmodes.el
@@ -1,5 +1,5 @@
 ;; -*- lexical-binding: t -*-
-;; Copyright © 2018-2025  Uko Koknevics
+;; Copyright © 2018-2026  Uko Koknevics
 
 (require 'arkta-treesit)
 
@@ -26,7 +26,7 @@
   :after treesit
   :straight '(c-ts-mode :type built-in)
   :mode ("\\.c\\'"
-         ("\\.cpp\\'" . c++-ts-mode))
+         ("\\.cppm?\\'" . c++-ts-mode))
   :init
   (defun arkta/c-setup ()
     (setq indent-tabs-mode t)
@@ -95,6 +95,11 @@
   :straight 'gdscript-mode
   :mode "\\.gd\\'")
 
+(use-package glsl-mode
+  ;; TODO: glsl-ts-mode currently has some bug
+  :straight 'glsl-mode
+  :mode "\\.\\(vert\\|frag\\)\\'")
+
 (use-package go-ts-mode
   :after treesit
   :straight '(go-ts-mode :type built-in)
@@ -126,7 +131,14 @@
 (use-package java-ts-mode
   :after treesit
   :straight '(java-ts-mode :type built-in)
-  :mode "\\.java\\'")
+  :mode "\\.java\\'"
+  :init
+  (defun arkta/java-setup ()
+    (setq indent-tabs-mode t)
+    (arkta/set-tab-width java-ts-mode-indent-offset))
+  :hook (java-ts-mode . arkta/java-setup)
+  :custom
+  (java-ts-mode-indent-offset standard-indent))
 
 (use-package js
   :after treesit
@@ -151,7 +163,7 @@
   :straight '(lua-ts-mode :type built-in)
   :after treesit
   :mode ("\\.lua\\'" "\\.rockspec\\'")
-  :custom (lua-ts-indent-offset standard-offset))
+  :custom (lua-ts-indent-offset standard-indent))
 
 (use-package make-mode
   :straight '(make-mode :type built-in)
diff --git a/emacs/.config/emacs/arkta/arkta-treesit.el b/emacs/.config/emacs/arkta/arkta-treesit.el
index 4e56da9..ed7658d 100644
--- a/emacs/.config/emacs/arkta/arkta-treesit.el
+++ b/emacs/.config/emacs/arkta/arkta-treesit.el
@@ -1,5 +1,5 @@
 ;; -*- lexical-binding: t -*-
-;; Copyright © 2018-2025  Uko Koknevics
+;; Copyright © 2018-2026  Uko Koknevics
 
 (use-package treesit
   :straight '(treesit :type built-in)
@@ -121,8 +121,11 @@
 
           (gdscript "https://github.com/PrestonKnopp/tree-sitter-gdscript"
                     ,(arkta/treesit-cond
-                       (15 "v6.0.0")
-                       (14 "v5.0.1")))
+                       (14 "v6.1.0")))
+
+          (glsl "https://github.com/tree-sitter-grammars/tree-sitter-glsl"
+                ,(arkta/treesit-cond
+                   (14 "v0.2.0")))
 
           (go "https://github.com/tree-sitter/tree-sitter-go.git"
               ,(arkta/treesit-cond
@@ -169,7 +172,7 @@
 
           (lua "https://github.com/tree-sitter-grammars/tree-sitter-lua"
                ,(arkta/treesit-cond
-                  (15 "v0.4.0")
+                  (15 "v0.4.1")
                   (14 "v0.3.0")))
 
           (php "https://github.com/tree-sitter/tree-sitter-php"
diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el
index cc2cc0d..9033081 100644
--- a/emacs/.config/emacs/init.el
+++ b/emacs/.config/emacs/init.el
@@ -1,5 +1,5 @@
 ;; -*- lexical-binding: t -*-
-;; Copyright © 2018-2025  Uko Koknevics
+;; Copyright © 2018-2026  Uko Koknevics
 
 ;; Make sure early-init has been loaded.
 (unless (boundp 'loaded-early-init)
@@ -404,7 +404,8 @@
                    :pre-build
                    (("./autogen.sh"
                      "--prefix"
-                     ,local-prefix)
+                     ,local-prefix
+                     "-Dguile=disabled")
                     ("ninja" "-C" "build")
                     ("ninja" "-C" "build" "install"))
                    :files
@@ -412,6 +413,8 @@
                     ,(expand-file-name "share/emacs/site-lisp/mu4e/*.el" local-prefix)
                     ,(expand-file-name "share/info/*" local-prefix)))
   :commands mu4e
+  ;; TODO: Make C-c m bury the buffer instead when in *mu4e-main*
+  :bind (("C-c m" . mu4e))
   :custom
   (mu4e-mu-binary (expand-file-name "bin/mu" local-prefix))
 
diff --git a/emacs/.config/emacs/straight/versions/default.el b/emacs/.config/emacs/straight/versions/default.el
index 383bce7..56fd4a3 100644
--- a/emacs/.config/emacs/straight/versions/default.el
+++ b/emacs/.config/emacs/straight/versions/default.el
@@ -1,80 +1,80 @@
-(("PG" . "f33b478d1144d6828dfa0df7f0d7d48da704ea11")
+(("PG" . "6946aa5bebbd5dbbb2985d22325a03290fb6b79f")
  ("ace-window" . "77115afc1b0b9f633084cf7479c767988106c196")
  ("adoc-mode" . "20772277b8a5b8c08d49bd03043d5d4dd7a815e9")
  ("amx" . "5b3aa1aae84f4a225cb8d26ab79a32f97693f023")
- ("auto-compile" . "20744a681ba5f0584695973a5ece3a794026ff76")
+ ("auto-compile" . "eaed414fa7dae04c7701dbc591de52fb3e81aa91")
  ("avy" . "933d1f36cca0f71e4acb5fac707e9ae26c536264")
  ("cfrs" . "981bddb3fb9fd9c58aed182e352975bd10ad74c8")
- ("colorful-mode" . "38737a813246f352c3fdeb15b2818c4679077619")
+ ("colorful-mode" . "523d0bfd7c4313b611a83c6a6a1517c113b87d53")
  ("company-mlton" . "9b09d209b4767a2af24784fb5321390ed1d445bf")
- ("company-mode" . "4ff89f7369227fbb89fe721d1db707f1af74cd0f")
- ("compat" . "97f24af413a38a7f1aaedb29f5aaaa333796a5b4")
- ("cond-let" . "09ebf1caa81c99677ce74091a23b48a28d53bcd9")
- ("dart-mode" . "edb45cb7095b1e4f62eaae33e56fe9af5b010213")
+ ("company-mode" . "fad9f207e00a851c0d96dd532c1b175326ac3e3d")
+ ("compat" . "bf032a05d0e4f60b175d7cb268bdeb53ea0a0aae")
+ ("cond-let" . "0430bd1eb3493ea90d69feb6b7eb7dac3e10d0ba")
+ ("dart-mode" . "773e9ebc74a258af2db395b01febfb652a42f3ab")
  ("dash.el" . "fb443e7a6e660ba849cafcd01021d9aac3ac6764")
- ("doom-modeline" . "20de9feaa0ba3cb498cb9b06de9877ab41928747")
- ("ebuild-mode" . "ae18a2d8cae2f7b3260a64b41fb7f613264c5eb4")
- ("editorconfig-emacs" . "4af10445fcdf1c9dfa7af4f9e5bec59e8a759d6f")
- ("el-get" . "d3815eb03df07d755a14e6be2c5305daa47ba28b")
+ ("doom-modeline" . "d074b922ae37a9dab994fce204533e0c0143ab75")
+ ("ebuild-mode" . "4af37038592b968ddfba83aa3cede347245d5220")
+ ("editorconfig-emacs" . "646c31b4b7b0bd8805cf2914239ac9aa1cd6d962")
+ ("el-get" . "64112351b1f58c77463b8802ddd7f78964c9c5ca")
  ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d")
  ("elpher" . "dcdeb86f7ae633e252f9ef8a73d3458e87c1ab12")
- ("emacs-dashboard" . "e5fc08e78223487aa0da12539be1a23356c09ec7")
+ ("emacs-dashboard" . "49de4c16624f6a86a5beb1196f68f02636a74d1b")
  ("emacs-emojify" . "1b726412f19896abf5e4857d4c32220e33400b55")
- ("emacs-gdscript-mode" . "bd0a741066a7bb2dfa51d2daec54fc38d56078a5")
+ ("emacs-gdscript-mode" . "79739fc80f836b37aae81bc66437ba7e5edac1bb")
  ("emacs-kotlin-ts-mode" . "051c9ef534956c235343fb41546623ff87a1695b")
- ("emacs-reformatter" . "c52e91d5438b9bf16b77b4384822e254f10a6b0a")
- ("emacs-solaire-mode" . "c9334666bd208f3322e6118d30eba1b2438e2bb9")
- ("emacsmirror-mirror" . "6c387f044ab033f3a912d08b11bc565679187ba6")
- ("envrc" . "de1ae6e538764f74659f358b04af0d84fa0fef42")
- ("exec-path-from-shell" . "59631fc475678ca299cc9503c1e48e87404b0b80")
+ ("emacs-reformatter" . "c0ddac04b7b937ed56d6bf97e4bfcc4eccfa501a")
+ ("emacs-solaire-mode" . "e44f11a1ff7489ea7173119d62de99b88e29c918")
+ ("emacsmirror-mirror" . "bd5eeb5c888ccf90208b42fb1ffe446d6f1dc6b8")
+ ("envrc" . "06d72d141ac2e2990d80cdb8bb84f6cb54c628a5")
+ ("exec-path-from-shell" . "7552abf032a383ff761e7d90e6b5cbb4658a728a")
  ("f.el" . "931b6d0667fe03e7bf1c6c282d6d8d7006143c52")
  ("fontaine" . "8de1279a3cd9843546c1df219b385829e6569ece")
  ("gcmh" . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9")
- ("git-gutter" . "5429931c91469c8dbf82f97e81414bdf25e838a4")
- ("gnu-elpa-mirror" . "e15f2d8da53d44f3b6a7b39cdb49f6e01e7e2b87")
+ ("git-gutter" . "101b1e29ec4f4609b29a17877990f95993452188")
+ ("gnu-elpa-mirror" . "ea027634bef47539058e14d3cf9e081cd64abbfc")
  ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
- ("haskell-ts-mode" . "16155f8b63ccf67d46535207a4f4378f675a8b47")
+ ("haskell-ts-mode" . "bf143ee8382f09e0a68d775d80445065f32929c3")
  ("helpful" . "03756fa6ad4dcca5e0920622b1ee3f70abfc4e39")
- ("hl-todo" . "2e9504511aa393686f44a36716c1d2ebdc5def1f")
+ ("hl-todo" . "9540fc414014822dde00f0188b74e17ac99e916d")
  ("ht.el" . "1c49aad1c820c86f7ee35bf9fff8429502f60fef")
- ("htmlize" . "c9a8196a59973fabb3763b28069af9a4822a5260")
+ ("htmlize" . "fa644880699adea3770504f913e6dddbec90c076")
  ("hydra" . "59a2a45a35027948476d1d7751b0f0215b1e61aa")
  ("inheritenv" . "b9e67cc20c069539698a9ac54d0e6cc11e616c6f")
- ("llama" . "ec1d4ef02f5572fc5aff3f62d3e7ef791f444456")
+ ("llama" . "2a89ba755b0459914a44b1ffa793e57f759a5b85")
  ("lua-mode" . "2f6b8d7a6317e42c953c5119b0119ddb337e0a5f")
  ("macrostep" . "d0928626b4711dcf9f8f90439d23701118724199")
- ("magit" . "fa5906621a2e1fabdb43bfbc0b6b87dd08104fba")
- ("marginalia" . "8a07e869577e0b8582db2528b08ec295d0405bb7")
- ("markdown-mode" . "d51c469133d220823cc6ab50ff8e8743ed6e42fb")
- ("melpa" . "c925f259e6acf131e3008c0635edeeca66a0a9d0")
- ("mu" . "7ac3b383237abd1eef6981e4d8cedaec4b7c8ad7")
+ ("magit" . "9d7e06dd8c609044604d9ff0dfdc8105ce32dc7f")
+ ("marginalia" . "fc0cee1151fced42db6014e1d29a61ed63de81d9")
+ ("markdown-mode" . "92802fae9ebbc8c2e4c281c06dcdbd74b8bca80e")
+ ("melpa" . "9ee021ccb4d481bc2b036aa81cec858f09d2686b")
+ ("mu" . "7dc8216b92e7dd12df32a7953c767e2e2993fe4b")
  ("nasm-mode" . "4e670f6dededab858251670aa5459c950f78d867")
- ("nerd-icons.el" . "579f489e75116bb8bb0a507c19f120493a913533")
+ ("nerd-icons.el" . "d41902fe68a94fcf4394f25a89ba2d510bec4461")
  ("ninja-emacs" . "573c3aaedc6e90e9a8954bb70a24e079af7df390")
  ("nix-mode" . "719feb7868fb567ecfe5578f6119892c771ac5e5")
- ("nongnu-elpa" . "f5b312b749043106a17f388ea3d153239b9bd541")
+ ("nongnu-elpa" . "e34e708c5adbd71f9d7abe138a62947ccae23eb2")
  ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c")
  ("pico8-mode" . "e276c65352f294679af62148df41f36dac744426")
  ("popper" . "49f4904480cf4ca5c6db83fcfa9e6ea8d4567d96")
- ("posframe" . "12f540c9ad5da09673b2bca1132b41f94c134e82")
- ("racket-mode" . "143d453dc09e4ca1eb43826bd61270a97f1f7c9d")
+ ("posframe" . "d93828bf6c36383c365bd564ad3bab5a4403804c")
+ ("racket-mode" . "150b0579534ff9c0850ed2f4841987d5df9f444a")
  ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
  ("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
  ("scala-ts-mode" . "c7671e10419261ef70b1820d3b970ad39f6fcfe2")
  ("seq" . "da86da9bf111f68fb81efd466d76d53af5aebc00")
  ("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
- ("slime" . "3d809df89ec05a3666c35075923eac0806e90659")
+ ("slime" . "8f6aaf56978f95fb029a9aeb6b601c163c3bcb99")
  ("smalltalk-mode" . "274b17efbf0dd9962842aa9eea76b117796d17ed")
  ("smartparens" . "b629b4e893ba21ba5a381f6c0054bb72f8e96df2")
  ("sml-mode" . "c33659fd9b62fab436366f731daa4339691dd6bf")
  ("sml-ts-mode" . "d2dabcc9d8f91eeee7048641e4c80fabb3583194")
- ("straight.el" . "0ad6fd8f37bd918c72989df18c76a68649f0a372")
+ ("straight.el" . "4b6289f42a4da0c1bae694ba918b43c72daf0330")
  ("svelte-mode" . "ac8fba901dc790976f9893e338c8ad1241b897c6")
  ("swift-ts-mode" . "17806f6f56f09c86c5e70af239bea4313aaaf0b8")
- ("swiper" . "2257a9d0519e18f5ce7a7fafda8a1a8e5023628e")
- ("transient" . "1d2710c7f8bba962bfbe6502d76158c2150840c1")
- ("treemacs" . "05333cc23ca4349cd839cf1c18e1eaef1f6b70ec")
+ ("swiper" . "ec9421340c88ebe08f05680e22308ed57ed68a3d")
+ ("transient" . "1e3da7f1c26aa72b2ea76883c3d139b03ceb714a")
+ ("treemacs" . "2ab5a3c89fa01bbbd99de9b8986908b2bc5a7b49")
  ("typst-ts-mode" . "7c2ef0d5bd2b5a8727fe6d00938c47ba562e0c94")
- ("with-editor" . "87a384a0e59260cca41ca8831d98e195b1ec8ada")
- ("zig-mode" . "8c1f0bd07e88a443e16e6ffd3abd1d3e76e10f35"))
+ ("with-editor" . "902b4d572af2c2f36060da01e3c33d194cdec32b")
+ ("zig-mode" . "66490933a468b5d55a90645c4c87067c508ccd04"))
 :epsilon
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 5c0a97c..1c1cac5 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -6,6 +6,8 @@ italic_font      auto
 bold_italic_font auto
 # END_KITTY_FONTS
 
+symbol_map U+23FB-U+23FF,U+2630-U+2631,U+2665-U+2666,U+26A1-U+26A2,U+276C-U+2772,U+2B58-U+2B59,U+E000-U+E00B,U+E0A0-U+E0A4,U+E0B0-U+E0D8,U+E200-U+E2AA,U+E300-U+E3E4,U+E5FA-U+E6B9,U+E700-U+E8F0,U+EA60-U+EA8D,U+EA8F-U+EACA,U+EACC-U+EC1F,U+ED00-U+EFCF,U+F000-U+F382,U+F400-U+F534,U+F0001-U+F1AF1 Symbols Nerd Font
+
 font_size         13.0
 force_ltr         yes
 disable_ligatures always
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 7845b6f..56cced6 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -34,3 +34,11 @@ source ~/.config/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 # This should be the last thing sourced in the file:
 source ~/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS+=(main brackets)
+
+if (( $+commands[direnv] )); then
+    eval "$(direnv hook zsh)"
+fi
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
diff --git a/zsh/.config/zsh/termtitle.zsh b/zsh/.config/zsh/termtitle.zsh
index 93ee9a3..53b499c 100644
--- a/zsh/.config/zsh/termtitle.zsh
+++ b/zsh/.config/zsh/termtitle.zsh
@@ -3,10 +3,16 @@ function set-titles {
     printf '\e]1;%s\a\e]2;%s\a' "$1" "$2"
 }
 
+local hostname="$(hostname)"
+
 function _precmd-title-fn {
     local abspath="${${1:a}:-$PWD}"
     local abbrev="${abspath/#$HOME/~}"
-    set-titles "$abbrev" "$abbrev"
+    local title="$abbrev"
+    if [ -n "$SSH_TTY" ]; then
+        title="$USER@$hostname:$title"
+    fi
+    set-titles "$title" "$title"
 }
 
 autoload -Uz add-zsh-hook && add-zsh-hook precmd _precmd-title-fn