main
Michael Fiano 7 months ago
parent 2bbd274646
commit f4f46595ee
Signed by: mfiano
GPG Key ID: F87DF4666D70FC63
  1. 2
      early-init.el
  2. 3
      lisp/mf-key-bindings.el
  3. 3
      lisp/mf-pkg-builtin.el
  4. 7
      lisp/mf-pkg-completion.el
  5. 2
      lisp/mf-pkg-editing.el
  6. 9
      lisp/mf-pkg-lang-common-lisp.el
  7. 20
      lisp/mf-pkg-lang-org.el
  8. 8
      lisp/mf-pkg-project.el
  9. 41
      lisp/mf-pkg-ui.el
  10. 2
      lisp/mf-pkg-util.el
  11. 26
      lisp/mf-pkg-window.el
  12. 22
      lisp/mf-settings.el

@ -32,7 +32,7 @@
(setq frame-inhibit-implied-resize t)
(setq frame-resize-pixelwise t)
(setq truncate-partial-width-windows nil)
(add-to-list 'default-frame-alist '(font . "Iosevka Slab 11"))
(add-to-list 'default-frame-alist '(font . "Iosevka Slab 10"))
(blink-cursor-mode 0)
(column-number-mode 1)
(display-time-mode 0)

@ -15,8 +15,7 @@
(define-keys
[S-insert] #'mf/yank-primary-selection
[remap move-beginning-of-line] #'mf/smarter-move-beginning-of-line
[remap evil-beginning-of-line] #'mf/smarter-move-beginning-of-line
[remap newline] #'newline-and-indent)
[remap evil-beginning-of-line] #'mf/smarter-move-beginning-of-line)
(define-keys 'special-mode-map
"q" #'quit-window)

@ -9,6 +9,9 @@
(auto-fill-mode 1))))
(:hide-mode auto-fill-function)))
(setup auto-save-visited-mode
(auto-save-visited-mode 1))
(setup (:require autorevert)
(setq auto-revert-check-vc-info t)
(setq auto-revert-remote-files t)

@ -18,11 +18,14 @@
(:hide-mode))
(setup (:pkg consult)
(setq consult-async-min-input 2)
(setq consult-preview-key (kbd "M-."))
(setq xref-show-definitions-function #'consult-xref)
(setq xref-show-xrefs-function #'consult-xref)
(advice-add #'completing-read-multiple
:override #'consult-completing-read-multiple)
(:load-after projectile
(setq consult-project-root-function #'projectile-project-root))
(:load-after vertico
(setq completion-in-region-function
(lambda (&rest args)
@ -77,6 +80,8 @@
(:also-load vertico-repeat)
(setq vertico-count 15)
(setq vertico-resize t)
(vertico-mode 1))
(vertico-mode 1)
(:with-hook minibuffer-setup-hook
(:hook vertico-repeat-save)))
(provide 'mf-pkg-completion)

@ -1,7 +1,7 @@
;;;; -*- lexical-binding: t; -*-
(setup (:pkg aggressive-indent)
(:hook-into prog-mode sly-mrepl-mode)
(:hook-into prog-mode)
(:hide-mode))
(setup (:pkg avy)

@ -2,7 +2,8 @@
(defvar mf/cl-implementations
'((sbcl ("sbcl.sh"))
(sbcl-renderdoc ("sbcl-renderdoc.sh"))))
(sbcl-renderdoc ("sbcl-renderdoc.sh"))
(ccl ("ccl"))))
(defvar mf/clhs-dir
(file-name-as-directory (expand-file-name "~/.data/common-lisp/clhs")))
@ -21,6 +22,7 @@
(setq sly-enable-evaluate-in-emacs t)
(setq sly-kill-without-query-p t)
(setq sly-lisp-implementations mf/cl-implementations)
(setq sly-lisp-indent-maximum-backtracking 64)
(setq sly-mrepl-history-file-name (mf/etc-file "sly-repl-history"))
(setq sly-mrepl-pop-sylvester nil)
(setq sly-mrepl-prevent-duplicate-history 'move)
@ -28,7 +30,7 @@
(:with-map sly-mrepl-mode-map
(:with-state insert
(:bind
[S-return] newline-and-indent
[S-return] newline
[up] sly-mrepl-previous-input-or-button
[down] sly-mrepl-next-input-or-button)))
(:with-map sly-inspector-mode-map
@ -51,6 +53,9 @@
(setup lisp-mode
(:load-after sly
(define-normal-keys lisp-mode-map
"gb" #'sly-pop-find-definition-stack
"gd" #'sly-edit-definition)
(define-local-keys lisp-mode-map
"'" '(sly :wk "sly")
";" `(mf/sly-ask :wk "sly (ask)"))

@ -114,14 +114,6 @@
(org-indent-mode 1)
(:hide-mode)))
(setup (:pkg (org-roam :files (:defaults "extensions/*")))
(setq org-roam-v2-ack t)
(:load-after org
(setq org-roam-completion-everywhere t)
(setq org-roam-directory
(file-name-as-directory (expand-file-name "Roam" mf/dir-notes)))
(org-roam-db-autosync-mode 1)))
(setup (:pkg org-superstar)
(:load-after org
(setq org-superstar-headline-bullets-list '("" "" "" "" "" "" ""))
@ -143,16 +135,4 @@
"i" '(org-id-get-create :wk "add id")
"t" '(org-set-tags-command :wk "add tags"))
(define-local-keys org-mode-map
:infix "r"
"" '(:ignore t :wk "roam")
"a" '(org-roam-alias-add :wk "add alias")
"A" '(org-roam-alias-remove :wk "remove alias")
"b" '(org-roam-buffer-toggle :wk "toggle buffer")
"B" '(org-roam-buffer-display-dedicated :wk "show dedicated buffer")
"f" '(org-roam-node-find :wk "find node")
"i" '(org-roam-node-insert :wk "add node")
"r" '(org-roam-ref-add :wk "add reference")
"R" '(org-roam-ref-add :wk "remove reference"))
(provide 'mf-pkg-lang-org)

@ -38,7 +38,7 @@
(setup (:pkg perspective)
(setq persp-modestring-short t)
(setq persp-show-modestring t)
(setq persp-sort 'created)
(setq persp-sort 'name)
(setq persp-state-default-file (mf/etc-file "perspectives"))
(setq persp-switch-wrap nil)
(persp-mode 1)
@ -54,6 +54,12 @@
"M-9" (fn! (persp-switch-by-number 9))))
(setup (:pkg projectile)
(setf projectile-project-search-path
'(("~/Projects/Lisp/maintained" . 1)
("~/Projects/Lisp/maintained" . 2)
("~/Projects/Lisp/maintained" . 3)
("~/Projects/Lisp/maintained" . 4)
("~/Projects/Lisp/maintained" . 5)))
(setq projectile-cache-file (mf/etc-file "projectile.cache"))
(setq projectile-kill-buffers-filter 'kill-only-files)
(setq projectile-known-projects-file (mf/etc-file "projectile-bookmarks"))

@ -11,43 +11,6 @@
(:with-mode dired-mode
(:hook all-the-icons-dired-mode))))
(setup (:pkg centaur-tabs)
(:require centaur-tabs)
(setq centaur-tabs-adjust-buffer-order t)
(setq centaur-tabs-cycle-scope 'tabs)
(setq centaur-tabs-gray-out-icons 'buffer)
(setq centaur-tabs-height 28)
(setq centaur-tabs-modified-marker "")
(setq centaur-tabs-set-close-button nil)
(setq centaur-tabs-set-icons t)
(setq centaur-tabs-set-modified-marker t)
(setq centaur-tabs-show-new-tab-button nil)
(setq centaur-tabs-style "rounded")
(centaur-tabs-group-by-projectile-project)
(centaur-tabs-headline-match)
(centaur-tabs-mode 1)
(:bind
"M-[" centaur-tabs-backward
"M-]" centaur-tabs-forward)
(:with-hook window-setup-hook
(:hook (fn (centaur-tabs-change-fonts "Iosevka Slab" 120))))
(defun centaur-tabs-hide-tab (x)
(let ((name (format "%s" x)))
(or (window-dedicated-p (selected-window))
(string-prefix-p "*Messages*" name)
(string-prefix-p "*scratch" name)
(string-prefix-p "*Compile-Log*" name)
(string-prefix-p "*company" name)
(string-prefix-p "*Flycheck" name)
(string-prefix-p "*tramp" name)
(string-prefix-p " *Mini" name)
(string-prefix-p "*help" name)
(string-prefix-p "*straight" name)
(string-prefix-p "*sly" name)
(string-prefix-p " *temp" name)
(string-prefix-p "*Help" name)
(string-prefix-p "magit" name)))))
(setup (:pkg default-text-scale)
(:bind
"M--" default-text-scale-decrease
@ -57,7 +20,6 @@
(setup (:pkg diff-hl)
(global-diff-hl-mode 1)
(diff-hl-flydiff-mode 1)
(:with-mode dired-mode
(:hook diff-hl-dired-mode))
(:with-after magit
@ -77,6 +39,9 @@
(setq doom-modeline-height 30)
(setq doom-modeline-major-mode-icon t)
(setq doom-modeline-minor-modes t)
(:with-hook window-setup-hook
(:hook (fn (set-face-attribute
'mode-line nil :family "Iosevka Slab" :height 100))))
(:hook-into window-setup))
(setup (:pkg doom-themes)

@ -13,6 +13,8 @@
(:load-after evil
(general-create-definer define-keys
:states '(normal motion visual insert emacs))
(general-create-definer define-normal-keys
:states '(normal))
(general-create-definer define-leader-keys
:states '(normal visual insert eemacs)
:prefix "SPC"

@ -14,25 +14,25 @@
(setq popper-group-function nil)
(setq popper-mode-line nil)
(setq popper-reference-buffers
'(compilation-mode
help-mode
'(help-mode
helpful-mode
org-roam-mode
sly-mrepl-mode
term-mode))
(popper-mode 1))
(setup (:pkg shackle)
(let ((git '(magit-status-mode))
(help '(help-mode helpful-mode))
(org '(org-roam-mode))
(repl "\\*\\(sly-mrepl\\|ielm\\)"))
(setq shackle-rules
`((,git :select t :align right :size 0.5)
(,help :select t :align right :size 0.4)
(,org :noselect t :align right :size 0.33)
(,repl :regexp t :noselect t :align below :size 0.4)))
(shackle-mode 1)))
(setq shackle-rules
`((compilation-mode
:select t :align right :size 0.33)
(magit-status-mode
:select t :align right :size 0.5)
((help-mode helpful-mode)
:select t :align right :size 0.4)
(sly-inspector-mode
:select t :align right :size 0.5)
((sly-xref-mode "\\*\\(sly-mrepl\\|ielm\\)")
:regexp t :noselect t :align below :size 0.25)))
(shackle-mode 1))
(setup (:pkg windmove)
(windmove-default-keybindings))

@ -1,5 +1,7 @@
;;;; -*- lexical-binding: t; -*-
(defvar mf/data-dir (file-name-as-directory (expand-file-name "~/.data/emacs")))
(setup appearance
(setq blink-matching-paren nil)
(setq display-time-default-load-average nil)
@ -44,15 +46,19 @@
(setup files
(setq auto-mode-case-fold nil)
(setq auto-save-default nil)
(setq auto-save-default t)
(setq auto-save-file-name-transforms `((".*" ,(expand-file-name "auto-save/" mf/data-dir) t)))
(setq auto-save-interval 32)
(setq auto-save-list-file-prefix nil)
(setq backup-inhibited t)
(setq auto-save-timeout 10)
(setq backup-directory-alist `((".*" . ,(expand-file-name "backup/" mf/data-dir))))
(setq backup-inhibited nil)
(setq create-lockfiles nil)
(setq delete-by-moving-to-trash nil)
(setq find-file-suppress-same-file-warnings t)
(setq find-file-visit-truename t)
(setq load-prefer-newer t)
(setq make-backup-files nil)
(setq make-backup-files t)
(setq require-final-newline t)
(setq vc-follow-symlinks t))
@ -91,7 +97,7 @@
(setq ring-bell-function 'ignore)
(setq user-full-name "Michael Fiano")
(setq user-mail-address "mail@mfiano.net")
(setq-default fill-column 80)
(setq-default fill-column 100)
(setq-default lexical-binding t))
(setup mouse
@ -110,11 +116,9 @@
(setq initial-scratch-message nil))
(setup scrolling
(setq auto-hscroll-mode 'current-line)
(setq auto-hscroll-mode t)
(setq auto-window-vscroll nil)
(setq fast-but-imprecise-scrolling t)
(setq hscroll-margin 16)
(setq hscroll-step 1)
(setq scroll-conservatively 101)
(setq scroll-margin 8)
(setq scroll-preserve-screen-position t)
@ -129,9 +133,9 @@
(setup windows
(setq split-height-threshold nil)
(setq split-width-threshold 160)
(setq window-divider-default-bottom-width 2)
(setq window-divider-default-bottom-width 8)
(setq window-divider-default-places t)
(setq window-divider-default-right-width 2)
(setq window-divider-default-right-width 8)
(setq window-resize-pixelwise nil))
(setup whitespace

Loading…
Cancel
Save