mirror of
https://github.com/materusPL/nixos-config
synced 2025-06-18 14:36:14 +02:00
update
This commit is contained in:
parent
398673494c
commit
bdafe0624a
@ -26,7 +26,6 @@
|
|||||||
- [[#highlight-indent-guides][Highlight Indent Guides]]
|
- [[#highlight-indent-guides][Highlight Indent Guides]]
|
||||||
- [[#outli][Outli]]
|
- [[#outli][Outli]]
|
||||||
- [[#visual-replace][Visual Replace]]
|
- [[#visual-replace][Visual Replace]]
|
||||||
- [[#folding][Folding]]
|
|
||||||
- [[#terminal][Terminal]]
|
- [[#terminal][Terminal]]
|
||||||
- [[#eat][Eat]]
|
- [[#eat][Eat]]
|
||||||
- [[#vterm][Vterm]]
|
- [[#vterm][Vterm]]
|
||||||
@ -289,6 +288,8 @@
|
|||||||
(global-completion-preview-mode 1)
|
(global-completion-preview-mode 1)
|
||||||
(electric-pair-mode 1)
|
(electric-pair-mode 1)
|
||||||
(electric-indent-mode -1)
|
(electric-indent-mode -1)
|
||||||
|
|
||||||
|
(setq isearch-allow-scroll t) ; Allows scrolling without closing isearch
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Frame
|
** Frame
|
||||||
@ -424,15 +425,6 @@ Setting up mouse
|
|||||||
:map isearch-mode-map
|
:map isearch-mode-map
|
||||||
("C-r" . visual-replace-from-isearch)))
|
("C-r" . visual-replace-from-isearch)))
|
||||||
#+end_src
|
#+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
|
** Terminal
|
||||||
*** Eat
|
*** Eat
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
@ -587,7 +579,8 @@ Hideshowvis
|
|||||||
collapse
|
collapse
|
||||||
git-msg
|
git-msg
|
||||||
file-time
|
file-time
|
||||||
file-size)))
|
file-size))
|
||||||
|
)
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
*** Treemacs
|
*** Treemacs
|
||||||
@ -674,7 +667,7 @@ Hideshowvis
|
|||||||
(use-package lsp-treemacs
|
(use-package lsp-treemacs
|
||||||
:after (lsp-mode treemacs)
|
:after (lsp-mode treemacs)
|
||||||
:config
|
:config
|
||||||
(lsp-treemacs-sync-mode 1))
|
(lsp-treemacs-sync-mode 0))
|
||||||
|
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
@ -742,12 +735,16 @@ Hideshowvis
|
|||||||
:config
|
:config
|
||||||
(setq lsp-java-vmargs '("-XX:+UseParallelGC" "-XX:GCTimeRatio=4" "-XX:AdaptiveSizePolicyWeight=90" "-Dsun.zip.disableMemoryMapping=true" "-Xmx4G" "-Xms512m"))
|
(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 (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 #'lsp)
|
||||||
(add-hook 'java-mode-hook 'display-line-numbers-mode)
|
(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 (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 #'lsp)
|
||||||
(add-hook 'java-ts-mode-hook 'display-line-numbers-mode)
|
(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))
|
(when (treesit-language-available-p 'java) (push '(java-mode . java-ts-mode) major-mode-remap-alist))
|
||||||
|
|
||||||
@ -770,7 +767,7 @@ Hideshowvis
|
|||||||
(use-package nix-mode)
|
(use-package nix-mode)
|
||||||
(use-package nix-ts-mode)
|
(use-package nix-ts-mode)
|
||||||
(use-package lsp-nix
|
(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
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
(add-to-list 'lsp-disabled-clients '(nix-mode . nix-nil))
|
(add-to-list 'lsp-disabled-clients '(nix-mode . nix-nil))
|
||||||
@ -784,11 +781,9 @@ Hideshowvis
|
|||||||
(setq lsp-nix-nixd-nixpkgs-expr (concat "(builtins.getFlake \"/etc/nixos\").nixosConfigurations." (system-name) ".pkgs")))
|
(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 'lsp-deferred)
|
||||||
(add-hook 'nix-mode-hook 'display-line-numbers-mode)
|
(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 'lsp-deferred)
|
||||||
(add-hook 'nix-ts-mode-hook 'display-line-numbers-mode)
|
(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)))
|
(when (treesit-language-available-p 'nix) (push '(nix-mode . nix-ts-mode) major-mode-remap-alist)))
|
||||||
#+end_src
|
#+end_src
|
||||||
@ -802,7 +797,7 @@ Hideshowvis
|
|||||||
#+end_src
|
#+end_src
|
||||||
**** Common Lisp
|
**** Common Lisp
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
(use-package slime
|
(use-package sly
|
||||||
:if (executable-find "sbcl")
|
:if (executable-find "sbcl")
|
||||||
:config
|
:config
|
||||||
(setq inferior-lisp-program "sbcl"))
|
(setq inferior-lisp-program "sbcl"))
|
||||||
@ -908,12 +903,6 @@ Hideshowvis
|
|||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
(use-package orglink
|
|
||||||
:after (org))
|
|
||||||
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
** Other & Misc
|
** Other & Misc
|
||||||
*** Undo-tree
|
*** Undo-tree
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user