init.el is starting to feel better
This commit is contained in:
parent
74b093b86f
commit
0d260dac8e
@ -23,9 +23,9 @@
|
|||||||
(put 'narrow-to-region 'disabled nil)
|
(put 'narrow-to-region 'disabled nil)
|
||||||
(put 'dired-find-alternate-file 'disabled nil)
|
(put 'dired-find-alternate-file 'disabled nil)
|
||||||
|
|
||||||
;; (require 'server)
|
(require 'server)
|
||||||
;; (if (not (server-running-p)) (server-start))
|
(if (not (server-running-p)) (server-start))
|
||||||
|
(add-hook 'prog-mode (lambda () (modify-syntax-entry ?_ "w")))
|
||||||
(setq default-directory "/home/joe")
|
(setq default-directory "/home/joe")
|
||||||
|
|
||||||
;; Visuals
|
;; Visuals
|
||||||
@ -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)
|
'(flycheck-color-mode-line-face-to-color 'mode-line-buffer-id)
|
||||||
'(frame-background-mode 'dark)
|
'(frame-background-mode 'dark)
|
||||||
'(package-selected-packages
|
'(package-selected-packages
|
||||||
'(flycheck all-the-icons-completion kind-icon feebleline mini-modeline sublimity 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 eglot-fsharp fish-mode find-file-in-project helpful ahk-mode rainbow-delimiters doom-themes marginalia eglot selectrum-prescient prescient selectrum avy evil-commentary evil-embrace evil-snipe evil-surround undo-tree which-key dashboard))
|
'(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))
|
'(window-divider-mode nil))
|
||||||
(custom-set-faces
|
(custom-set-faces
|
||||||
;; custom-set-faces was added by Custom.
|
;; custom-set-faces was added by Custom.
|
||||||
@ -153,7 +153,8 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
(package-install p)))
|
(package-install p)))
|
||||||
|
|
||||||
(setq custom-safe-themes t)
|
(setq custom-safe-themes t)
|
||||||
(load-theme 'doom-one t)
|
;; (load-theme 'doom-one t)
|
||||||
|
(load-theme 'doom-flatwhite t)
|
||||||
|
|
||||||
(setq evil-want-keybinding nil)
|
(setq evil-want-keybinding nil)
|
||||||
(setq evil-undo-system 'undo-tree)
|
(setq evil-undo-system 'undo-tree)
|
||||||
@ -213,6 +214,14 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
(evil-define-key 'normal dired-mode-map (kbd "<return>")
|
(evil-define-key 'normal dired-mode-map (kbd "<return>")
|
||||||
(lambda () (interactive) (dired-find-alternate-file)))))
|
(lambda () (interactive) (dired-find-alternate-file)))))
|
||||||
|
|
||||||
|
(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))
|
||||||
|
|
||||||
|
(add-hook 'prog-mode-hook 'lsp-related-stuff)
|
||||||
|
|
||||||
;; (require 'dired-jump)
|
;; (require 'dired-jump)
|
||||||
(evil-define-key 'normal 'global (kbd "-") 'dired-jump)
|
(evil-define-key 'normal 'global (kbd "-") 'dired-jump)
|
||||||
|
|
||||||
@ -224,7 +233,6 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
(setq dashboard-set-file-icons t)
|
(setq dashboard-set-file-icons t)
|
||||||
(setq dashboard-set-heading-icons t)
|
(setq dashboard-set-heading-icons t)
|
||||||
|
|
||||||
|
|
||||||
(require 'which-key)
|
(require 'which-key)
|
||||||
(setq which-key-idle-delay 0.3)
|
(setq which-key-idle-delay 0.3)
|
||||||
(which-key-mode)
|
(which-key-mode)
|
||||||
@ -268,7 +276,7 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
(evil-define-key 'normal 'global (kbd "<leader>pf") 'package-refresh-contents)
|
(evil-define-key 'normal 'global (kbd "<leader>pf") 'package-refresh-contents)
|
||||||
(evil-define-key 'normal 'global (kbd "<leader>pl") 'package-list-packages)
|
(evil-define-key 'normal 'global (kbd "<leader>pl") 'package-list-packages)
|
||||||
(evil-define-key 'normal 'global (kbd "<leader>pr") 'package-reinstall)
|
(evil-define-key 'normal 'global (kbd "<leader>pr") 'package-reinstall)
|
||||||
(evil-define-key 'normal 'global (kbd "C-t") 'multi-vterm-dedicated-toggle)
|
(evil-define-key 'normal 'global (kbd "C-t") 'multi-vterm)
|
||||||
(evil-define-key 'normal 'global (kbd "<leader>sn") 'multi-vterm-next)
|
(evil-define-key 'normal 'global (kbd "<leader>sn") 'multi-vterm-next)
|
||||||
(evil-define-key 'normal 'global (kbd "<leader>sp") 'multi-vterm-project)
|
(evil-define-key 'normal 'global (kbd "<leader>sp") 'multi-vterm-project)
|
||||||
(evil-define-key 'normal 'global (kbd "<leader>sv") 'vterm-other-window)
|
(evil-define-key 'normal 'global (kbd "<leader>sv") 'vterm-other-window)
|
||||||
@ -292,12 +300,6 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
;; (evil-define-key 'normal 'global (kbd "C-u") 'joe/half-scroll-up)
|
;; (evil-define-key 'normal 'global (kbd "C-u") 'joe/half-scroll-up)
|
||||||
;; (evil-define-key 'normal 'global (kbd "C-f") 'good-scroll-up-full-screen)
|
;; (evil-define-key 'normal 'global (kbd "C-f") 'good-scroll-up-full-screen)
|
||||||
;; (evil-define-key 'normal 'global (kbd "C-b") 'good-scroll-down-full-screen)
|
;; (evil-define-key 'normal 'global (kbd "C-b") 'good-scroll-down-full-screen)
|
||||||
(require 'sublimity)
|
|
||||||
(require 'sublimity-scroll)
|
|
||||||
(sublimity-mode 1)
|
|
||||||
(setq sublimity-scroll-weight 14
|
|
||||||
sublimity-scroll-drift-length 6)
|
|
||||||
|
|
||||||
(evil-define-key 'normal 'global (kbd "C-h") 'evil-window-left)
|
(evil-define-key 'normal 'global (kbd "C-h") 'evil-window-left)
|
||||||
(evil-define-key 'normal 'global (kbd "C-j") 'evil-window-down)
|
(evil-define-key 'normal 'global (kbd "C-j") 'evil-window-down)
|
||||||
(evil-define-key 'normal 'global (kbd "C-k") 'evil-window-up)
|
(evil-define-key 'normal 'global (kbd "C-k") 'evil-window-up)
|
||||||
@ -429,7 +431,7 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
|
|
||||||
(require 'evil-goggles)
|
(require 'evil-goggles)
|
||||||
(evil-goggles-mode)
|
(evil-goggles-mode)
|
||||||
(setq evil-goggles-duration 0.15)
|
(setq evil-goggles-duration 0.075)
|
||||||
(setq evil-goggles-pulse t)
|
(setq evil-goggles-pulse t)
|
||||||
(setq evil-goggles-async-duration 0.55)
|
(setq evil-goggles-async-duration 0.55)
|
||||||
|
|
||||||
@ -440,7 +442,7 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
window-divider-first-pixel
|
window-divider-first-pixel
|
||||||
window-divider-last-pixel))
|
window-divider-last-pixel))
|
||||||
(face-spec-reset-face face)
|
(face-spec-reset-face face)
|
||||||
(set-face-foreground face (face-attribute 'default :background)))
|
(set-face-foreground face "#000"))
|
||||||
(set-face-background 'fringe (face-attribute 'default :background))
|
(set-face-background 'fringe (face-attribute 'default :background))
|
||||||
|
|
||||||
(require 'mini-frame)
|
(require 'mini-frame)
|
||||||
@ -490,28 +492,33 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
|
|
||||||
(add-to-list 'completion-at-point-functions #'cape-file)
|
(add-to-list 'completion-at-point-functions #'cape-file)
|
||||||
|
|
||||||
|
(define-key corfu-map (kbd "M-d") #'corfu-doc-toggle)
|
||||||
|
(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 'consult)
|
||||||
|
(require 'consult-lsp)
|
||||||
|
|
||||||
;; (add-to-list 'load-path (expand-file-name "~/.emacs.vanilla/elpa/aweshell/"))
|
;; (add-to-list 'load-path (expand-file-name "~/.emacs.vanilla/elpa/aweshell/"))
|
||||||
;; (require 'aweshell)
|
;; (require 'aweshell)
|
||||||
;; (require 'fish-completion)
|
;; (require 'fish-completion)
|
||||||
;; (global-fish-completion-mode)
|
;; (global-fish-completion-mode)
|
||||||
;; (setq evil-collection-company-use-tng nil)
|
;; (setq evil-collection-company-use-tng nil)
|
||||||
|
|
||||||
(define-key corfu-map (kbd "M-d") #'corfu-doc-toggle)
|
|
||||||
(define-key corfu-map (kbd "M-p") #'corfu-doc-scroll-down)
|
|
||||||
(define-key corfu-map (kbd "M-n") #'corfu-doc-scroll-up)
|
|
||||||
(require 'feebleline)
|
|
||||||
(feebleline-mode)
|
|
||||||
(setq feebleline-msg-functions
|
|
||||||
'((feebleline-git-branch :align right :face feebleline-git-face :pre " - ")
|
|
||||||
(feebleline-file-directory :align right :face feebleline-dir-face :post "")
|
|
||||||
(feebleline-file-or-buffer-name :align right :face font-lock-keyword-face :post "")
|
|
||||||
(feebleline-file-modified-star :align right :face font-lock-warning-face :post "")
|
|
||||||
(feebleline-line-number :align right :post "" :fmt "%5s")
|
|
||||||
(feebleline-column-number :align right :pre ":" :fmt "%-2s")))
|
|
||||||
|
|
||||||
;; (require 'slime)
|
;; (require 'slime)
|
||||||
;; (setq inferior-lisp-program "/usr/bin/sbcl")
|
;; (setq inferior-lisp-program "/usr/bin/sbcl")
|
||||||
|
|
||||||
|
;; (require 'feebleline)
|
||||||
|
;; (feebleline-mode)
|
||||||
|
;; (setq feebleline-msg-functions
|
||||||
|
;; '((feebleline-git-branch :align right :face feebleline-git-face :pre " - ")
|
||||||
|
;; (feebleline-file-directory :align right :face feebleline-dir-face :post "")
|
||||||
|
;; (feebleline-file-or-buffer-name :align right :face font-lock-keyword-face :post "")
|
||||||
|
;; (feebleline-file-modified-star :align right :face font-lock-warning-face :post "")
|
||||||
|
;; (feebleline-line-number :align right :post "" :fmt "%5s")
|
||||||
|
;; (feebleline-column-number :align right :pre ":" :fmt "%-2s")))
|
||||||
|
|
||||||
;; (add-hook 'slime-mode-hook
|
;; (add-hook 'slime-mode-hook
|
||||||
;; (lambda ()
|
;; (lambda ()
|
||||||
;; ;; (setq global-hl-line-mode nil)
|
;; ;; (setq global-hl-line-mode nil)
|
||||||
@ -536,8 +543,15 @@ all of the evil keybindings in buffers like magit, without compromises."
|
|||||||
;; (apply f args)))
|
;; (apply f args)))
|
||||||
|
|
||||||
|
|
||||||
(require 'eglot)
|
;; (require 'eglot)
|
||||||
(require 'eglot-fsharp)
|
;; (require 'eglot-fsharp)
|
||||||
|
;; (require 'consult-eglot)
|
||||||
|
|
||||||
|
;; (require 'sublimity)
|
||||||
|
;; (require 'sublimity-scroll)
|
||||||
|
;; (sublimity-mode 1)
|
||||||
|
;; (setq sublimity-scroll-weight 14
|
||||||
|
;; sublimity-scroll-drift-length 6)
|
||||||
|
|
||||||
;; TODO: Packages to check out
|
;; TODO: Packages to check out
|
||||||
;; expand-region
|
;; expand-region
|
||||||
|
Loading…
x
Reference in New Issue
Block a user