This commit is contained in:
Daniel Ziltener 2024-04-04 15:51:35 +02:00
parent 3c79ebc47f
commit 9174eb19d0
Signed by: zilti
GPG key ID: B38976E82C9DAE42
2 changed files with 85 additions and 70 deletions

View file

@ -81,7 +81,7 @@
(elpaca elpaca-use-package (elpaca elpaca-use-package
(elpaca-use-package-mode) (elpaca-use-package-mode)
(setq elpaca-use-package-by-default nil)) (setq elpaca-use-package-by-default t))
(elpaca-wait) (elpaca-wait)
;;;; Personal Information Setup ;;;; Personal Information Setup
@ -96,7 +96,8 @@
(use-package el-patch) (use-package el-patch)
;;;;; Guix Management ;;;;; Guix Management
(use-package guix) (use-package guix
:after magit-popup)
;;;; Helper Functions ;;;; Helper Functions
(cl-defun conditional-keybind (cl-defun conditional-keybind
@ -114,6 +115,7 @@
;;;; Emacs ;;;; Emacs
(use-package emacs (use-package emacs
:ensure nil
:after org :after org
:custom :custom
(completion-cycle-threshold 10) (completion-cycle-threshold 10)
@ -159,6 +161,7 @@
(pixel-scroll-precision-mode 1)) (pixel-scroll-precision-mode 1))
(use-package gnus (use-package gnus
:ensure nil
:custom :custom
(message-send-mail-function 'message-send-mail-with-sendmail) (message-send-mail-function 'message-send-mail-with-sendmail)
(sendmail-program "msmtp") (sendmail-program "msmtp")
@ -177,6 +180,7 @@
) )
(use-package outline-minor (use-package outline-minor
:ensure nil
:bind :bind
(:map evil-normal-state-map (:map evil-normal-state-map
("zoc" . #'outline-cycle-buffer)) ("zoc" . #'outline-cycle-buffer))
@ -187,11 +191,10 @@
;;;; Org Mode ;;;; Org Mode
(use-package org (use-package org
:ensure (:repo "https://git.savannah.gnu.org/git/emacs/org-mode.git" :branch "emacs-sync")
:preface :preface
(defun cc/org-local-stuff () (defun cc/org-local-stuff ()
(setq-local visual-fill-column-center-text t)) (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 :after visual-fill-column
:custom :custom
(org-babel-load-languages '((emacs-lisp . t) (org-babel-load-languages '((emacs-lisp . t)
@ -325,6 +328,10 @@
:hook :hook
(visual-line-mode . adaptive-wrap-prefix-mode)) (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) (use-package pass)
;;;; Evil Mode ;;;; Evil Mode
@ -359,6 +366,7 @@
;;;; Search, Completion, Execution ;;;; Search, Completion, Execution
;;;;; Preliminary Packages ;;;;; Preliminary Packages
(use-package savehist (use-package savehist
:ensure nil
:init :init
(savehist-mode)) (savehist-mode))
@ -640,9 +648,11 @@ Point must be at the beginning of balanced expression (sexp)."
(editorconfig-mode 1)) (editorconfig-mode 1))
(use-package flymake (use-package flymake
:ensure nil
:delight '(:eval (cons "" (flymake--mode-line-counters)))) :delight '(:eval (cons "" (flymake--mode-line-counters))))
(use-package eglot (use-package eglot
:ensure nil
:custom :custom
(eglot-connect-timeout 90) (eglot-connect-timeout 90)
(eglot-autoshutdown t) (eglot-autoshutdown t)
@ -721,6 +731,7 @@ Point must be at the beginning of balanced expression (sexp)."
;;;;;; Chicken Scheme ;;;;;; Chicken Scheme
(use-package scheme (use-package scheme
:ensure nil
:hook :hook
(scheme-mode . (lambda () (scheme-mode . (lambda ()
(setq-local prettify-symbols-alist (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) ;; (setq package-install-upgrade-built-in t)
;; You must also make sure the updated version is loaded, by evaluating the `progn` form below. ;; You must also make sure the updated version is loaded, by evaluating the `progn` form below.
(use-package magit (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 (use-package magit-todos
:after magit :after (magit hl-todo)
:hook :hook
(magit-mode . magit-todos-mode)) (magit-mode . magit-todos-mode))
(use-package magit-popup)
(use-package forge (use-package forge
:after magit :after magit
:config :config
(advice-add 'magit :after (lambda (&rest _args) (advice-add 'magit :after (lambda (&rest _args)
(call-interactively #'forge-pull)))) (call-interactively #'forge-pull))))
(use-package code-review
:after forge
:custom
(code-review-auth-login-marker 'forge))
(use-package git-gutter (use-package git-gutter
:hook :hook
prog-mode prog-mode
@ -828,6 +842,7 @@ Point must be at the beginning of balanced expression (sexp)."
;;;; Communication ;;;; Communication
;;;;; IRC ;;;;; IRC
(use-package rcirc (use-package rcirc
:ensure nil
:after password-store :after password-store
:custom :custom
(rcirc-server-alist (rcirc-server-alist

View file

@ -225,65 +225,65 @@
"xdg-dbus-proxy" "xdg-dbus-proxy"
"xdg-utils" "xdg-utils"
"emacs-adaptive-wrap" ;; "emacs-adaptive-wrap"
"emacs-adoc-mode" ;; "emacs-adoc-mode"
"emacs-cape" ;; "emacs-cape"
"emacs-catppuccin-theme" ;; "emacs-catppuccin-theme"
"emacs-cider@1.13.0" ;; "emacs-cider@1.13.0"
;;"emacs-code-review" ;; ;;"emacs-code-review"
"emacs-color-theme-modern" ;; "emacs-color-theme-modern"
"emacs-consult-eglot" ;; "emacs-consult-eglot"
"emacs-consult-notes" ;; "emacs-consult-notes"
"emacs-corfu" ;; "emacs-corfu"
"emacs-dhall-mode" ;; "emacs-dhall-mode"
"emacs-editorconfig" ;; "emacs-editorconfig"
"emacs-eglot" ;; "emacs-eglot"
"emacs-el-patch" ;; "emacs-el-patch"
"emacs-embark-consult" ;; "emacs-embark-consult"
"emacs-envrc" ;; "emacs-envrc"
"emacs-evil" ;; "emacs-evil"
"emacs-evil-collection" ;; "emacs-evil-collection"
"emacs-evil-easymotion" ;; "emacs-evil-easymotion"
"emacs-evil-snipe" ;; "emacs-evil-snipe"
"emacs-forge" ;; "emacs-forge"
"emacs-geiser" ;; "emacs-geiser"
"emacs-geiser-chicken" ;; "emacs-geiser-chicken"
"emacs-geiser-guile" ;; "emacs-geiser-guile"
"emacs-git-gutter" ;; "emacs-git-gutter"
"emacs-goto-chg" ;; "emacs-goto-chg"
"emacs-guix" ;; "emacs-guix"
"emacs-highlight-parentheses" ;; "emacs-highlight-parentheses"
"emacs-keychain-environment" ;; "emacs-keychain-environment"
"emacs-ledger-mode" ;; "emacs-ledger-mode"
"emacs-ligature" ;; "emacs-ligature"
"emacs-magit" ;; "emacs-magit"
"emacs-magit-todos" ;; "emacs-magit-todos"
"emacs-marginalia" ;; "emacs-marginalia"
"emacs-moe-theme" ;; "emacs-moe-theme"
"emacs-nerd-icons-completion" ;; "emacs-nerd-icons-completion"
"emacs-nerd-icons-corfu" ;; "emacs-nerd-icons-corfu"
"emacs-orderless" ;; "emacs-orderless"
"emacs-org" ;; "emacs-org"
"emacs-org-modern" ;; "emacs-org-modern"
"emacs-org-rainbow-tags" ;; "emacs-org-rainbow-tags"
"emacs-org-roam" ;; "emacs-org-roam"
"emacs-org-roam-ui" ;; "emacs-org-roam-ui"
"emacs-paredit" ;; "emacs-paredit"
"emacs-paren-face" ;; "emacs-paren-face"
"emacs-pass" ;; "emacs-pass"
"emacs-pinentry" ;; "emacs-pinentry"
"emacs-seq" ;; "emacs-seq"
"emacs-tempel" ;; "emacs-tempel"
"emacs-transient" ;; "emacs-transient"
"emacs-tree-sitter" ;; "emacs-tree-sitter"
"emacs-unicode-fonts" ;; "emacs-unicode-fonts"
"emacs-vertico" ;; "emacs-vertico"
"emacs-visual-fill-column" ;; "emacs-visual-fill-column"
"emacs-websocket" ;; "emacs-websocket"
"emacs-wgrep" ;; "emacs-wgrep"
"emacs-which-key" ;; "emacs-which-key"
"emacs-xref-union" ;; "emacs-xref-union"
"emacs-zig-mode" ;; "emacs-zig-mode"
;; "emacs-corfu-terminal" ;; "emacs-corfu-terminal"
))) )))
(service home-openssh-service-type (service home-openssh-service-type