From ba8ef4f585e3474ce77199a0c9f72b8383708161 Mon Sep 17 00:00:00 2001 From: Joe Frikker Date: Thu, 9 Jul 2026 23:36:36 -0400 Subject: [PATCH] wip --- home.org | 84 +++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/home.org b/home.org index e9e9e2b..93e16fa 100644 --- a/home.org +++ b/home.org @@ -790,12 +790,13 @@ These are just some general settings that apply everywhere. First, a few package programs.emacs = { enable = true; extraPackages = epkgs: with epkgs; [ + ace-window doom-modeline + free-keys ligature mixed-pitch - ace-window - popper perspective + popper ]; extraConfig = builtins.readFile ./emacs-global.el; }; @@ -807,6 +808,7 @@ Turn off some default settings that I don't find useful. #+BEGIN_SRC elisp (setopt inhibit-startup-screen t) (setopt initial-scratch-message nil) + (setopt sentence-end-double-space nil) (menu-bar-mode -1) (scroll-bar-mode -1) (tool-bar-mode -1) @@ -818,6 +820,15 @@ Turn off some default settings that I don't find useful. display-buffer-in-previous-window display-buffer-use-some-window))) (setopt view-read-only t) + (setopt save-interprogram-paste-before-kill t) + (setopt kill-whole-line t) + (delete-selection-mode t) + (column-number-mode t) + (setopt auto-save-default nil) + (setopt create-lockfiles nil) + + (setopt mouse-wheel-tilt-scroll t) + (setq-default truncate-lines t) #+END_SRC Make sure which-key mode is always on. The on-the-fly keymap help it gives is indespensable. @@ -1018,12 +1029,17 @@ content to be. when height do (progn (window-resize child (- height (window-height child))) (window-preserve-size child nil t)))))))) + (require 'perspective) + (setopt persp-mode-prefix-key (kbd "C-x t")) + (setopt persp-show-modestring nil) + (persp-mode) + (setopt popper-reference-buffers '("\\*Flymake diagnostics .*" "\\*Embark Export: .*" "\\*Embark Collect .*" "\\*xref\\*" - ("\\*compilation\\*" . hide) + "\\*compilation\\*" "\\*sly-mrepl *" "\\*Messages\\*" "\\*lispy-message\\*" @@ -1045,18 +1061,14 @@ content to be. "\\*List .*" "\\*eldoc\\*")) (setopt popper-display-control nil) + (setopt popper-group-function 'popper-group-by-perspective) (popper-mode) (popper-echo-mode) - (bind-keys ("C-z" . popper-toggle) + (bind-keys ("C-q" . popper-toggle) ("C-;" . popper-cycle)) - (require 'perspective) - (setopt persp-mode-prefix-key (kbd "C-x t")) - (setopt persp-show-modestring nil) - (persp-mode) - (setq display-buffer-alist '(((or "\\*Flymake diagnostics .*" "\\*Embark Export: .*" @@ -1091,7 +1103,7 @@ content to be. (display-buffer-in-side-window) (side . right) (slot . 0) - (window-width . 101) + (window-width . 93) (window-height . jf/enforce-right-side-heights) (preserve-size . (t . nil)) (window-parameters (no-delete-other-windows . t) @@ -1101,7 +1113,7 @@ content to be. (display-buffer-in-side-window) (side . right) (slot . -1) - (window-width . 101) + (window-width . 93) (window-height . jf/enforce-right-side-heights) (preserve-size . (t . t)) (window-parameters (no-delete-other-windows . t) @@ -1200,10 +1212,13 @@ his article. (avy-goto-char-timer))) (bind-keys - ("M-j" . avy-goto-char-timer) - ("C-c j" . avy-goto-char-timer) - ("M-J" . avy-goto-char-timer-embark) - ("C-." . embark-act)) + ("C-j" . avy-goto-char-timer) + ("M-j" . avy-goto-char-timer-embark) + ("C-." . embark-act) + :map lispy-mode-map + ("C-j" . avy-goto-char-timer) + :map org-mode-map + ("C-j" . avy-goto-char-timer)) #+END_SRC Just "silently" wrap when searching at the bottom of a document. @@ -1298,6 +1313,7 @@ Just "silently" wrap when searching at the bottom of a document. # lispyville lua-mode nix-mode + prisma-ts-mode rust-mode sly sly-macrostep @@ -1328,6 +1344,7 @@ Just "silently" wrap when searching at the bottom of a document. g.tree-sitter-nix g.tree-sitter-org g.tree-sitter-php + g.tree-sitter-prisma g.tree-sitter-python g.tree-sitter-rust g.tree-sitter-rust-format-args @@ -1365,7 +1382,7 @@ Show a vertical bar 100 characters out; ideally I don't want lines longer than t is about the max you can have and still fit two files side-by-side on the screen. #+begin_src elisp - (setq-default fill-column 100) + (setq-default fill-column 120) (defun jf-init-fill-column () (display-fill-column-indicator-mode 1)) @@ -1494,10 +1511,10 @@ for completion. That makes it really annoying to use; don't use yasnippet with e *** Typescript #+BEGIN_SRC elisp - (push '("\\.ts\\'" . typescript-mode) auto-mode-alist) - (push '(typescript-mode . typescript-ts-mode) major-mode-remap-alist) - (push '("\\.tsx\\'" . tsx-mode) auto-mode-alist) - (push '(tsx-mode . tsx-ts-mode) major-mode-remap-alist) + (add-to-list 'auto-mode-alist '("\\.ts\\'" . typescript-mode)) + (add-to-list 'major-mode-remap-alist '(typescript-mode . typescript-ts-mode)) + (add-to-list 'auto-mode-alist '("\\.tsx\\'" . tsx-mode)) + (add-to-list 'major-mode-remap-alist '(tsx-mode . tsx-ts-mode)) (setopt typescript-ts-mode-indent-offset 2) (with-eval-after-load 'typescript-ts-mode (defun my-tsx-ts-mode--indent-compatibility-b893426 () @@ -1743,6 +1760,7 @@ for completion. That makes it really annoying to use; don't use yasnippet with e (eval-when-compile (require 'consult)) + (require 'perspective) (with-eval-after-load 'consult (consult-customize consult-theme :preview-key '(:debounce 0.2 any) @@ -1750,10 +1768,11 @@ for completion. That makes it really annoying to use; don't use yasnippet with e consult-bookmark consult-recent-file consult-xref consult-source-bookmark consult-source-file-register consult-source-recent-file - consult-source-buffer :hidden t :default nil + consult-source-buffer ;; :preview-key "M-." consult-source-project-recent-file :preview-key '(:debounce 0.4 any)) + (consult-customize consult-source-buffer :hidden t :default nil) (add-to-list 'consult-buffer-sources persp-consult-source)) (setopt consult-narrow-key "<") ;; "C-+" @@ -1955,29 +1974,6 @@ for completion. That makes it really annoying to use; don't use yasnippet with e (setopt slack-buffer-function #'switch-to-buffer) #+END_SRC -** Kubernetes -:PROPERTIES: -:header-args:elisp: :tangle target/desktop/emacs-kubernetes.el -:END: - -#+BEGIN_SRC nix :tangle target/desktop/emacs-kubernetes.nix - { - programs.emacs = { - enable = true; - extraPackages = epkgs: with epkgs; [ - kubed - ]; - extraConfig = builtins.readFile ./emacs-kubernetes.el; - }; - } -#+END_SRC - -#+BEGIN_SRC elisp - (use-package kubed - :bind-keymap - ("s-k" . kubed-prefix-map)) -#+END_SRC - ** Ledger #+BEGIN_SRC nix :tangle target/desktop/emacs-ledger.nix