diff options
Diffstat (limited to 'users/grfn/emacs.d')
| -rw-r--r-- | users/grfn/emacs.d/config.el | 6 | ||||
| -rw-r--r-- | users/grfn/emacs.d/init.el | 19 | ||||
| -rw-r--r-- | users/grfn/emacs.d/packages.el | 2 | ||||
| -rw-r--r-- | users/grfn/emacs.d/rust.el | 7 |
4 files changed, 18 insertions, 16 deletions
diff --git a/users/grfn/emacs.d/config.el b/users/grfn/emacs.d/config.el index 9ddfe07afb95..da2ef48cd8fd 100644 --- a/users/grfn/emacs.d/config.el +++ b/users/grfn/emacs.d/config.el @@ -513,7 +513,7 @@ ;; :n "[ [" #'magit-section-backward ) - (define-suffix-command magit-commit-wip () + (transient-define-suffix magit-commit-wip () (interactive) (magit-commit-create '("-m" "wip"))) @@ -522,11 +522,11 @@ ["c"] (list "W" "Commit WIP" #'magit-commit-wip)) - (define-suffix-command magit-reset-head-back () + (transient-define-suffix magit-reset-head-back () (interactive) (magit-reset-mixed "HEAD~")) - (define-suffix-command magit-reset-head-previous () + (transient-define-suffix magit-reset-head-previous () (interactive) (magit-reset-mixed "HEAD@{1}")) diff --git a/users/grfn/emacs.d/init.el b/users/grfn/emacs.d/init.el index 2518f2f79891..a3672e0a0e0e 100644 --- a/users/grfn/emacs.d/init.el +++ b/users/grfn/emacs.d/init.el @@ -26,7 +26,7 @@ unicode ; extended unicode support for various languages vc-gutter ; vcs diff in the fringe vi-tilde-fringe ; fringe tildes to mark beyond EOB - window-select ; visually switch windows + ;;window-select ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces :editor @@ -34,23 +34,22 @@ file-templates ; auto-snippets for empty files fold ; (nigh) universal code folding ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys ;;lispy ; vim for lisp, for people who dont like vim - multiple-cursors ; editing in many places at once + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent ;;parinfer ; turn lisp into python, sort of - rotate-text ; cycle region at point between text candidates + ;;rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to word-wrap :emacs - (dired ; making dired pretty [functional] - ;;+ranger ; bringing the goodness of ranger to dired - ;;+icons ; colorful icons for dired-mode - ) + dired ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent ;;eshell ; a consistent, cross-platform shell (WIP) ;;term ; terminals in Emacs - vc ; version-control and Emacs, sitting in a tree (undo +tree) + vc ; version-control and Emacs, sitting in a tree :tools ;;ansible @@ -73,6 +72,7 @@ ;;rgb ; creating color strings ;;terraform ; infrastructure as code ;;tmux ; an API for interacting with tmux + tree-sitter ; syntax and parsing, sitting in a tree... ;;upload ; map local to remote projects via ssh/ftp ;;wakatime ;;vterm ; another terminals in Emacs @@ -132,7 +132,7 @@ racket ; a DSL for DSLs rest ; Emacs as a REST client ;;ruby ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good (sh +fish) ; she sells (ba|z|fi)sh shells on the C xor ;;solidity ; do you need a blockchain? No. @@ -140,6 +140,7 @@ ;;terra ; Earth and Moon in alignment for performance. ;;web ; the tubes ;;vala ; GObjective-C + zig ;; Applications are complex and opinionated modules that transform Emacs ;; toward a specific purpose. They may have additional dependencies and diff --git a/users/grfn/emacs.d/packages.el b/users/grfn/emacs.d/packages.el index 7c79f6b5d48b..15a3843f4db9 100644 --- a/users/grfn/emacs.d/packages.el +++ b/users/grfn/emacs.d/packages.el @@ -71,7 +71,7 @@ (package! lsp-treemacs) ;; Rust -(package! rustic :disable t) +;; (package! rustic :disable t) ;; (package! racer :disable t) (package! cargo) diff --git a/users/grfn/emacs.d/rust.el b/users/grfn/emacs.d/rust.el index 176aad08043d..9988d16a5327 100644 --- a/users/grfn/emacs.d/rust.el +++ b/users/grfn/emacs.d/rust.el @@ -9,15 +9,16 @@ (+evil-embrace-angle-bracket-modes-hook-h) - (setq lsp-rust-server 'rust-analyzer) + ;; (setq lsp-rust-server 'rust-analyzer) (setq-local whitespace-line-column 100 fill-column 100) - (setq rust-format-show-buffer nil) + ;; (setq rust-format-show-buffer nil) (setq lsp-rust-analyzer-import-merge-behaviour "last" lsp-rust-analyzer-cargo-watch-command "clippy" lsp-rust-analyzer-cargo-watch-args ["--target-dir" "/home/grfn/code/readyset/readyset/target/rust-analyzer"] + rustic-format-trigger 'on-save lsp-ui-doc-enable t) - (rust-enable-format-on-save) + ;; (rust-enable-format-on-save) (lsp)) (add-hook 'rust-mode-hook #'grfn/rust-setup) |