Remove all legacy, add more language support, flyover for flymake
This commit is contained in:
parent
7941729efc
commit
3ff83a09cc
|
|
@ -4,6 +4,7 @@ history
|
||||||
ido.last
|
ido.last
|
||||||
recentf
|
recentf
|
||||||
eln-cache/
|
eln-cache/
|
||||||
|
elpa/
|
||||||
tree-sitter/
|
tree-sitter/
|
||||||
tutorial/
|
tutorial/
|
||||||
auto-save-list/
|
auto-save-list/
|
||||||
|
|
|
||||||
82
init.el
82
init.el
|
|
@ -4,7 +4,7 @@
|
||||||
(column-number-mode 1)
|
(column-number-mode 1)
|
||||||
|
|
||||||
;; Set custom tab width here
|
;; Set custom tab width here
|
||||||
(setq custom-tab-width 8)
|
(defvar custom-tab-width 8)
|
||||||
|
|
||||||
;; Temporary file config
|
;; Temporary file config
|
||||||
(setq backup-directory-alist
|
(setq backup-directory-alist
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
;; Fixes to stop weird window geometry issues
|
;; Fixes to stop weird window geometry issues
|
||||||
(setq frame-inhibit-implied-resize t)
|
(setq frame-inhibit-implied-resize t)
|
||||||
(setq frame-resize-pixelwise t)
|
(setq frame-resize-pixelwise t)
|
||||||
|
|
||||||
;; Ensure that tabs are default over spaces
|
;; Ensure that tabs are default over spaces
|
||||||
(setq-default tab-width custom-tab-width)
|
(setq-default tab-width custom-tab-width)
|
||||||
|
|
@ -62,39 +62,11 @@
|
||||||
;; Track recently opened files
|
;; Track recently opened files
|
||||||
(recentf-mode 1)
|
(recentf-mode 1)
|
||||||
|
|
||||||
;; Ido Config
|
|
||||||
(setq ido-everywhere 1)
|
|
||||||
(setq ido-use-virtual-buffers t)
|
|
||||||
(setq ido-enable-flex-matching t)
|
|
||||||
;;(ido-mode 1)
|
|
||||||
; Custom ido keybindings
|
|
||||||
(add-hook 'ido-setup-hook
|
|
||||||
'(lambda ()
|
|
||||||
(define-key ido-completion-map (kbd "<up>") 'ido-prev-match)
|
|
||||||
(define-key ido-completion-map (kbd "<down>") 'ido-next-match)
|
|
||||||
|
|
||||||
(define-key ido-completion-map (kbd "C-p") 'ido-prev-match)
|
|
||||||
(define-key ido-completion-map (kbd "C-n") 'ido-next-match)
|
|
||||||
|
|
||||||
(define-key ido-completion-map (kbd "C-k") 'ido-prev-match)
|
|
||||||
(define-key ido-completion-map (kbd "C-j") 'ido-next-match)
|
|
||||||
))
|
|
||||||
|
|
||||||
;; Ido Occur - OG Swiper
|
|
||||||
;(load (expand-file-name (concat user-emacs-directory "plugins/ido-occur.el")))
|
|
||||||
;(define-key global-map [remap isearch-forward] 'ido-occur)
|
|
||||||
|
|
||||||
;; Stop weird C-9 keybindings causing conflicts on typo
|
;; Stop weird C-9 keybindings causing conflicts on typo
|
||||||
(define-key global-map [remap digit-argument] "")
|
(define-key global-map [remap digit-argument] "")
|
||||||
|
|
||||||
;; Package management setup
|
;; Package management setup
|
||||||
(require 'package)
|
; straight.el
|
||||||
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
|
|
||||||
; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities`
|
|
||||||
; and `package-pinned-packages`. Most users will not need or want to do this.
|
|
||||||
;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
|
|
||||||
(package-initialize)
|
|
||||||
;; Straight.el
|
|
||||||
(defvar bootstrap-version)
|
(defvar bootstrap-version)
|
||||||
(let
|
(let
|
||||||
((bootstrap-file
|
((bootstrap-file
|
||||||
|
|
@ -340,6 +312,7 @@
|
||||||
|
|
||||||
;; Treesit Config
|
;; Treesit Config
|
||||||
(use-package treesit
|
(use-package treesit
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:commands (treesit-install-language-grammar nf/treesit-install-all-languages)
|
:commands (treesit-install-language-grammar nf/treesit-install-all-languages)
|
||||||
:init
|
:init
|
||||||
|
|
@ -379,25 +352,43 @@
|
||||||
)
|
)
|
||||||
(setq treesit-font-lock-level 4)
|
(setq treesit-font-lock-level 4)
|
||||||
; Remap basic modes to treesit equivalent
|
; Remap basic modes to treesit equivalent
|
||||||
|
(use-package bash-ts-mode
|
||||||
|
:ensure nil
|
||||||
|
:straight nil
|
||||||
|
:mode "\\.sh\\'")
|
||||||
|
(use-package c-ts-mode
|
||||||
|
:ensure nil
|
||||||
|
:straight nil
|
||||||
|
:mode "\\.c\\'")
|
||||||
(use-package rust-ts-mode
|
(use-package rust-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.rs\\'")
|
:mode "\\.rs\\'")
|
||||||
|
(use-package swift-ts-mode
|
||||||
|
:ensure t
|
||||||
|
:mode "\\.swift\\'")
|
||||||
(use-package nix-ts-mode
|
(use-package nix-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.nix\\'")
|
:mode "\\.nix\\'")
|
||||||
(use-package html-ts-mode
|
(use-package html-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.html\\'")
|
:mode "\\.html\\'")
|
||||||
(use-package css-ts-mode
|
(use-package css-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.css\\'")
|
:mode "\\.css\\'")
|
||||||
(use-package js-ts-mode
|
(use-package js-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.js\\'")
|
:mode "\\.js\\'")
|
||||||
(use-package typescript-ts-mode
|
(use-package typescript-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.ts\\'")
|
:mode "\\.ts\\'")
|
||||||
(use-package tsx-ts-mode
|
(use-package tsx-ts-mode
|
||||||
|
:ensure nil
|
||||||
:straight nil
|
:straight nil
|
||||||
:mode "\\.tsx\\'")
|
:mode "\\.tsx\\'")
|
||||||
;(use-package emacs-lisp-ts-mode
|
;(use-package emacs-lisp-ts-mode
|
||||||
|
|
@ -436,11 +427,38 @@
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(setq-local rust-ts-mode-indent-offset custom-tab-width)))
|
(setq-local rust-ts-mode-indent-offset custom-tab-width)))
|
||||||
|
|
||||||
|
;; Flymake Configuration
|
||||||
|
(use-package flymake
|
||||||
|
:ensure nil
|
||||||
|
:straight nil
|
||||||
|
:hook
|
||||||
|
(prog-mode . flymake-mode)
|
||||||
|
(emacs-lisp-mode . flymake-mode)
|
||||||
|
)
|
||||||
|
; Flyover for nice in buffer flymake error/warning messages.
|
||||||
|
(use-package flyover
|
||||||
|
:ensure t
|
||||||
|
:hook
|
||||||
|
(flymake-mode . flyover-mode)
|
||||||
|
:custom
|
||||||
|
;; Checker settings
|
||||||
|
(flyover-checkers '(flymake))
|
||||||
|
|
||||||
|
;; Display mode (controls cursor-based visibility)
|
||||||
|
(flyover-display-mode 'show-only-on-same-line)
|
||||||
|
|
||||||
|
;; Completion integration
|
||||||
|
(flyover-hide-during-completion t)
|
||||||
|
)
|
||||||
|
|
||||||
;; LSP Configuration
|
;; LSP Configuration
|
||||||
(use-package eglot
|
(use-package eglot
|
||||||
:hook
|
:hook
|
||||||
(((
|
(((
|
||||||
prog-mode
|
bash-ts-mode
|
||||||
|
c-ts-mode
|
||||||
|
rust-ts-mode
|
||||||
|
swift-ts-mode
|
||||||
nix-ts-mode
|
nix-ts-mode
|
||||||
html-ts-mode
|
html-ts-mode
|
||||||
css-ts-mode
|
css-ts-mode
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue