mirror of https://github.com/Flinner/dots.git
feat: feats >:)
This commit is contained in:
Flinner
parent
2579cdb701
commit
b45dca7eb1
GPG Key ID:
95CE0DA7F0E58CA6
|
|
@ -49,7 +49,7 @@ straight
|
|||
(setq straight-use-package-by-default t)
|
||||
#+end_src
|
||||
|
||||
* Basic UI Configuration
|
||||
* Basic Configuration
|
||||
** Better Defaults
|
||||
#+begin_src emacs-lisp
|
||||
(setq inhibit-startup-message t)
|
||||
|
|
@ -83,7 +83,7 @@ Better Scrolling
|
|||
(setq scroll-conservatively 10)
|
||||
(setq scroll-margin 3)
|
||||
(use-package smooth-scrolling
|
||||
:init (smooth-scrolling-mode 1))
|
||||
:config (smooth-scrolling-mode 1))
|
||||
#+end_src
|
||||
** Fonts
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -120,6 +120,13 @@ Actuall Theme:
|
|||
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
||||
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
||||
(load-theme 'doom-gruvbox t)
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(flycheck-warning ((t (:background "#282828" :underline "#fabd2f"))))
|
||||
'(ivy-posframe-border ((t (:background "#ffffff")))))
|
||||
|
||||
;; Enable custom neotree theme (all-the-icons must be installed!)
|
||||
(doom-themes-neotree-config)
|
||||
|
|
@ -131,22 +138,28 @@ Actuall Theme:
|
|||
#+end_src
|
||||
|
||||
** Line Numbers
|
||||
Enable Globally
|
||||
#+begin_src emacs-lisp
|
||||
(global-display-line-numbers-mode 1)
|
||||
DEPRECATED Enable Globally
|
||||
#+begin_src emacs-lisp :tangle no
|
||||
(global-display-line-numbers-mode 0)
|
||||
#+end_src
|
||||
Disable for the following modes
|
||||
#+begin_src emacs-lisp
|
||||
|
||||
DEPRECATED Disable for the following modes
|
||||
#+begin_src emacs-lisp :tangle no
|
||||
(defun disable-line-numbers () "Disables line number" (interactive) (display-line-numbers-mode 0))
|
||||
|
||||
(dolist (mode '(org-mode-hook
|
||||
term-mode-hook
|
||||
treemacs-mode-hook
|
||||
cargo-test-mode-hook
|
||||
shell-mode-hook
|
||||
eshell-mode-hook))
|
||||
(add-hook mode #'disable-line-numbers))
|
||||
|
||||
#+end_src
|
||||
ONLY IN PROG!
|
||||
#+begin_src emacs-lisp
|
||||
(add-hook 'prog-mode-hook 'display-line-numbers-mode)
|
||||
#+end_src
|
||||
|
||||
** Undo
|
||||
#+begin_src emacs-lisp
|
||||
|
|
@ -176,6 +189,7 @@ Single Esc to Quit, instead of *three*
|
|||
|
||||
** General.el
|
||||
Eval First and Last at least block!
|
||||
E: honestly I have no clue wtf that meant, but I will keep it
|
||||
*** use-package
|
||||
#+begin_src emacs-lisp
|
||||
(use-package general
|
||||
|
|
@ -201,6 +215,7 @@ Eval First and Last at least block!
|
|||
#+end_src
|
||||
|
||||
**** Symbols, Spaces, Numbers, u
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(my/leader-keys
|
||||
"." '(counsel-find-file :which-key "find file")
|
||||
|
|
@ -212,6 +227,7 @@ Eval First and Last at least block!
|
|||
":" '(eval-expression :which-key "eval expression")
|
||||
#+end_src
|
||||
|
||||
|
||||
**** Toggles (t)
|
||||
#+begin_src emacs-lisp
|
||||
"t" '(:ignore t :which-key "toggles")
|
||||
|
|
@ -281,6 +297,7 @@ Eval First and Last at least block!
|
|||
"ci" '(lsp-ui-imenu :which-key "lsp imenu")
|
||||
"cr" '(lsp-rename :which-key "rename")
|
||||
"cs" '(lsp-find-refernces :which-key "rename")
|
||||
"cd" '(lsp-find-definition :which-key "rename")
|
||||
#+end_src
|
||||
|
||||
**** Git (g)
|
||||
|
|
@ -294,6 +311,12 @@ Eval First and Last at least block!
|
|||
"p" '(projectile-command-map t :which-key "Projectile")
|
||||
#+end_src
|
||||
|
||||
**** Quit (q)
|
||||
#+begin_src emacs-lisp
|
||||
"q" '(:ignore t :which-key "Quit and Stuff")
|
||||
"qf" '(delete-frame :which-key "Close Frame")
|
||||
#+end_src
|
||||
|
||||
*** Closing Brackets
|
||||
#+begin_src emacs-lisp
|
||||
))
|
||||
|
|
@ -376,6 +399,12 @@ Eval First and Last at least block!
|
|||
|
||||
*** Evil Escape
|
||||
#+begin_src emacs-lisp
|
||||
(use-package key-chord
|
||||
:config
|
||||
(key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
|
||||
:init
|
||||
(key-chord-mode 1))
|
||||
|
||||
;; (use-package evil-escape
|
||||
;; :after evil
|
||||
;; :init
|
||||
|
|
@ -385,22 +414,23 @@ Eval First and Last at least block!
|
|||
;; (setq evil-escape-key-sequence "jk")
|
||||
;; (setq evil-escape-delay 0.2)
|
||||
;; (setq evil-escape-unordered-key-sequence t))
|
||||
(defun my-jk ()
|
||||
(interactive)
|
||||
(let* ((initial-key ?j)
|
||||
(final-key ?k)
|
||||
(timeout 0.5)
|
||||
(event (read-event nil nil timeout)))
|
||||
(if event
|
||||
;; timeout met
|
||||
(if (and (characterp event) (= event final-key))
|
||||
(evil-normal-state)
|
||||
(insert initial-key)
|
||||
(push event unread-command-events))
|
||||
;; timeout exceeded
|
||||
(insert initial-key))))
|
||||
;; (defun my-jk ()
|
||||
;; (interactive)
|
||||
;; (let* ((initial-key ?j)
|
||||
;; (final-key ?k)
|
||||
;; (timeout 0.5)
|
||||
;; (event (read-event nil nil timeout)))
|
||||
;; (if event
|
||||
;; ;; timeout met
|
||||
;; (if (and (characterp event) (= event final-key))
|
||||
;; (evil-normal-state)
|
||||
;; (insert initial-key)
|
||||
;; (push event unread-command-events))
|
||||
;; ;; timeout exceeded
|
||||
;; (insert initial-key))))
|
||||
|
||||
;; (define-key evil-insert-state-map (kbd "j") 'my-jk)
|
||||
|
||||
(define-key evil-insert-state-map (kbd "j") 'my-jk)
|
||||
#+end_src
|
||||
|
||||
* Completions
|
||||
|
|
@ -511,6 +541,16 @@ better sorting for ivy, company..
|
|||
;; (use-package selectrum-prescient)
|
||||
#+end_src
|
||||
|
||||
** Yasnippet
|
||||
#+begin_src emacs-lisp
|
||||
(use-package yasnippet
|
||||
:config
|
||||
(yas-global-mode))
|
||||
|
||||
(use-package yasnippet-snippets)
|
||||
|
||||
#+end_src
|
||||
|
||||
* Org-Mode
|
||||
** use-package and Appereance
|
||||
Modes To Start
|
||||
|
|
@ -674,6 +714,13 @@ Counsel Projectile
|
|||
:config (counsel-projectile-mode))
|
||||
#+end_src
|
||||
|
||||
*** Recentf
|
||||
#+begin_src emacs-lisp
|
||||
(use-package recentf
|
||||
:init (recentf-mode 1)
|
||||
)
|
||||
#+end_src
|
||||
|
||||
*** lsp-mode
|
||||
#+begin_src emacs-lisp
|
||||
(use-package lsp-mode
|
||||
|
|
@ -686,6 +733,7 @@ Counsel Projectile
|
|||
(lsp-rust-analyzer-cargo-watch-command "clippy")
|
||||
(lsp-eldoc-render-all t)
|
||||
(lsp-eldoc-enable-hover nil)
|
||||
( lsp-ui-doc-show-with-mouse nil)
|
||||
(lsp-idle-delay 0.6)
|
||||
(lsp-idle-delay 0.6)
|
||||
(lsp-rust-analyzer-server-display-inlay-hints t)
|
||||
|
|
@ -786,28 +834,29 @@ Get treemacs-lsp
|
|||
** Language
|
||||
*** Rust
|
||||
#+begin_src emacs-lisp
|
||||
(use-package rustic
|
||||
:ensure
|
||||
:bind (:map rustic-mode-map
|
||||
("C-c C-c l" . lsp-ui-flycheck-list)
|
||||
("C-c C-c s" . lsp-rust-analyzer-status))
|
||||
:config
|
||||
;; uncomment for less flashiness
|
||||
;; (setq lsp-eldoc-hook nil)
|
||||
;; (setq lsp-enable-symbol-highlighting nil)
|
||||
;; (setq lsp-signature-auto-activate nil)
|
||||
(use-package rustic
|
||||
:ensure
|
||||
:bind (:map rustic-mode-map
|
||||
("C-c C-c l" . lsp-ui-flycheck-list)
|
||||
("C-c C-c s" . lsp-rust-analyzer-status)
|
||||
("<f5>" . rustic-cargo-test))
|
||||
:config
|
||||
;; uncomment for less flashiness
|
||||
;; (setq lsp-eldoc-hook nil)
|
||||
;; (setq lsp-enable-symbol-highlighting nil)
|
||||
;; (setq lsp-signature-auto-activate nil)
|
||||
|
||||
;; comment to disable rustfmt on save
|
||||
(setq rustic-format-on-save t)
|
||||
(add-hook 'rustic-mode-hook 'my/dev/rustic-mode-hook))
|
||||
;; comment to disable rustfmt on save
|
||||
(setq rustic-format-on-save t)
|
||||
(add-hook 'rustic-mode-hook 'my/dev/rustic-mode-hook))
|
||||
|
||||
(defun my/dev/rustic-mode-hook ()
|
||||
;; so that run C-c C-c C-r works without having to confirm, but don't try to
|
||||
;; save rust buffers that are not file visiting. Once
|
||||
;; https://github.com/brotzeit/rustic/issues/253 has been resolved this should
|
||||
;; no longer be necessary.
|
||||
(when buffer-file-name
|
||||
(setq-local buffer-save-without-query t)))
|
||||
(defun my/dev/rustic-mode-hook ()
|
||||
;; so that run C-c C-c C-r works without having to confirm, but don't try to
|
||||
;; save rust buffers that are not file visiting. Once
|
||||
;; https://github.com/brotzeit/rustic/issues/253 has been resolved this should
|
||||
;; no longer be necessary.
|
||||
(when buffer-file-name
|
||||
(setq-local buffer-save-without-query t)))
|
||||
#+end_src
|
||||
|
||||
*** Elisp emacs-lisp
|
||||
|
|
@ -858,9 +907,20 @@ Get treemacs-lsp
|
|||
)
|
||||
#+end_src
|
||||
|
||||
*** yaml
|
||||
#+begin_src emacs-lisp
|
||||
(use-package yaml-mode
|
||||
:hook (yaml-mode . lsp))
|
||||
#+end_src
|
||||
|
||||
* Misc
|
||||
** Restart Emacs
|
||||
#+begin_src emacs-lisp
|
||||
(use-package restart-emacs)
|
||||
#+end_src
|
||||
|
||||
** Server
|
||||
#+begin_src emacs-lisp
|
||||
(unless (server-running-p) (server-start))
|
||||
#+end_src
|
||||
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ fade-exclude = [
|
|||
|
||||
# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
|
||||
# inactive-opacity = 1
|
||||
inactive-opacity = 0.8;
|
||||
inactive-opacity = 0.9;
|
||||
|
||||
# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
|
||||
# frame-opacity = 1.0
|
||||
|
|
@ -218,7 +218,7 @@ opacity-rule = [
|
|||
"99:class_g = 'LibreWolf'",
|
||||
"100:class_g = 'Thunderbird'",
|
||||
"33:class_g = 'Bspwm'",
|
||||
"95:class_g = 'Zathura'"
|
||||
"98:class_g = 'Zathura'"
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -46,7 +46,8 @@ super + Escape
|
|||
|
||||
# emacs
|
||||
super + e
|
||||
emacsclient -nc -alternate-editor=""
|
||||
emacsclient -nc -alternate-editor="emacs"
|
||||
#emacsclient -nc -alternate-editor=""
|
||||
|
||||
# show poly-bar
|
||||
super + b
|
||||
|
|
|
|||
Loading…
Reference in New Issue