From b10acede862880c2470f1e2435b8c896aac0ddd9 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Tue, 28 Oct 2025 12:14:01 +0200 Subject: [PATCH] Configure treemacs --- early-init.el | 4 ++++ lisp/icejam-aider.el | 8 ++++---- lisp/icejam-base.el | 3 ++- lisp/icejam-custom-init.el | 2 +- lisp/langs/icejam-lang-rust.el | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/early-init.el b/early-init.el index afe7e9a..df7042d 100644 --- a/early-init.el +++ b/early-init.el @@ -26,4 +26,8 @@ (time-subtract after-init-time before-init-time))) gcs-done))) +;; set path for native compilation to work +(setenv "PATH" "/Users/maciej/.local/share/zinit/polaris/bin:/Users/maciej/.asdf/shims:/Users/maciej/.local/bin:/Users/maciej/.opam/default/bin:/Users/maciej/.go/bin:/Users/maciej/.elan/bin:/opt/homebrew/opt/postgresql@17/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/usr/local/MacGPG2/bin:/usr/local/share/dotnet:/Users/maciej/.dotnet/tools:/Applications/Postgres.app/Contents/Versions/latest/bin:/Applications/kitty.app/Contents/MacOS") +(setq exec-path (split-string (getenv "PATH") path-separator)) + ;;; early-init.el ends here diff --git a/lisp/icejam-aider.el b/lisp/icejam-aider.el index fcb8a36..596543e 100644 --- a/lisp/icejam-aider.el +++ b/lisp/icejam-aider.el @@ -1,4 +1,4 @@ -;;; icejam-aider.el --- summary +;;; icejam-aider.el --- summary -*- lexical-binding: t; -*- ;; Author: Maciej Szlosarczyk ;; Maintainer: Maciej Szlosarczyk @@ -56,10 +56,10 @@ :config ;; (setenv "OLLAMA_API_BASE" "http://127.0.0.1:11434") (setenv "OLLAMA_API_BASE" "http://192.168.88.13:11434") - (setopt aidermacs-use-architect-mode t) - (setopt aidermacs-default-model "ollama_chat/qwen2.5-coder:32b") + (setopt aidermacs-default-chat-mode 'architect) + (setopt aidermacs-default-model "ollama_chat/qwen3-coder:30b") (setopt aider-extra-args (list "--model" - "ollama_chat/qwen2.5-coder:32b" + "ollama_chat/qwen3-coder:30b" "--no-auto-commits" "--no-analytics" "--no-gitignore"))) diff --git a/lisp/icejam-base.el b/lisp/icejam-base.el index 4490d66..13de97f 100644 --- a/lisp/icejam-base.el +++ b/lisp/icejam-base.el @@ -135,7 +135,8 @@ (elpaca-after-init . treemacs-project-follow-mode)) :commands (treemacs-follow-mode treemacs-project-follow-mode treemacs) :bind (:map icejam-keys-mode-map - ([(hyper b)] . treemacs))) + ([(hyper b)] . treemacs)) + :config (setopt treemacs-tag-follow-delay 1.0)) (use-package treemacs-all-the-icons :ensure t :defer t :requires (treemacs) diff --git a/lisp/icejam-custom-init.el b/lisp/icejam-custom-init.el index fec2c94..c420cd7 100644 --- a/lisp/icejam-custom-init.el +++ b/lisp/icejam-custom-init.el @@ -128,7 +128,7 @@ (use-package icejam-lang-haskell :ensure nil) (use-package icejam-lang-javascript :ensure nil) (use-package icejam-lang-kotlin :ensure nil) -(use-package icejam-lang-lean :ensure nil) +;; (use-package icejam-lang-lean :ensure nil) (use-package icejam-lang-lua :ensure nil) (use-package icejam-lang-markdown :ensure nil) (use-package icejam-lang-ocaml :ensure nil) diff --git a/lisp/langs/icejam-lang-rust.el b/lisp/langs/icejam-lang-rust.el index 93f3705..e6e161b 100644 --- a/lisp/langs/icejam-lang-rust.el +++ b/lisp/langs/icejam-lang-rust.el @@ -15,7 +15,8 @@ :ensure t :defer t :after (rust-mode) - :config (setopt rustic-format-on-save nil)) + :config (setopt rustic-format-on-save nil) + (setopt rustic-lsp-client 'eglot)) (use-package flycheck-rust :ensure t