From 54a1298000a0b701cd724e2e69b219472cb70178 Mon Sep 17 00:00:00 2001 From: janis Date: Tue, 28 Jul 2026 03:43:03 +0200 Subject: [PATCH] attempt to fix many things --- init.org | 67 ++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/init.org b/init.org index deea447..babbf43 100644 --- a/init.org +++ b/init.org @@ -473,8 +473,16 @@ Honestly not very happy with this at the moment, but it's kind of hacked togethe #+end_src * Packages -** =general.el = +** COMMENT ESUP +#+begin_src emacs-lisp +(use-package esup + :straight t + :config + (setopt esup-user-init-file "~/init.el" + esup-depth 1)) +#+end_src +** =general.el = TODO: figure out how to get which-key to correctly display the ‘m‘ label #+begin_src emacs-lisp @@ -618,7 +626,16 @@ Todo: figure out how best to use =image-dired=. ("" . dired-up-directory) ("" . dired-subtree-toggle) ("TAB" . dired-subtree-toggle) - ("C-TAB" . dired-subtree-remove)) + ("C-TAB" . dired-subtree-remove) + ("#" . dired-omit-mode) + ("+" . nemo/dired-create-file-or-directory)) + :general + (general-def + :states '(normal visual) + :keymaps 'override + :major-modes 'dired-mode + "#" '("Toggle Dotfiles" . dired-omit-mode) + "+" '("Create File/Directory" . nemo/dired-create-file-or-directory)) :init (define-prefix-command 'nemo/dired-map) (leader-major-def :keymaps 'dired-mode-map @@ -626,7 +643,9 @@ Todo: figure out how best to use =image-dired=. :config (general-def :keymaps 'nemo/dired-map - "p" '("Preview Files" . dired-preview-mode)) + "p" '("Preview Files" . dired-preview-mode) + "+" '("Create File/Directory" . nemo/dired-create-file-or-directory) + "#" '("Toggle Dotfiles" . dired-omit-mode)) (setopt dired-compress-directory-default-suffix ".tar.zst" dired-create-destination-dirs 'always @@ -651,9 +670,6 @@ Todo: figure out how best to use =image-dired=. (bound-and-true-p dired-omit-mode) (dired-omit-expunge)))) :config - (general-def '(emacs normal) 'dired-mode-map - "#" 'dired-omit-mode - "+" 'nemo/dired-create-file-or-directory) ) @@ -1106,6 +1122,7 @@ End =:config= Install various export packages: #+begin_src emacs-lisp (use-package ox-epub + :defer t :straight t) #+end_src @@ -1797,7 +1814,7 @@ I feel so bad for this.. but its not awful.. ) #+end_src -** Yasnippet +** COMMENT Yasnippet Auto-completion requires yasnippet for some competions, such as function arguments and parens. #+begin_src emacs-lisp (use-package yasnippet @@ -1806,6 +1823,7 @@ Auto-completion requires yasnippet for some competions, such as function argumen :hook ((prog-mode text-mode) . yas-minor-mode)) (use-package yasnippet-snippets + :defer t :straight t) #+end_src @@ -2132,11 +2150,12 @@ Make lsp use plists instead of hash-tables: #+end_src hlsl-mode: #+begin_src emacs-lisp -(require 'hlsl-mode) -(with-eval-after-load 'hlsl-mode +(use-package hlsl-mode + :straight nil + :defer t + :config (add-to-list 'auto-mode-alist '("\\.hlsl\\'" . hlsl-mode)) - (add-to-list 'auto-mode-alist '("\\.frag\\'" . hlsl-mode)) - ) + (add-to-list 'auto-mode-alist '("\\.frag\\'" . hlsl-mode))) #+end_src *** =slang-mode=: @@ -2538,6 +2557,32 @@ Use =nix-mode= to edit nix files: ) #+end_src +** Guile +#+begin_src emacs-lisp +(use-package scheme + :straight nil + :mode ("\\.scm\\'" . scheme-mode) + :hook (scheme-mode . eglot-ensure) + + :config + (add-to-list 'eglot-server-programs '(scheme-mode . ("guile-lsp-server")))) + +(use-package geiser + :deter t + :custom + (geiser-active-implementations '(guile))) + +(use-package geiser-guile + :deter t + :after geiser + :custom + (geiser-guile-binary "guile")) + +(use-package paredit + :hook ((scheme-mode . enable-paredit-mode) + (geiser-repl-mode . enable-paredit-mode))) +#+end_src + * User Functions =PascalCase= to =snake_case=: #+begin_src emacs-lisp