From 9174eb19d0b1790032c8f12fe3723aee9a5aa030 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Thu, 4 Apr 2024 15:51:35 +0200 Subject: [PATCH] . --- home/emacs/init.el | 37 +++++++---- home/home-configuration.scm | 118 ++++++++++++++++++------------------ 2 files changed, 85 insertions(+), 70 deletions(-) diff --git a/home/emacs/init.el b/home/emacs/init.el index 2254e54..82098dd 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -81,7 +81,7 @@ (elpaca elpaca-use-package (elpaca-use-package-mode) - (setq elpaca-use-package-by-default nil)) + (setq elpaca-use-package-by-default t)) (elpaca-wait) ;;;; Personal Information Setup @@ -96,7 +96,8 @@ (use-package el-patch) ;;;;; Guix Management -(use-package guix) +(use-package guix + :after magit-popup) ;;;; Helper Functions (cl-defun conditional-keybind @@ -114,6 +115,7 @@ ;;;; Emacs (use-package emacs + :ensure nil :after org :custom (completion-cycle-threshold 10) @@ -159,6 +161,7 @@ (pixel-scroll-precision-mode 1)) (use-package gnus + :ensure nil :custom (message-send-mail-function 'message-send-mail-with-sendmail) (sendmail-program "msmtp") @@ -177,6 +180,7 @@ ) (use-package outline-minor + :ensure nil :bind (:map evil-normal-state-map ("zoc" . #'outline-cycle-buffer)) @@ -187,11 +191,10 @@ ;;;; Org Mode (use-package org + :ensure (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync") :preface (defun cc/org-local-stuff () (setq-local visual-fill-column-center-text t)) - ;; TODO: WTF was that for? - ;;:elpaca (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync") :after visual-fill-column :custom (org-babel-load-languages '((emacs-lisp . t) @@ -325,6 +328,10 @@ :hook (visual-line-mode . adaptive-wrap-prefix-mode)) +(use-package password-store) +(use-package password-store-otp + :ensure (:version (lambda (_) "0.1.5"))) + (use-package pass) ;;;; Evil Mode @@ -359,6 +366,7 @@ ;;;; Search, Completion, Execution ;;;;; Preliminary Packages (use-package savehist + :ensure nil :init (savehist-mode)) @@ -640,9 +648,11 @@ Point must be at the beginning of balanced expression (sexp)." (editorconfig-mode 1)) (use-package flymake + :ensure nil :delight '(:eval (cons "  " (flymake--mode-line-counters)))) (use-package eglot + :ensure nil :custom (eglot-connect-timeout 90) (eglot-autoshutdown t) @@ -721,6 +731,7 @@ Point must be at the beginning of balanced expression (sexp)." ;;;;;; Chicken Scheme (use-package scheme + :ensure nil :hook (scheme-mode . (lambda () (setq-local prettify-symbols-alist @@ -788,24 +799,27 @@ Point must be at the beginning of balanced expression (sexp)." ;; (setq package-install-upgrade-built-in t) ;; You must also make sure the updated version is loaded, by evaluating the `progn` form below. (use-package magit - :after transient) + :after magit-popup + :init + (progn (unload-feature 'transient t) + (require 'transient))) + +(use-package hl-todo + :ensure (:version (lambda (_) "3.6.0"))) (use-package magit-todos - :after magit + :after (magit hl-todo) :hook (magit-mode . magit-todos-mode)) +(use-package magit-popup) + (use-package forge :after magit :config (advice-add 'magit :after (lambda (&rest _args) (call-interactively #'forge-pull)))) -(use-package code-review - :after forge - :custom - (code-review-auth-login-marker 'forge)) - (use-package git-gutter :hook prog-mode @@ -828,6 +842,7 @@ Point must be at the beginning of balanced expression (sexp)." ;;;; Communication ;;;;; IRC (use-package rcirc + :ensure nil :after password-store :custom (rcirc-server-alist diff --git a/home/home-configuration.scm b/home/home-configuration.scm index 11bfad9..e79bab3 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -225,65 +225,65 @@ "xdg-dbus-proxy" "xdg-utils" - "emacs-adaptive-wrap" - "emacs-adoc-mode" - "emacs-cape" - "emacs-catppuccin-theme" - "emacs-cider@1.13.0" - ;;"emacs-code-review" - "emacs-color-theme-modern" - "emacs-consult-eglot" - "emacs-consult-notes" - "emacs-corfu" - "emacs-dhall-mode" - "emacs-editorconfig" - "emacs-eglot" - "emacs-el-patch" - "emacs-embark-consult" - "emacs-envrc" - "emacs-evil" - "emacs-evil-collection" - "emacs-evil-easymotion" - "emacs-evil-snipe" - "emacs-forge" - "emacs-geiser" - "emacs-geiser-chicken" - "emacs-geiser-guile" - "emacs-git-gutter" - "emacs-goto-chg" - "emacs-guix" - "emacs-highlight-parentheses" - "emacs-keychain-environment" - "emacs-ledger-mode" - "emacs-ligature" - "emacs-magit" - "emacs-magit-todos" - "emacs-marginalia" - "emacs-moe-theme" - "emacs-nerd-icons-completion" - "emacs-nerd-icons-corfu" - "emacs-orderless" - "emacs-org" - "emacs-org-modern" - "emacs-org-rainbow-tags" - "emacs-org-roam" - "emacs-org-roam-ui" - "emacs-paredit" - "emacs-paren-face" - "emacs-pass" - "emacs-pinentry" - "emacs-seq" - "emacs-tempel" - "emacs-transient" - "emacs-tree-sitter" - "emacs-unicode-fonts" - "emacs-vertico" - "emacs-visual-fill-column" - "emacs-websocket" - "emacs-wgrep" - "emacs-which-key" - "emacs-xref-union" - "emacs-zig-mode" + ;; "emacs-adaptive-wrap" + ;; "emacs-adoc-mode" + ;; "emacs-cape" + ;; "emacs-catppuccin-theme" + ;; "emacs-cider@1.13.0" + ;; ;;"emacs-code-review" + ;; "emacs-color-theme-modern" + ;; "emacs-consult-eglot" + ;; "emacs-consult-notes" + ;; "emacs-corfu" + ;; "emacs-dhall-mode" + ;; "emacs-editorconfig" + ;; "emacs-eglot" + ;; "emacs-el-patch" + ;; "emacs-embark-consult" + ;; "emacs-envrc" + ;; "emacs-evil" + ;; "emacs-evil-collection" + ;; "emacs-evil-easymotion" + ;; "emacs-evil-snipe" + ;; "emacs-forge" + ;; "emacs-geiser" + ;; "emacs-geiser-chicken" + ;; "emacs-geiser-guile" + ;; "emacs-git-gutter" + ;; "emacs-goto-chg" + ;; "emacs-guix" + ;; "emacs-highlight-parentheses" + ;; "emacs-keychain-environment" + ;; "emacs-ledger-mode" + ;; "emacs-ligature" + ;; "emacs-magit" + ;; "emacs-magit-todos" + ;; "emacs-marginalia" + ;; "emacs-moe-theme" + ;; "emacs-nerd-icons-completion" + ;; "emacs-nerd-icons-corfu" + ;; "emacs-orderless" + ;; "emacs-org" + ;; "emacs-org-modern" + ;; "emacs-org-rainbow-tags" + ;; "emacs-org-roam" + ;; "emacs-org-roam-ui" + ;; "emacs-paredit" + ;; "emacs-paren-face" + ;; "emacs-pass" + ;; "emacs-pinentry" + ;; "emacs-seq" + ;; "emacs-tempel" + ;; "emacs-transient" + ;; "emacs-tree-sitter" + ;; "emacs-unicode-fonts" + ;; "emacs-vertico" + ;; "emacs-visual-fill-column" + ;; "emacs-websocket" + ;; "emacs-wgrep" + ;; "emacs-which-key" + ;; "emacs-xref-union" + ;; "emacs-zig-mode" ;; "emacs-corfu-terminal" ))) (service home-openssh-service-type