diff --git a/init.el b/init.el index edb09a4..66e9c7a 100644 --- a/init.el +++ b/init.el @@ -110,7 +110,6 @@ ;; ...and finally, sync files with disk changes (global-auto-revert-mode) (diminish 'auto-revert-mode) - ) ;; lower gc threshold again diff --git a/lisp/mitch-keybinds.el b/lisp/mitch-keybinds.el index a7ce9c8..d051625 100644 --- a/lisp/mitch-keybinds.el +++ b/lisp/mitch-keybinds.el @@ -41,7 +41,9 @@ :prefix-map 'minibuffer-mode-map "DEL" 'backward-kill-word) -;; fixed? +;; (general-define-key +;; "C-x C-f" 'project-find-file +;; ) (provide 'mitch-keybinds) ;;; mitch-keybinds.el ends here diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el index 1e7e205..2c121a7 100644 --- a/lisp/mitch-packages.el +++ b/lisp/mitch-packages.el @@ -30,8 +30,8 @@ :states 'insert "C-w" 'evil-window-map "C-V" (general-key-dispatch - 'evil-quoted-insert - "u" 'insert-char)) + 'evil-quoted-insert + "u" 'insert-char)) :diminish visual-line-mode :custom (evil-want-integration t) @@ -67,36 +67,48 @@ (xterm-mouse-mode)) (use-package undo-fu :after evil - :if (< (string-to-number emacs-version) 29) + :if (< (string-to-number emacs-version) 28) :diminish) ;; 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 ;; :custom (vertico-resize t) ;; :config (vertico-mode)) ;; (use-package consult ;; :after vertico) - ;; Minibuffer generic stuff (use-package savehist :straight (:type built-in) - ;; :after vertico + :after ivy :init (savehist-mode)) (use-package marginalia - ;; :after (vertico consult) + :after ivy + :custom (marginalia-separator " ") :init (marginalia-mode)) -(use-package orderless - ;; :after vertico - ;; :config - ;; (setq completion-category-defaults nil - ;; completion-category-overrides nil) - :commands 'execute-extended-command - :custom - (completion-styles '(orderless partial-completion basic)) - (completion-category-defaults nil) - ;; (completion-category-overrides '((file (styles basic partial-completion)))) - (completion-category-overrides nil) - ) +;; (use-package orderless +;; ;; :after vertico +;; ;; :config +;; ;; (setq completion-category-defaults nil +;; ;; completion-category-overrides nil) +;; :commands 'execute-extended-command +;; :custom +;; (completion-styles '(orderless partial-completion basic)) +;; (completion-category-defaults nil) +;; ;; (completion-category-overrides '((file (styles basic partial-completion)))) +;; (completion-category-overrides nil) +;; ) (use-package linum-relative :diminish @@ -163,32 +175,38 @@ "v" 'multi-vterm-other-window)) ;; Better modeline? -;; (use-package powerline -;; :init -;; :custom -;; (powerline-default-separator 'utf-8) -;; (powerline-utf-8-separator-left 57532) -;; (powerline-utf-8-separator-right 57534) -;; (powerline-display-hud nil) -;; (powerline-gui-use-vcs-glyph t)) +(use-package powerline + :init + :custom + (powerline-default-separator 'utf-8) + (powerline-utf-8-separator-left 57532) + (powerline-utf-8-separator-right 57534) + (powerline-display-hud nil) + (powerline-gui-use-vcs-glyph t)) (use-package airline-themes :custom (airline-cursor-colors nil) (airline-display-directory t) - (airline-eshell-colors nil) + (airline-eshell-colors t) (airline-shortened-directory-length 20) - ;; :after powerline - :after doom-modeline + (airline-utf-glyph-separator-left 9585) + ;; (airline-utf-glyph-separator-left "") + (airline-utf-glyph-separator-right 9586) + ;; (airline-utf-glyph-separator-right "") + :after powerline + ;; :after doom-modeline :config - (load-theme 'airline-ravenpower t)) + (load-theme 'airline-ravenpower t) + ;; (load-theme 'airline-kolor t) + ) (use-package all-the-icons :init (unless (member "all-the-icons" (font-family-list)) (all-the-icons-install-fonts t))) -(use-package doom-modeline - :custom-face (mode-line ((t (:box "#303030")))) - :custom (doom-modeline-height 15) - :config (doom-modeline-mode)) +;; (use-package doom-modeline +;; :custom-face (mode-line ((t (:box "#303030")))) +;; :custom (doom-modeline-height 15) +;; :config (doom-modeline-mode)) ;; Custom Theme. ;; Not to be confused with a color theme, or a color scheme, or a custom scheme. @@ -204,6 +222,7 @@ ) ;; (use-package doom-themes ;; :init (load-theme 'doom-one t)) +;; (load-theme 'modus-vivendi t) ;; (use-package yascroll ;; :diminish @@ -369,13 +388,12 @@ :custom (lsp-completion-provider :none)) +(use-package yasnippet + :after lsp) ;; optionally (use-package lsp-ui :after lsp :commands lsp-ui-mode) -(use-package lsp-treemacs - :after lsp - :commands lsp-treemacs-errors-list) ;; optionally if you want to use debugger ;; (use-package dap-mode) @@ -449,16 +467,17 @@ ((t (:background "#afafaf" :extend t))))) ;; epic drop-down completion -;; (use-package company -;; :diminish -;; :custom (company-require-match nil) -;; (company-tooltip-align-annotations t) -;; :hook (prog-mode . company-mode)) -;; (use-package company-lsp -;; :after (lsp company) -;; :config -;; (push 'company-lsp company-backends)) +(use-package company + :diminish + :custom ;(company-require-match nil) + (company-tooltip-align-annotations t) + :hook (prog-mode . company-mode)) +(use-package company-lsp + :after (lsp company) + :config + (push 'company-lsp company-backends)) ;; (use-package company-fuzzy +;; :diminish ;; :hook (company-mode . company-fuzzy-mode) ;; ;; :init ;; :custom @@ -467,46 +486,46 @@ ;; (company-fuzzy-history-backends '(company-yasnippet)) ;; (company-fuzzy-trigger-symbols '("." "->" "<" "\"" "'" "@")) ;; (company-fuzzy-passthrough-backends '(company-capf))) -(use-package corfu - :custom - (completion-cycle-threshold 3) - (tab-always-indent 'complete) - (corfu-auto t) - (corfu-quit-no-match t) - (corfu-count (- (window-total-height) 10)) - ;; (corfu-separator ";") - :init (global-corfu-mode) - (defun corfu-enable-always-in-minibuffer () - "Enable Corfu in the minibuffer if Vertico/Mct are not active." - (unless (or (bound-and-true-p mct--active) - (bound-and-true-p vertico--input)) - (setq-local corfu-auto nil) ;; Enable/disable auto completion - (corfu-mode 1) - (minibuffer-complete))) - (add-hook 'minibuffer-setup-hook #'corfu-enable-always-in-minibuffer 1) - ;; (defun corfu-kill-in-minibuffer () - ;; "Kill corfu and minibuffer. To be bound to Esc." - ;; (interactive) - ;; (setq-local inhibit-debugger t) - ;; (corfu-quit) - ;; (exit-minibuffer) - ;; ) - (defun corfu-send-shell (&rest _) - "Send completion candidate when inside comint/eshell." - (cond - ((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input)) - (eshell-send-input)) - ((and (derived-mode-p 'comint-mode) (fboundp 'comint-send-input)) - (comint-send-input)))) - :general - (general-define-key - :prefix-map 'corfu-map - "C-n" 'corfu-next - "C-p" 'corfu-previous - "RET" 'corfu-insert - "ESC" 'corfu-kill-in-minibuffer - ) - ) +;; (use-package corfu +;; :custom +;; (completion-cycle-threshold 3) +;; (tab-always-indent 'complete) +;; (corfu-auto t) +;; (corfu-quit-no-match t) +;; (corfu-count (- (window-total-height) 10)) +;; ;; (corfu-separator ";") +;; :init (global-corfu-mode) +;; ;; (defun corfu-enable-always-in-minibuffer () +;; ;; "Enable Corfu in the minibuffer if Vertico/Mct are not active." +;; ;; (unless (or (bound-and-true-p mct--active) +;; ;; (bound-and-true-p vertico--input)) +;; ;; (setq-local corfu-auto nil) ;; Enable/disable auto completion +;; ;; (corfu-mode 1) +;; ;; (minibuffer-complete))) +;; ;; (add-hook 'minibuffer-setup-hook #'corfu-enable-always-in-minibuffer 1) +;; ;; (defun corfu-kill-in-minibuffer () +;; ;; "Kill corfu and minibuffer. To be bound to Esc." +;; ;; (interactive) +;; ;; (setq-local inhibit-debugger t) +;; ;; (corfu-quit) +;; ;; (exit-minibuffer) +;; ;; ) +;; (defun corfu-send-shell (&rest _) +;; "Send completion candidate when inside comint/eshell." +;; (cond +;; ((and (derived-mode-p 'eshell-mode) (fboundp 'eshell-send-input)) +;; (eshell-send-input)) +;; ((and (derived-mode-p 'comint-mode) (fboundp 'comint-send-input)) +;; (comint-send-input)))) +;; :general +;; (general-define-key +;; :prefix-map 'corfu-map +;; "C-n" 'corfu-next +;; "C-p" 'corfu-previous +;; "RET" 'corfu-insert +;; "ESC" 'corfu-kill-in-minibuffer +;; ) +;; ) (use-package popon :straight @@ -551,25 +570,26 @@ (require 'em-unix) (require 'eshell-settings)) -(use-package popper - :custom - (display-buffer-base-action '(display-buffer-pop-up-window)) - (popper-reference-buffers - '( - helpful-mode - compilation-mode - ibuffer-mode - "*Warnings")) - (popper-mode-line nil) - :init - (popper-mode +1) - (popper-echo-mode +1)) +;; (use-package popper +;; :custom +;; (display-buffer-base-action '(display-buffer-pop-up-window)) +;; (popper-reference-buffers +;; '( +;; helpful-mode +;; compilation-mode +;; ibuffer-mode +;; "*Warnings")) +;; (popper-mode-line nil) +;; :init +;; (popper-mode +1) +;; (popper-echo-mode +1)) +;; (setq display-buffer-base-action '(display-buffer-pop-up-window . nil)) (use-package ibuffer :straight (:type built-in) + :commands ibuffer :custom - (ibuffer-use-other-window t) - :commands ibuffer) + (ibuffer-use-other-window t)) (use-package xwidget ;-webkit @@ -614,10 +634,22 @@ :config (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 ;; :straight ;; (:type git :host github ;; :repo "isamert/empv.el")) +;; (use-package exwm +;; ;; :init +;; ;; (require 'exwm-config) +;; ;; (exwm-config-example) +;; ) + (provide 'mitch-packages) ;;; mitch-packages.el ends here diff --git a/lisp/mitch-theme.el b/lisp/mitch-theme.el index c168995..9f72fef 100644 --- a/lisp/mitch-theme.el +++ b/lisp/mitch-theme.el @@ -51,8 +51,8 @@ ;; (setq org-fontify-quote-and-verse-blocks t) ;; Set transparent background; might break older emacsen -(add-to-list 'initial-frame-alist '(alpha-background . 50)) -(add-to-list 'default-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 '(cursor-color . "white")) (add-to-list 'default-frame-alist '(fullscreen . maximized)) @@ -108,6 +108,8 @@ (line-number-current-line (:inherit 'line-number :foreground mitch-yellow :weight 'bold)) (linum (:inherit 'line-number)) (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-comment-face (:foreground mitch-green :slant 'oblique)) (font-lock-comment-delimiter-face (:foreground mitch-light-black))