update

config/emacs/EMACS-CONFIG.org

@@ -11,6 +11,7 @@
 - [[#init-core][Init Core]]
   - [[#prepare][Prepare]]
   - [[#elpaca][Elpaca]]
+  - [[#variables][Variables]]
   - [[#functions][Functions]]
   - [[#custom-file][Custom File]]
   - [[#font--text][Font & Text]]
@@ -26,7 +27,6 @@
     - [[#highlight-indent-guides][Highlight Indent Guides]]
     - [[#outli][Outli]]
     - [[#visual-replace][Visual Replace]]
-    - [[#folding][Folding]]
   - [[#terminal][Terminal]]
     - [[#eat][Eat]]
     - [[#vterm][Vterm]]
@@ -173,14 +173,13 @@
 :END:
 ** Prepare
 #+begin_src emacs-lisp :noweb-ref init
-;; Prepare
+  ;; Prepare
   (require 'materus-nix nil t)
   (require 'elec-pair)
   (when (not emacs-build-time)
     (print "WARN: emacs-build-time not set up, using current time")
     (setq emacs-build-time (decode-time (current-time))))
-  (add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages
-  (defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))  
+  (add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages  
   (setq read-process-output-max (* 1024 1024 3))
 
 #+END_src
@@ -231,6 +230,16 @@
     (setq elpaca-use-package-by-default t))
 
 #+END_src
+** Variables
+#+begin_src emacs-lisp :noweb-ref init-variables
+  (defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
+  (defvar materus/server-env nil)
+  (defvar materus/pkgs/vterm-enable nil)
+
+  (let ((vars-file (expand-file-name "etc/variables.el" user-emacs-directory)))
+    (unless (file-exists-p vars-file) (make-empty-file vars-file))
+    (load vars-file))
+#+end_src
 ** Functions
 #+begin_src emacs-lisp :noweb-ref init-functions
   ;; Use package preffering built-in / nix packages
@@ -289,6 +298,8 @@
   (global-completion-preview-mode 1)
   (electric-pair-mode 1)
   (electric-indent-mode -1)
+
+  (setq isearch-allow-scroll t) ; Allows scrolling without closing isearch
 #+end_src
 
 ** Frame
@@ -424,15 +435,6 @@ Setting up mouse
            :map isearch-mode-map
            ("C-r" . visual-replace-from-isearch)))
 #+end_src
-*** Folding
-Treesit-fold
-#+begin_src emacs-lisp
-  (use-package treesit-fold)
-#+end_src
-Hideshowvis
-#+begin_src emacs-lisp
-  (use-package hideshowvis)
-#+end_src
 ** Terminal
 *** Eat
 #+begin_src emacs-lisp
@@ -467,7 +469,8 @@ Hideshowvis
 #+end_src
 *** Vterm
 #+begin_src emacs-lisp
-(materus/use-package vterm)
+(when (or materus/pkgs/vterm-enable (locate-library (symbol-name 'vterm)))
+(materus/use-package vterm))
 #+end_src
 ** Navigation and Completion
 *** minibuffer (orderless, vertico, marginalia, consult)
@@ -577,17 +580,18 @@ Hideshowvis
 #+begin_src emacs-lisp
   (use-package dirvish
     :after (nerd-icons)
-   :config
-   (setq dired-mouse-drag-files t)
-   (dirvish-override-dired-mode 1)
-   (setq dirvish-attributes
-         '(vc-state
-           subtree-state
-           nerd-icons
-           collapse
-           git-msg
-           file-time 
-           file-size)))
+    :config
+    (setq dired-mouse-drag-files t)
+    (dirvish-override-dired-mode 1)
+    (setq dirvish-attributes
+          '(vc-state
+            subtree-state
+            nerd-icons
+            collapse
+            git-msg
+            file-time 
+            file-size))
+    )
 
 #+end_src
 *** Treemacs
@@ -674,7 +678,7 @@ Hideshowvis
   (use-package lsp-treemacs
     :after (lsp-mode treemacs)
     :config
-    (lsp-treemacs-sync-mode 1))
+    (lsp-treemacs-sync-mode 0))
 
 
 #+end_src
@@ -742,12 +746,16 @@ Hideshowvis
     :config
     (setq lsp-java-vmargs '("-XX:+UseParallelGC" "-XX:GCTimeRatio=4" "-XX:AdaptiveSizePolicyWeight=90" "-Dsun.zip.disableMemoryMapping=true" "-Xmx4G" "-Xms512m"))
     ;;(add-hook 'java-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-    (add-hook 'java-mode-hook 'lsp-deferred)
-    (add-hook 'java-mode-hook 'display-line-numbers-mode)
+    (add-hook 'java-mode-hook #'lsp)
+    (add-hook 'java-mode-hook #'display-line-numbers-mode)
+    (add-hook 'java-mode-hook #'lsp-lens-mode)
+    (add-hook 'java-mode-hook #'lsp-java-boot-lens-mode)
 
     ;;(add-hook 'java-ts-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-    (add-hook 'java-ts-mode-hook 'lsp-deferred)
-    (add-hook 'java-ts-mode-hook 'display-line-numbers-mode)
+    (add-hook 'java-ts-mode-hook #'lsp)
+    (add-hook 'java-ts-mode-hook #'display-line-numbers-mode)
+    (add-hook 'java-ts-mode-hook #'lsp-lens-mode)
+    (add-hook 'java-ts-mode-hook #'lsp-java-boot-lens-mode)
 
     (when (treesit-language-available-p 'java) (push '(java-mode . java-ts-mode) major-mode-remap-alist))
 
@@ -770,7 +778,7 @@ Hideshowvis
   (use-package nix-mode)
   (use-package nix-ts-mode)
   (use-package lsp-nix
-    :after (lsp-mode nix-mode nix-ts-mode format-all orglink)
+    :after (lsp-mode nix-mode nix-ts-mode format-all)
     :ensure nil
     :config
     (add-to-list 'lsp-disabled-clients '(nix-mode . nix-nil)) 
@@ -784,11 +792,9 @@ Hideshowvis
       (setq lsp-nix-nixd-nixpkgs-expr (concat "(builtins.getFlake \"/etc/nixos\").nixosConfigurations." (system-name) ".pkgs")))
     (add-hook 'nix-mode-hook 'lsp-deferred)
     (add-hook 'nix-mode-hook 'display-line-numbers-mode)
-    (add-hook 'nix-mode-hook 'orglink-mode)
 
     (add-hook 'nix-ts-mode-hook 'lsp-deferred)
     (add-hook 'nix-ts-mode-hook 'display-line-numbers-mode)
-    (add-hook 'nix-ts-mode-hook 'orglink-mode)
 
     (when (treesit-language-available-p 'nix) (push '(nix-mode . nix-ts-mode) major-mode-remap-alist)))
 #+end_src
@@ -802,7 +808,7 @@ Hideshowvis
 #+end_src
 **** Common Lisp
 #+begin_src emacs-lisp
-  (use-package slime
+  (use-package sly
     :if (executable-find "sbcl")
     :config
     (setq inferior-lisp-program "sbcl"))
@@ -908,12 +914,6 @@ Hideshowvis
 
 #+end_src
 
-#+begin_src emacs-lisp
-  (use-package orglink
-    :after (org))
-
-#+end_src
-
 ** Other & Misc
 *** Undo-tree
 #+begin_src emacs-lisp
@@ -952,14 +952,16 @@ Hideshowvis
 #+end_src
 *** Elcord
 #+begin_src emacs-lisp
-  (defun materus/elcord-toggle (&optional _frame)
-    "Toggle elcord based on visible frames"
-    (if (> (length (frame-list)) 1)
-        (elcord-mode 1)
-      (elcord-mode -1))
-    )
+
   (use-package elcord
+    :if (not materus/server-env)
     :config
+    (defun materus/elcord-toggle (&optional _frame)
+      "Toggle elcord based on visible frames"
+      (if (> (length (frame-list)) 1)
+          (elcord-mode 1)
+        (elcord-mode -1))
+      )
     (unless (daemonp) (elcord-mode 1))
     (add-hook 'after-delete-frame-functions 'materus/elcord-toggle)
     (add-hook 'server-after-make-frame-hook 'materus/elcord-toggle))
@@ -1067,6 +1069,7 @@ Hideshowvis
   ;;; -*- lexical-binding: t; -*-
   <<init>>
   <<init-elpaca>>
+  <<init-variables>>
   <<init-functions>>
   <<package-no-littering>>
   <<init-extra>>