mir/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacs stuff, lots of it

Browse Source
This commit is contained in:
MitchMarq42 2022-07-05 20:56:48 -08:00
parent d087481081
commit 260eac716a
4 changed files with 140 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.el
View File

@ -110,7 +110,6 @@
;; ...and finally, sync files with disk changes ;; ...and finally, sync files with disk changes
(global-auto-revert-mode) (global-auto-revert-mode)
(diminish 'auto-revert-mode) (diminish 'auto-revert-mode)
) )
;; lower gc threshold again ;; lower gc threshold again

4
lisp/mitch-keybinds.el
View File

@ -41,7 +41,9 @@
:prefix-map 'minibuffer-mode-map :prefix-map 'minibuffer-mode-map
"DEL" 'backward-kill-word) "DEL" 'backward-kill-word)
;; fixed? ;; (general-define-key
;; "C-x C-f" 'project-find-file
;; )
(provide 'mitch-keybinds) (provide 'mitch-keybinds)
;;; mitch-keybinds.el ends here ;;; mitch-keybinds.el ends here

234
lisp/mitch-packages.el
View File

@ -30,8 +30,8 @@
:states 'insert :states 'insert
"C-w" 'evil-window-map "C-w" 'evil-window-map
"C-V" (general-key-dispatch "C-V" (general-key-dispatch
'evil-quoted-insert 'evil-quoted-insert
"u" 'insert-char)) "u" 'insert-char))
:diminish visual-line-mode :diminish visual-line-mode
:custom :custom
(evil-want-integration t) (evil-want-integration t)
@ -67,36 +67,48 @@
(xterm-mouse-mode)) (xterm-mouse-mode))
(use-package undo-fu (use-package undo-fu
:after evil :after evil
:if (< (string-to-number emacs-version) 29) :if (< (string-to-number emacs-version) 28)
:diminish) :diminish)
;; Completion framework... ;; Completion framework...
(use-package ivy
:diminish
:custom
(ivy-auto-shrink-minibuffer-alist '((t . t)))
:config (ivy-mode t)
:general
(general-define-key
:keymaps 'ivy-minibuffer-map
"TAB" 'ivy-alt-done))
(use-package counsel
:diminish
:config (counsel-mode))
;; (use-package vertico ;; (use-package vertico
;; :custom (vertico-resize t) ;; :custom (vertico-resize t)
;; :config (vertico-mode)) ;; :config (vertico-mode))
;; (use-package consult ;; (use-package consult
;; :after vertico) ;; :after vertico)
;; Minibuffer generic stuff ;; Minibuffer generic stuff
(use-package savehist (use-package savehist
:straight (:type built-in) :straight (:type built-in)
;; :after vertico :after ivy
:init (savehist-mode)) :init (savehist-mode))
(use-package marginalia (use-package marginalia
;; :after (vertico consult) :after ivy
:custom (marginalia-separator " ")
:init (marginalia-mode)) :init (marginalia-mode))
(use-package orderless ;; (use-package orderless
;; :after vertico ;; ;; :after vertico
;; :config ;; ;; :config
;; (setq completion-category-defaults nil ;; ;; (setq completion-category-defaults nil
;; completion-category-overrides nil) ;; ;; completion-category-overrides nil)
:commands 'execute-extended-command ;; :commands 'execute-extended-command
:custom ;; :custom
(completion-styles '(orderless partial-completion basic)) ;; (completion-styles '(orderless partial-completion basic))
(completion-category-defaults nil) ;; (completion-category-defaults nil)
;; (completion-category-overrides '((file (styles basic partial-completion)))) ;; ;; (completion-category-overrides '((file (styles basic partial-completion))))
(completion-category-overrides nil) ;; (completion-category-overrides nil)
) ;; )
(use-package linum-relative (use-package linum-relative
:diminish :diminish
@ -163,32 +175,38 @@
"v" 'multi-vterm-other-window)) "v" 'multi-vterm-other-window))
;; Better modeline? ;; Better modeline?
;; (use-package powerline (use-package powerline
;; :init :init
;; :custom :custom
;; (powerline-default-separator 'utf-8) (powerline-default-separator 'utf-8)
;; (powerline-utf-8-separator-left 57532) (powerline-utf-8-separator-left 57532)
;; (powerline-utf-8-separator-right 57534) (powerline-utf-8-separator-right 57534)
;; (powerline-display-hud nil) (powerline-display-hud nil)
;; (powerline-gui-use-vcs-glyph t)) (powerline-gui-use-vcs-glyph t))
(use-package airline-themes (use-package airline-themes
:custom :custom
(airline-cursor-colors nil) (airline-cursor-colors nil)
(airline-display-directory t) (airline-display-directory t)
(airline-eshell-colors nil) (airline-eshell-colors t)
(airline-shortened-directory-length 20) (airline-shortened-directory-length 20)
;; :after powerline (airline-utf-glyph-separator-left 9585)
:after doom-modeline ;; (airline-utf-glyph-separator-left "")
(airline-utf-glyph-separator-right 9586)
;; (airline-utf-glyph-separator-right "")
:after powerline
;; :after doom-modeline
:config :config
(load-theme 'airline-ravenpower t)) (load-theme 'airline-ravenpower t)
;; (load-theme 'airline-kolor t)
)
(use-package all-the-icons (use-package all-the-icons
:init :init
(unless (member "all-the-icons" (font-family-list)) (unless (member "all-the-icons" (font-family-list))
(all-the-icons-install-fonts t))) (all-the-icons-install-fonts t)))
(use-package doom-modeline ;; (use-package doom-modeline
:custom-face (mode-line ((t (:box "#303030")))) ;; :custom-face (mode-line ((t (:box "#303030"))))
:custom (doom-modeline-height 15) ;; :custom (doom-modeline-height 15)
:config (doom-modeline-mode)) ;; :config (doom-modeline-mode))
;; Custom Theme. ;; Custom Theme.
;; Not to be confused with a color theme, or a color scheme, or a custom scheme. ;; Not to be confused with a color theme, or a color scheme, or a custom scheme.
@ -204,6 +222,7 @@
) )
;; (use-package doom-themes ;; (use-package doom-themes
;; :init (load-theme 'doom-one t)) ;; :init (load-theme 'doom-one t))
;; (load-theme 'modus-vivendi t)
;; (use-package yascroll ;; (use-package yascroll
;; :diminish ;; :diminish
@ -369,13 +388,12 @@
:custom :custom
(lsp-completion-provider :none)) (lsp-completion-provider :none))
(use-package yasnippet
:after lsp)
;; optionally ;; optionally
(use-package lsp-ui (use-package lsp-ui
:after lsp :after lsp
:commands lsp-ui-mode) :commands lsp-ui-mode)
(use-package lsp-treemacs
:after lsp
:commands lsp-treemacs-errors-list)
;; optionally if you want to use debugger ;; optionally if you want to use debugger
;; (use-package dap-mode) ;; (use-package dap-mode)
@ -449,16 +467,17 @@
((t (:background "#afafaf" :extend t))))) ((t (:background "#afafaf" :extend t)))))
;; epic drop-down completion ;; epic drop-down completion
;; (use-package company (use-package company
;; :diminish :diminish
;; :custom (company-require-match nil) :custom ;(company-require-match nil)
;; (company-tooltip-align-annotations t) (company-tooltip-align-annotations t)
;; :hook (prog-mode . company-mode)) :hook (prog-mode . company-mode))
;; (use-package company-lsp (use-package company-lsp
;; :after (lsp company) :after (lsp company)
;; :config :config
;; (push 'company-lsp company-backends)) (push 'company-lsp company-backends))
;; (use-package company-fuzzy ;; (use-package company-fuzzy
;; :diminish
;; :hook (company-mode . company-fuzzy-mode) ;; :hook (company-mode . company-fuzzy-mode)
;; ;; :init ;; ;; :init
;; :custom ;; :custom
@ -467,46 +486,46 @@
;; (company-fuzzy-history-backends '(company-yasnippet)) ;; (company-fuzzy-history-backends '(company-yasnippet))
;; (company-fuzzy-trigger-symbols '("." "->" "<" "\"" "'" "@")) ;; (company-fuzzy-trigger-symbols '("." "->" "<" "\"" "'" "@"))
;; (company-fuzzy-passthrough-backends '(company-capf))) ;; (company-fuzzy-passthrough-backends '(company-capf)))
(use-package corfu ;; (use-package corfu
:custom ;; :custom
(completion-cycle-threshold 3) ;; (completion-cycle-threshold 3)
(tab-always-indent 'complete) ;; (tab-always-indent 'complete)
(corfu-auto t) ;; (corfu-auto t)
(corfu-quit-no-match t) ;; (corfu-quit-no-match t)
(corfu-count (- (window-total-height) 10)) ;; (corfu-count (- (window-total-height) 10))
;; (corfu-separator ";") ;; ;; (corfu-separator ";")
:init (global-corfu-mode) ;; :init (global-corfu-mode)
(defun corfu-enable-always-in-minibuffer () ;; ;; (defun corfu-enable-always-in-minibuffer ()
"Enable Corfu in the minibuffer if Vertico/Mct are not active." ;; ;; "Enable Corfu in the minibuffer if Vertico/Mct are not active."
(unless (or (bound-and-true-p mct--active) ;; ;; (unless (or (bound-and-true-p mct--active)
(bound-and-true-p vertico--input)) ;; ;; (bound-and-true-p vertico--input))
(setq-local corfu-auto nil) ;; Enable/disable auto completion ;; ;; (setq-local corfu-auto nil) ;; Enable/disable auto completion
(corfu-mode 1) ;; ;; (corfu-mode 1)
(minibuffer-complete))) ;; ;; (minibuffer-complete)))
(add-hook 'minibuffer-setup-hook #'corfu-enable-always-in-minibuffer 1) ;; ;; (add-hook 'minibuffer-setup-hook #'corfu-enable-always-in-minibuffer 1)
;; (defun corfu-kill-in-minibuffer () ;; ;; (defun corfu-kill-in-minibuffer ()
;; "Kill corfu and minibuffer. To be bound to Esc." ;; ;; "Kill corfu and minibuffer. To be bound to Esc."
;; (interactive) ;; ;; (interactive)
;; (setq-local inhibit-debugger t) ;; ;; (setq-local inhibit-debugger t)
;; (corfu-quit) ;; ;; (corfu-quit)
;; (exit-minibuffer) ;; ;; (exit-minibuffer)
;; ) ;; ;; )
(defun corfu-send-shell (&rest _) ;; (defun corfu-send-shell (&rest _)
"Send completion candidate when inside comint/eshell." ;; "Send completion candidate when inside comint/eshell."
(cond ;; (cond
((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input)) ;; ((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input))
(eshell-send-input)) ;; (eshell-send-input))
((and (derived-mode-p 'comint-mode) (fboundp 'comint-send-input)) ;; ((and (derived-mode-p 'comint-mode) (fboundp 'comint-send-input))
(comint-send-input)))) ;; (comint-send-input))))
:general ;; :general
(general-define-key ;; (general-define-key
:prefix-map 'corfu-map ;; :prefix-map 'corfu-map
"C-n" 'corfu-next ;; "C-n" 'corfu-next
"C-p" 'corfu-previous ;; "C-p" 'corfu-previous
"RET" 'corfu-insert ;; "RET" 'corfu-insert
"ESC" 'corfu-kill-in-minibuffer ;; "ESC" 'corfu-kill-in-minibuffer
) ;; )
) ;; )
(use-package popon (use-package popon
:straight :straight
@ -551,25 +570,26 @@
(require 'em-unix) (require 'em-unix)
(require 'eshell-settings)) (require 'eshell-settings))
(use-package popper ;; (use-package popper
:custom ;; :custom
(display-buffer-base-action '(display-buffer-pop-up-window)) ;; (display-buffer-base-action '(display-buffer-pop-up-window))
(popper-reference-buffers ;; (popper-reference-buffers
'( ;; '(
helpful-mode ;; helpful-mode
compilation-mode ;; compilation-mode
ibuffer-mode ;; ibuffer-mode
"*Warnings")) ;; "*Warnings"))
(popper-mode-line nil) ;; (popper-mode-line nil)
:init ;; :init
(popper-mode +1) ;; (popper-mode +1)
(popper-echo-mode +1)) ;; (popper-echo-mode +1))
;; (setq display-buffer-base-action '(display-buffer-pop-up-window . nil))
(use-package ibuffer (use-package ibuffer
:straight (:type built-in) :straight (:type built-in)
:commands ibuffer
:custom :custom
(ibuffer-use-other-window t) (ibuffer-use-other-window t))
:commands ibuffer)
(use-package xwidget ;-webkit (use-package xwidget ;-webkit
@ -614,10 +634,22 @@
:config :config
(add-hook 'Info-mode-hook #'info-variable-pitch-mode)) (add-hook 'Info-mode-hook #'info-variable-pitch-mode))
(use-package image-mode
:straight (:type built-in)
:config
(turn-off-line-numbers)
(blink-cursor-mode -1))
;; (use-package empv ;; (use-package empv
;; :straight ;; :straight
;; (:type git :host github ;; (:type git :host github
;; :repo "isamert/empv.el")) ;; :repo "isamert/empv.el"))
;; (use-package exwm
;; ;; :init
;; ;; (require 'exwm-config)
;; ;; (exwm-config-example)
;; )
(provide 'mitch-packages) (provide 'mitch-packages)
;;; mitch-packages.el ends here ;;; mitch-packages.el ends here

6
lisp/mitch-theme.el
View File

@ -51,8 +51,8 @@
;; (setq org-fontify-quote-and-verse-blocks t) ;; (setq org-fontify-quote-and-verse-blocks t)
;; Set transparent background; might break older emacsen ;; Set transparent background; might break older emacsen
(add-to-list 'initial-frame-alist '(alpha-background . 50)) ;; (add-to-list 'initial-frame-alist '(alpha-background . 50))
(add-to-list 'default-frame-alist '(alpha-background . 50)) ;; (add-to-list 'default-frame-alist '(alpha-background . 50))
(add-to-list 'default-frame-alist '(cursor-color . "white")) (add-to-list 'default-frame-alist '(cursor-color . "white"))
(add-to-list 'default-frame-alist '(fullscreen . maximized)) (add-to-list 'default-frame-alist '(fullscreen . maximized))
@ -108,6 +108,8 @@
(line-number-current-line (:inherit 'line-number :foreground mitch-yellow :weight 'bold)) (line-number-current-line (:inherit 'line-number :foreground mitch-yellow :weight 'bold))
(linum (:inherit 'line-number)) (linum (:inherit 'line-number))
(linum-relative-current-face (:inherit 'line-number-current-line)) (linum-relative-current-face (:inherit 'line-number-current-line))
(ivy-current-match (:inherit 'highlight))
(ivy-separator (:inherit 'marginalia-documentation))
;; font-lock faces. The defaults that are important to get right. ;; font-lock faces. The defaults that are important to get right.
(font-lock-comment-face (:foreground mitch-green :slant 'oblique)) (font-lock-comment-face (:foreground mitch-green :slant 'oblique))
(font-lock-comment-delimiter-face (:foreground mitch-light-black)) (font-lock-comment-delimiter-face (:foreground mitch-light-black))