From ff552097de34b4f4c4212140e259f4902196bc90 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Wed, 17 Aug 2022 01:09:13 +0700 Subject: [PATCH] More work on vanilla emacs --- .emacs.vanilla/init.el | 73 +++++++++++++++++++++++++++++------------- .gitignore | 15 ++++++--- 2 files changed, 61 insertions(+), 27 deletions(-) diff --git a/.emacs.vanilla/init.el b/.emacs.vanilla/init.el index 5a6c122..ef6f8e9 100644 --- a/.emacs.vanilla/init.el +++ b/.emacs.vanilla/init.el @@ -136,7 +136,7 @@ all of the evil keybindings in buffers like magit, without compromises." '(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id) '(frame-background-mode 'dark) '(package-selected-packages - '(consult-lsp lsp-mode consult flycheck all-the-icons-completion kind-icon mini-modeline good-scroll shelldon pcomplete-extension corfu-doc esh-autosuggest fish-completion cape corfu highlight-quoted writeroom-mode mini-frame dirvish ranger evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) + '(consult-eglot eglot lsp-ui nano-modeline mini-modeline simple-modeline dimmer pdf-tools dap-mode csharp-mode consult-lsp lsp-mode consult flycheck all-the-icons-completion kind-icon mini-modeline good-scroll shelldon pcomplete-extension corfu-doc esh-autosuggest fish-completion cape corfu highlight-quoted writeroom-mode mini-frame dirvish ranger evil-goggles magit multi-vterm evil-collection smartparens vterm all-the-icons-dired all-the-icons org-bullets select-themes fsharp-mode fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard)) '(window-divider-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. @@ -153,8 +153,8 @@ all of the evil keybindings in buffers like magit, without compromises." (package-install p))) (setq custom-safe-themes t) -;; (load-theme 'doom-one t) -(load-theme 'doom-flatwhite t) +(load-theme 'doom-vibrant t) +;; (load-theme 'doom-flatwhite t) (setq evil-want-keybinding nil) (setq evil-undo-system 'undo-tree) @@ -180,6 +180,10 @@ all of the evil keybindings in buffers like magit, without compromises." (setq ls-lisp-dirs-first t) (setq dired-listing-switches "-ahlgo -v --group-directories-first")) +;; (require 'dimmer) +;; (setq dimmer-adjustment-mode :both) +;; (dimmer-mode 1) + (defun joe/dired-open-with-wsl-open () "Open file under cursor with wsl-open which should launch it on the windows side." (interactive) @@ -217,8 +221,8 @@ all of the evil keybindings in buffers like magit, without compromises." (defun lsp-related-stuff () (evil-define-key 'normal 'global (kbd "M-s") 'consult-imenu) (evil-define-key 'normal 'global (kbd "M-i") 'eldoc) - (evil-define-key 'normal 'global (kbd "M-e") 'flymake-goto-next-error) - (evil-define-key 'normal 'global (kbd "M-E") 'flymake-goto-prev-error)) + (evil-define-key 'normal 'global (kbd "M-e") 'flycheck-next-error) + (evil-define-key 'normal 'global (kbd "M-E") 'flycheck-previous-error)) (add-hook 'prog-mode-hook 'lsp-related-stuff) @@ -271,20 +275,20 @@ all of the evil keybindings in buffers like magit, without compromises." (evil-define-key 'normal 'global (kbd "br") 'joe/revert-buffer-no-confirm) (evil-define-key 'normal 'global (kbd "bk") 'kill-this-buffer) (evil-define-key 'normal 'global (kbd "gg") 'magit-status) +(evil-define-key 'normal 'global (kbd "gc") 'magit-clone) (evil-define-key 'normal 'global (kbd "pi") 'package-install) (evil-define-key 'normal 'global (kbd "pd") 'package-delete) (evil-define-key 'normal 'global (kbd "pf") 'package-refresh-contents) (evil-define-key 'normal 'global (kbd "pl") 'package-list-packages) (evil-define-key 'normal 'global (kbd "pr") 'package-reinstall) -(evil-define-key 'normal 'global (kbd "C-t") 'multi-vterm) -(evil-define-key 'normal 'global (kbd "sn") 'multi-vterm-next) -(evil-define-key 'normal 'global (kbd "sp") 'multi-vterm-project) -(evil-define-key 'normal 'global (kbd "sv") 'vterm-other-window) +(evil-define-key 'normal 'global (kbd "tt") 'multi-vterm) +(evil-define-key 'normal 'global (kbd "tn") 'multi-vterm-next) +(evil-define-key 'normal 'global (kbd "tv") 'vterm-other-window) (evil-define-key 'normal 'global (kbd "Ba") 'joe/bookmark-set-and-save) (evil-define-key 'normal 'global (kbd "Bd") 'bookmark-delete) -(evil-define-key 'insert vterm-mode-map (kbd "C-t") #'multi-vterm-dedicated-toggle) -(evil-define-key 'normal 'global (kbd "C-t") #'multi-vterm-dedicated-open) -(evil-define-key 'insert vterm-mode-map (kbd "C-t") #'multi-vterm-dedicated-open) +;; (evil-define-key 'insert vterm-mode-map (kbd "C-t") #'multi-vterm-dedicated-toggle) +;; (evil-define-key 'normal vterm-mode-map (kbd "C-t") #'multi-vterm-dedicated-toggle) +(evil-define-key 'normal 'global (kbd "cc") 'joe/compile) (defun joe/half-scroll-down () (interactive) @@ -320,6 +324,11 @@ all of the evil keybindings in buffers like magit, without compromises." :keymap global-evil-leader-map) (global-evil-leader-mode) +;; (require 'mini-modeline) +;; (mini-modeline-mode 1) +(require 'nano-modeline) +(nano-modeline-mode 1) + (require 'evil-surround) (global-evil-surround-mode 1) @@ -436,14 +445,14 @@ all of the evil keybindings in buffers like magit, without compromises." (setq evil-goggles-async-duration 0.55) (modify-all-frames-parameters - '((right-divider-width . 12) - (internal-border-width . 12))) -(dolist (face '(window-divider - window-divider-first-pixel - window-divider-last-pixel)) - (face-spec-reset-face face) - (set-face-foreground face "#000")) -(set-face-background 'fringe (face-attribute 'default :background)) + '((right-divider-width . 5) + (internal-border-width . 10))) +;; (dolist (face '(window-divider +;; window-divider-first-pixel +;; window-divider-last-pixel)) +;; (face-spec-reset-face face) +;; (set-face-foreground face "#333")) +;; (set-face-background 'fringe (face-attribute 'default :background)) (require 'mini-frame) @@ -496,10 +505,30 @@ all of the evil keybindings in buffers like magit, without compromises." (define-key corfu-map (kbd "M-p") #'corfu-doc-scroll-down) (define-key corfu-map (kbd "M-n") #'corfu-doc-scroll-up) -(require 'lsp) +;; (require 'lsp) (require 'consult) -(require 'consult-lsp) +;; (require 'consult-lsp) +(require 'dap-mode) +(require 'dap-netcore) +(require 'dap-gdb-lldb) +(setq dap-print-io t) +(require 'eglot) +(require 'consult-eglot) + +(defun joe/compile () (interactive) (compile "make run")) + +;; (dap-register-debug-template "NetCoreDdg Launch (4)" +;; (list :type "coreclr" +;; :request "launch" +;; :mode "launch" +;; :name "NetCoreDbg Launch" +;; :cwd nil +;; :dap-compilation "dotnet build" +;; :program "${workspaceFolder}/bin/Debug/net6.0/${workspaceFolderBasename}")) +;; (dap-register-debug-provider +;; "coreclr" +;; 'dap-netcore--populate-args) ;; (add-to-list 'load-path (expand-file-name "~/.emacs.vanilla/elpa/aweshell/")) ;; (require 'aweshell) ;; (require 'fish-completion) diff --git a/.gitignore b/.gitignore index ebf5ab2..7803ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ -.emacs.d/elpa -.emacs.d/saves -.emacs.d/var -.emacs.d/transient -.emacs.d/recentf +.emacs.*/elpa +.emacs.*/saves +.emacs.*/var +.emacs.*/transient +.emacs.*/recentf +.emacs.*/elpa +.emacs.*/undo +.emacs.*/url +.emacs.vanilla/* +!.emacs.vanilla/init.el /.emacs.d/auto-save-list/