From 9735cd444aa96d43c99e77165d09ee0ae114579c Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 11 Nov 2024 02:45:59 -0500 Subject: much better config --- .config/emacs/TODO.org | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .config/emacs/TODO.org (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org new file mode 100644 index 0000000..284e80d --- /dev/null +++ b/.config/emacs/TODO.org @@ -0,0 +1,5 @@ +- [ ] Go through old.org +- [ ] go through emacs from scratch +- [ ] better search +- [ ] Org tangling +- [ ] project management -- cgit v1.2.3 From 5cc6cf651a034319b40455501b87be169dc133aa Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 11 Nov 2024 03:55:28 -0500 Subject: development improvements --- .config/emacs/TODO.org | 7 ++-- .config/emacs/init.el | 101 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 102 insertions(+), 6 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 284e80d..9759952 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,5 +1,6 @@ -- [ ] Go through old.org -- [ ] go through emacs from scratch +- [ ] development - [ ] better search -- [ ] Org tangling - [ ] project management +- [ ] Org tangling +- [ ] splash screen +- [ ] dap mode diff --git a/.config/emacs/init.el b/.config/emacs/init.el index ca7ab1b..ccf3422 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -133,6 +133,13 @@ (diminish 'isearch-mode) (diminish 'abbrev-mode) +(use-package helpful + :bind + ([remap describe-command] . helpful-command) + ([remap describe-function] . helpful-callable) + ([remap describe-variable] . helpful-variable) + ([remap describe-key] . helpful-key)) + ;; interface packages ;; - vertico and completion (use-package vertico @@ -194,12 +201,42 @@ (use-package all-the-icons-dired :hook (dired-mode . all-the-icons-dired-mode)) +(use-package emojify + :hook (after-init . global-emojify-mode) + :config + (add-hook 'prog-mode-hook #'(lambda () (emojify-mode -1)))) + ;; text editing packages (use-package rainbow-delimiters :diminish rainbow-delimiters-mode :hook (prog-mode . rainbow-delimiters-mode)) +(use-package highlight-quoted + :diminish highlight-quoted-mode + :hook (emacs-lisp-mode . highlight-quoted-mode)) + +;; - flyspell +(use-package flyspell + :ensure nil + ;; :diminish flyspell-mode + ) + +(use-package flyspell-correct + :after flyspell) + +(use-package consult-flyspell + :ensure (consult-flyspell :host gitlab :repo "OlMon/consult-flyspell" :branch "master") + :config + ;; default settings + (setq consult-flyspell-select-function (lambda () (flyspell-correct-at-point) (consult-flyspell)) + consult-flyspell-set-point-after-word t + consult-flyspell-always-check-buffer nil)) + +(add-hook 'text-mode-hook 'flyspell-mode) +(add-hook 'prog-mode-hook 'flyspell-prog-mode) + ;; directory changes and packages + (recentf-mode 1) (use-package no-littering @@ -225,10 +262,20 @@ (setf dired-kill-when-opening-new-dired-buffer t) -(use-package dired-open +;; -- undo tree +(use-package undo-tree + :diminish undo-tree-mode :config - ;; Doesn't work as expected! - (add-to-list 'dired-open-functions #'dired-open-xdg t) + (global-undo-tree-mode) + (add-hook 'authinfo-mode-hook #'(lambda () (setq-local undo-tree-auto-save-history nil))) + (defvar --undo-history-directory (concat user-emacs-directory "undotreefiles/") + "Directory to save undo history files.") + (unless (file-exists-p --undo-history-directory) + (make-directory --undo-history-directory t)) + ;; stop littering with *.~undo-tree~ files everywhere + (setq undo-tree-history-directory-alist `(("." . ,--undo-history-directory)))) +(global-set-key (kbd "C-/") #'undo-tree-undo) +(global-set-key (kbd "M-/") #'undo-tree-redo) ;; - embark (use-package embark @@ -256,8 +303,56 @@ ;; - projectile +;; - tree sitter +(use-package tree-sitter + :diminish tree-sitter-mode + :config + (global-tree-sitter-mode 1)) +(use-package tree-sitter-langs) + +;; - LSP mode + +(use-package lsp-mode + :commands (lsp lsp-deferred) + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable t + lsp-headerline-breadcrumb-icons-enable t + lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols)) + (lsp-headerline-breadcrumb-mode) + :config + (lsp-enable-which-key-integration t)) + +(use-package lsp-ui + :hook (lsp-mode . lsp-ui-mode)) +(setq lsp-ui-doc-position 'bottom) + +(use-package consult-lsp + :after lsp) + +(use-package lsp-treemacs + :after lsp) + +;; - misc +(use-package evil-nerd-commenter + :bind ("M-;" . evilnc-comment-or-uncomment-lines)) ;; keybinds (global-unset-key (kbd "C-z")) (global-set-key (kbd "") #'keyboard-escape-quit) + +(use-package move-text) +(global-set-key (kbd "M-p") #'move-text-up) +(global-set-key (kbd "M-n") #'move-text-down) + +(use-package expand-region) +(global-set-key (kbd "C-=") 'er/expand-region) + +(use-package multiple-cursors + :bind (:map global-map + ("C->" . 'mc/mark-next-like-this) + ("C-<" . 'mc/mark-previous-like-this) + ("C-c C->" . 'mc/mark-all-like-this) + :map mc/keymap + ("" . nil))) -- cgit v1.2.3 From bba1c74acff827d6b5db680f1dddeba0c1a9113f Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 11 Nov 2024 13:42:41 -0500 Subject: did things --- .config/emacs/TODO.org | 4 +++- .config/emacs/init.el | 2 +- .config/mpd/mpd.pid | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 9759952..532a4e8 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,4 +1,6 @@ -- [ ] development +- [ ] development (lsp for elisp, c++, typescript, html tags) +- [ ] corfu completion +- [ ] lsp peeking, finding definitions, all that bs - [ ] better search - [ ] project management - [ ] Org tangling diff --git a/.config/emacs/init.el b/.config/emacs/init.el index ccf3422..0df35cf 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -168,7 +168,7 @@ :init (which-key-mode) :diminish which-key-mode :config - (setq which-key-idle-delay 3)) + (setq which-key-idle-delay 0.2)) (use-package marginalia :diminish marginalia-mode diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 74d3d60..8381dd2 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1374 +1311 -- cgit v1.2.3 From 7bbffcfb1c38c527ec18be479beea9ecc666410b Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Tue, 12 Nov 2024 14:52:57 -0500 Subject: completion and lsp improvements --- .config/emacs/TODO.org | 7 +++-- .config/emacs/init.el | 73 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 75 insertions(+), 5 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 532a4e8..9b067f4 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,5 +1,8 @@ -- [ ] development (lsp for elisp, c++, typescript, html tags) -- [ ] corfu completion +- [x] development lsps +- [x] bettter configure corfu +- [ ] configure flycheck + argument completion + snippets +- [ ] C-c macros for development +- [ ] JS lsp setup - [ ] lsp peeking, finding definitions, all that bs - [ ] better search - [ ] project management diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 0df35cf..a850132 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -6,7 +6,7 @@ (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" :ref nil :depth 1 :files (:defaults "elpaca-test.el" (:exclude "extensions")) - :build (:not elpaca--activate-package))) + :build (:not elpaca--activate-package))) (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory)) (order (cdr elpaca-order)) @@ -318,21 +318,88 @@ (setq lsp-keymap-prefix "C-c l" lsp-headerline-breadcrumb-enable t lsp-headerline-breadcrumb-icons-enable t - lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols)) + lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols) + lsp-lens-enable nil) (lsp-headerline-breadcrumb-mode) :config - (lsp-enable-which-key-integration t)) + (lsp-enable-which-key-integration t) + :hook ( + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp) + (csharp-mode . lsp) + ) + :custom + (lsp-completion-provider :none) ; corfu + ) (use-package lsp-ui :hook (lsp-mode . lsp-ui-mode)) (setq lsp-ui-doc-position 'bottom) +;; - - hooks +(defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t)) +(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + +;; - - additional packages + (use-package consult-lsp :after lsp) (use-package lsp-treemacs :after lsp) +;; - completion +(use-package corfu + :ensure t + :custom + (corfu-cycle t) + (corfu-auto t) + (corfu-auto-prefix 2) + (corfu-auto-delay 0) + (corfu-popupinfo-delay '(0.3 . 0.1)) + (corfu-preview-current 'insert) + (corfu-preselect 'first) + (corfu-on-exact-match nil) + :bind (:map corfu-map + ("C-g" . corfu-quit)) + :init + (global-corfu-mode) + (corfu-history-mode) + (corfu-popupinfo-mode)) + +(use-package cape + ;; Bind prefix keymap providing all Cape commands under a mnemonic key. + ;; Press C-c p ? to for help. + :bind ("C-c p" . cape-prefix-map) ;; Alternative keys: M-p, M-+, ... + ;; Alternatively bind Cape commands individually. + ;; :bind (("C-c p d" . cape-dabbrev) + ;; ("C-c p h" . cape-history) + ;; ("C-c p f" . cape-file) + ;; ...) + :init + ;; Add to the global default value of `completion-at-point-functions' which is + ;; used by `completion-at-point'. The order of the functions matters, the + ;; first function returning a result wins. Note that the list of buffer-local + ;; completion functions takes precedence over the global list. + (add-hook 'completion-at-point-functions #'cape-dabbrev) + (add-hook 'completion-at-point-functions #'cape-file) + (add-hook 'completion-at-point-functions #'cape-elisp-block) + ;; (add-hook 'completion-at-point-functions #'cape-history) + ;; ... + ) + ;; - misc (use-package evil-nerd-commenter :bind ("M-;" . evilnc-comment-or-uncomment-lines)) -- cgit v1.2.3 From 085dfd265a90538e7a4ddaba5e93c625b24fc80e Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Thu, 14 Nov 2024 00:20:50 -0500 Subject: more emacs work --- .config/emacs/TODO.org | 5 +++-- .config/emacs/init.el | 12 ++++++------ .config/hypr/style.conf | 8 ++++---- .config/mpd/mpd.pid | 2 +- README.md | 5 ++--- 5 files changed, 16 insertions(+), 16 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 9b067f4..018749f 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,9 +1,10 @@ - [x] development lsps - [x] bettter configure corfu - [ ] configure flycheck + argument completion + snippets -- [ ] C-c macros for development -- [ ] JS lsp setup +- [ ] JS lsp setup + lsp improvements +- [ ] C-c macros for development and consult - [ ] lsp peeking, finding definitions, all that bs +- [ ] no corfu in org mode holy shit - [ ] better search - [ ] project management - [ ] Org tangling diff --git a/.config/emacs/init.el b/.config/emacs/init.el index a850132..651ddea 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -168,7 +168,7 @@ :init (which-key-mode) :diminish which-key-mode :config - (setq which-key-idle-delay 0.2)) + (setq which-key-idle-delay 0.5)) (use-package marginalia :diminish marginalia-mode @@ -261,6 +261,7 @@ ;; - dired (setf dired-kill-when-opening-new-dired-buffer t) +(setq dired-dwim-target t) ;; -- undo tree (use-package undo-tree @@ -317,7 +318,6 @@ :init (setq lsp-keymap-prefix "C-c l" lsp-headerline-breadcrumb-enable t - lsp-headerline-breadcrumb-icons-enable t lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols) lsp-lens-enable nil) (lsp-headerline-breadcrumb-mode) @@ -325,8 +325,8 @@ (lsp-enable-which-key-integration t) :hook ( (c-mode . lsp) - (c++-mode . lsp) - (python-mode . lsp) + (c++-mode . lsp-deferred) + (python-mode . lsp-deferred) (csharp-mode . lsp) ) :custom @@ -367,8 +367,8 @@ (corfu-cycle t) (corfu-auto t) (corfu-auto-prefix 2) - (corfu-auto-delay 0) - (corfu-popupinfo-delay '(0.3 . 0.1)) + (corfu-auto-delay 0.2) + (corfu-popupinfo-delay '(0.3 . 0.2)) (corfu-preview-current 'insert) (corfu-preselect 'first) (corfu-on-exact-match nil) diff --git a/.config/hypr/style.conf b/.config/hypr/style.conf index db0c6de..9c00a5f 100644 --- a/.config/hypr/style.conf +++ b/.config/hypr/style.conf @@ -18,10 +18,10 @@ decoration { passes = 3 } - drop_shadow = no - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + # drop_shadow = no + # shadow_range = 4 + # shadow_render_power = 3 + # col.shadow = rgba(1a1a1aee) } animations { diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 8381dd2..80b6d67 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1311 +1394 diff --git a/README.md b/README.md index 3c9c9c3..cad60fd 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ Dependencies: - Hyprpaper - Hyprlock - Hypridle -- Nemo -- Kitty +- Alacritty - Brightnessctl -- Calcurse - Pipewire +- Emacs lsp booster -- cgit v1.2.3 From d046a273c7a0e1f4f000fd417393c6babafb0541 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Sun, 17 Nov 2024 13:37:21 -0500 Subject: flycheck --- .config/emacs/TODO.org | 5 ++++- .config/emacs/init.el | 20 +++++++++++++++++--- .config/mpd/mpd.pid | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 018749f..234b248 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,12 +1,15 @@ - [x] development lsps - [x] bettter configure corfu +- [x] speed up lsp - [ ] configure flycheck + argument completion + snippets -- [ ] JS lsp setup + lsp improvements +- [ ] JS lsp setup - [ ] C-c macros for development and consult - [ ] lsp peeking, finding definitions, all that bs +- [ ] grab shit from other lsp config - [ ] no corfu in org mode holy shit - [ ] better search - [ ] project management +- [ ] ido - [ ] Org tangling - [ ] splash screen - [ ] dap mode diff --git a/.config/emacs/init.el b/.config/emacs/init.el index d58035d..654bdf5 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -312,10 +312,10 @@ :commands (lsp lsp-deferred) :init (setq lsp-keymap-prefix "C-c l" - lsp-headerline-breadcrumb-enable f - ;lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols) + lsp-headerline-breadcrumb-enable t + lsp-headerline-breadcrumb-segments '(path-up-to-project file symbols) lsp-lens-enable nil) - ;(lsp-headerline-breadcrumb-mode) + (lsp-headerline-breadcrumb-mode) :config (lsp-enable-which-key-integration t) :hook ( @@ -364,6 +364,20 @@ orig-result))) (advice-add 'lsp-resolve-final-command :around #'lsp-booster--advice-final-command) +;; flycheck +(use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + +(use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + ;; - - hooks (defun my-c-mode-common-hook () ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 80b6d67..f344618 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1394 +1711 -- cgit v1.2.3 From f550e3a9492916aff5ed16bac36990417bb77d73 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 18 Nov 2024 20:41:31 -0500 Subject: icons --- .config/emacs/TODO.org | 2 +- .config/emacs/init.el | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to '.config/emacs/TODO.org') diff --git a/.config/emacs/TODO.org b/.config/emacs/TODO.org index 234b248..da4be55 100644 --- a/.config/emacs/TODO.org +++ b/.config/emacs/TODO.org @@ -1,7 +1,7 @@ - [x] development lsps - [x] bettter configure corfu - [x] speed up lsp -- [ ] configure flycheck + argument completion + snippets +- [x] configure flycheck + argument completion + snippets - [ ] JS lsp setup - [ ] C-c macros for development and consult - [ ] lsp peeking, finding definitions, all that bs diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 654bdf5..38b0b7b 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -107,19 +107,20 @@ (use-package doom-modeline :ensure t :init (doom-modeline-mode 1) - :custom ((doom-modeline-height 15))) + :custom ((doom-modeline-height 25))) (use-package doom-themes :config (setq doom-themes-enable-bold t doom-themes-enable-italic t) - ;(load-theme 'doom-snazzy t) + (load-theme 'doom-dracula t) (doom-themes-org-config)) (use-package miasma-theme :vc (:fetcher github :repo daut/miasma-theme.el) :config - (load-theme 'miasma t)) + ;(load-theme 'miasma t) + ) ;; misc changes (use-package diminish) @@ -409,7 +410,7 @@ (corfu-auto t) (corfu-auto-prefix 2) (corfu-auto-delay 0.2) - (corfu-popupinfo-delay '(0.3 . 0.2)) + (corfu-popupinfo-delay '(0.2 . 0.1)) (corfu-preview-current 'insert) (corfu-preselect 'first) (corfu-on-exact-match nil) @@ -420,6 +421,15 @@ (corfu-history-mode) (corfu-popupinfo-mode)) +(use-package kind-icon + :ensure t + :after corfu + ;:custom + ; (kind-icon-blend-background t) + ; (kind-icon-default-face 'corfu-default) ; only needed with blend-background + :config + (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter)) + (use-package cape ;; Bind prefix keymap providing all Cape commands under a mnemonic key. ;; Press C-c p ? to for help. -- cgit v1.2.3