Compare commits

..

No commits in common. "fc9b7def0e832e56a018c02f40821d36016c85b5" and "804c8b1862636ac82a83bb0ff05432f20f6c944c" have entirely different histories.

4 changed files with 47 additions and 97 deletions

View File

@ -3,37 +3,47 @@
;;; ;;;
;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; SPDX-License-Identifier: GPL-3.0-or-later
;; TODO:
;; 1. Configure geiser. Take a look at guile-studio.
;; 2. Make use of guix: comments.
;;; ;;;
;;; Init ;;; Init
;;; ;;;
(use-package emacs
:custom
(blink-cursor-mode nil)
(browse-url-firefox-program "librewolf")
(completion-ignore-case t)
(enable-recursive-minibuffers t)
(fringe-mode 0)
(global-completion-preview-mode t)
(indent-tabs-mode nil)
(pixel-scroll-precision-mode t)
(read-buffer-completion-ignore-case t)
(read-extended-command-predicate 'command-completion-default-include-p)
(read-file-name-completion-ignore-case t)
(scroll-bar-mode nil)
(shell-file-name "/bin/sh")
(tool-bar-mode nil)
(tooltip-mode nil)
(word-wrap-by-category t)
(modus-themes-italic-constructs t)
:init
(setopt custom-file (locate-user-emacs-file "custom.el")) (setopt custom-file (locate-user-emacs-file "custom.el"))
(if (not (file-exists-p custom-file)) (if (not (file-exists-p custom-file))
(make-empty-file custom-file) (make-empty-file custom-file)
(load custom-file)) (load custom-file))
(gcmh-mode 1)
(no-littering-theme-backups)
(load-file (locate-user-emacs-file "fonts.el")) (load-file (locate-user-emacs-file "fonts.el"))
;; Tweak garbage collection strategy.
;;guix:emacs-gcmh
(use-package gcmh
:config :config
(gcmh-mode 1)) (setopt electric-indent-inhibit t)
:hook
;; Set default storage locations for various packages. ((after-init . electric-pair-mode)
;;guix:emacs-no-littering (after-init . menu-bar-mode)
(use-package no-littering (after-init . minibuffer-depth-indicate-mode)
:config (after-init . savehist-mode)
(no-littering-theme-backups)) (before-save . delete-trailing-whitespace)
(prog-mode . display-fill-column-indicator-mode))
(use-package emacs :bind (([remap list-buffers] . switch-to-buffer)))
:custom
(shell-file-name "/bin/sh") ;Workaround to use fish as login shell.
(word-wrap-by-category t)) ;CJK support.
;;; ;;;
@ -42,45 +52,10 @@
(use-package emacs (use-package emacs
:custom :custom
(blink-cursor-mode nil)
(browse-url-firefox-program "librewolf")
(enable-recursive-minibuffers t)
;; Scrolling enhancement.
(pixel-scroll-precision-mode t)
;; Exclude unavailable completions.
(read-extended-command-predicate 'command-completion-default-include-p)
;; Case-insensitive completion.
(completion-ignore-case t)
(read-buffer-completion-ignore-case t)
(read-file-name-completion-ignore-case t)
:bind
([remap list-buffers] . switch-to-buffer)
:hook
;; Indicatior for recursive minibuffers.
(after-init . minibuffer-depth-indicate-mode)
;; Save minibuffer history.
(after-init . savehist-mode)
;; Indicator for `fill-column'.
(prog-mode . display-fill-column-indicator-mode))
;; Theming
(use-package emacs
:custom
(fringe-mode 0)
(modus-themes-italic-constructs t) (modus-themes-italic-constructs t)
(scroll-bar-mode nil)
(tool-bar-mode nil)
(tooltip-mode nil)
:config :config
(load-theme 'modus-operandi-tinted :no-confirm) (load-theme 'modus-operandi-tinted :no-confirm))
:hook
(after-init . menu-bar-mode))
(use-package completion-preview
:custom
(global-completion-preview-mode t))
;;guix:emacs-doom-modeline
(use-package doom-modeline (use-package doom-modeline
:custom :custom
(doom-modeline-icon nil) (doom-modeline-icon nil)
@ -88,7 +63,6 @@
:hook :hook
(after-init . doom-modeline-mode)) (after-init . doom-modeline-mode))
;;guix:emacs-helpful
(use-package helpful (use-package helpful
:bind :bind
(([remap describe-function] . helpful-callable) (([remap describe-function] . helpful-callable)
@ -98,7 +72,6 @@
([remap describe-symbol] . helpful-symbol) ([remap describe-symbol] . helpful-symbol)
("C-c C-d" . helpful-at-point))) ("C-c C-d" . helpful-at-point)))
;;guix:emacs-hl-todo
(use-package hl-todo (use-package hl-todo
:custom :custom
(hl-todo-highlight-punctuation ":") (hl-todo-highlight-punctuation ":")
@ -112,13 +85,11 @@
(regexp-search-ring-max 200) (regexp-search-ring-max 200)
(search-ring-max 200)) (search-ring-max 200))
;;guix:emacs-mwim
(use-package mwim (use-package mwim
:bind :bind
(([remap move-beginning-of-line] . mwim-beginning) (([remap move-beginning-of-line] . mwim-beginning)
([remap move-end-of-line] . mwim-end))) ([remap move-end-of-line] . mwim-end)))
;;guix:emacs-orderless
(use-package orderless (use-package orderless
:custom :custom
(completion-styles '(orderless basic)) (completion-styles '(orderless basic))
@ -131,12 +102,10 @@
:hook :hook
(after-init . show-paren-mode)) (after-init . show-paren-mode))
;;guix:emacs-rainbow-delimiters
(use-package rainbow-delimiters (use-package rainbow-delimiters
:hook :hook
(prog-mode . rainbow-delimiters-mode)) (prog-mode . rainbow-delimiters-mode))
;;guix:emacs-vertico
(use-package vertico (use-package vertico
:hook :hook
(after-init . vertico-mode)) (after-init . vertico-mode))
@ -162,35 +131,19 @@
;;; Editing ;;; Editing
;;; ;;;
(use-package emacs
:custom
;; Disable tab indentation.
(indent-tabs-mode nil)
:config
;; Avoid re-indenting current line after entering RET.
(setopt electric-indent-inhibit t)
:hook
(before-save . delete-trailing-whitespace)
;; Automatic parenthesis pairing.
(after-init . electric-pair-mode))
;;guix:emacs-macrostep
(use-package macrostep (use-package macrostep
:bind :bind
("C-c e" . macrostep-expand)) ("C-c e" . macrostep-expand))
;;guix:emacs-puni
(use-package puni (use-package puni
:hook :hook
((eval-expression-minibuffer-setup nxml-mode prog-mode sgml-mode tex-mode) ((eval-expression-minibuffer-setup nxml-mode prog-mode sgml-mode tex-mode) . puni-mode))
. puni-mode))
;;; ;;;
;;; Miscellaneous ;;; Miscellaneous
;;; ;;;
;;guix:emacs-daemons
(use-package daemons (use-package daemons
:custom :custom
(daemons-list-fill-frame t)) (daemons-list-fill-frame t))
@ -209,12 +162,10 @@
(dired-create-destination-dirs-on-trailing-dirsep t) (dired-create-destination-dirs-on-trailing-dirsep t)
(dired-vc-rename-file t)) (dired-vc-rename-file t))
;;guix:emacs-envrc
(use-package envrc (use-package envrc
:hook :hook
(after-init . envrc-global-mode)) (after-init . envrc-global-mode))
;;guix:emacs-magit
(use-package magit (use-package magit
:custom :custom
(git-commit-cd-to-toplevel t) (git-commit-cd-to-toplevel t)
@ -224,6 +175,5 @@
(:map project-prefix-map (:map project-prefix-map
("m" . magit-project-status))) ("m" . magit-project-status)))
;;guix:emacs-forge
(use-package forge (use-package forge
:after (magit)) :after (magit))

View File

@ -18,7 +18,7 @@
(define-public cloudflared (define-public cloudflared
(package (package
(name "cloudflared") (name "cloudflared")
(version "2025.6.1") (version "2025.6.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -30,7 +30,7 @@
;; (snippet '(delete-file-recursively "vendor")) ;; (snippet '(delete-file-recursively "vendor"))
(sha256 (sha256
(base32 (base32
"1v1rj5jqw8wiahqfw8xqx1rk2hir7xnxn57i185355ha98s4c8vq")))) "0sqryzjmllsm0w19axhn3mb3cqpky3a4clf5m7cj9ckbzlw1ydn8"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list #:go go-1.24 (list #:go go-1.24

View File

@ -219,7 +219,7 @@ from serving static websites to running dynamic web applications.")
(define-public hugo (define-public hugo
(package (package
(name "hugo") (name "hugo")
(version "0.147.9") (version "0.147.8")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -228,7 +228,7 @@ from serving static websites to running dynamic web applications.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"08ym7f130jvmic0fdwjym8a7hdrs5cs3l48803ips6qda6b2scdd")))) "0mp2y1wzj9zsqjjwnbzm3jrd0fb0ixh3ribgdkm8m1fnlxby1iw7"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
@ -287,7 +287,7 @@ from serving static websites to running dynamic web applications.")
(file-name "vendored-go-dependencies") (file-name "vendored-go-dependencies")
(sha256 (sha256
(base32 (base32
"0lzmg5f128ysw9bpgf8ilj1v899vqfnjyaly0kwg2zbqwgnsajra"))) "06z8qxrfhqq2fjasb0k5h1r1kihmhaihcqi591mwa6b18xqbi1ql")))
(package-source libsass) (package-source libsass)
(package-source libwebp))) (package-source libwebp)))
(home-page "https://gohugo.io/") (home-page "https://gohugo.io/")