summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorMarc Coquand <marc@coquand.email>2024-12-17 16:10:47 +0100
committerMarc Coquand <marc@coquand.email>2024-12-17 16:10:47 +0100
commit507056b3ca86866fc0b4611c4bb4fdac0d17061d (patch)
tree224bdef30f1eb0dce3f104f09aaa884b5d4b1f35 /home
parentf8bce74e58b4b328dd34c35abd30368672a0841b (diff)
downloadguix-507056b3ca86866fc0b4611c4bb4fdac0d17061d.tar.gz
guix-507056b3ca86866fc0b4611c4bb4fdac0d17061d.tar.bz2
guix-507056b3ca86866fc0b4611c4bb4fdac0d17061d.zip
.
Diffstat (limited to 'home')
-rw-r--r--home/config.scm1
-rw-r--r--home/dots/.emacs62
-rw-r--r--home/dots/.emacs.d/BOGO-theme.el8
-rw-r--r--home/dots/.emacs.d/elisp/org-link-minor-mode.el10
4 files changed, 44 insertions, 37 deletions
diff --git a/home/config.scm b/home/config.scm
index e68a5b1..f1ab512 100644
--- a/home/config.scm
+++ b/home/config.scm
@@ -73,7 +73,6 @@
#:use-module (nongnu packages game-client)
#:use-module (nongnu packages mozilla))
-
(define home-config
(home-environment
(packages (list
diff --git a/home/dots/.emacs b/home/dots/.emacs
index 777784e..869049c 100644
--- a/home/dots/.emacs
+++ b/home/dots/.emacs
@@ -4,7 +4,6 @@
(setq package-list
'(avy
- corfu
devdocs
diminish
direnv
@@ -256,24 +255,25 @@
(geiser-mode . (lambda ()
(keymap-set geiser-mode-map "C-." nil))))
-(use-package corfu
- :defer t
- ;; Optional customizations
- :custom
- (corfu-cycle t) ;; Enable cycling for `corfu-next/previous'
- ;; (corfu-auto t) ;; Enable auto completion
- ;; (corfu-quit-at-boundary nil) ;; Never quit at completion boundary
- (corfu-quit-no-match t) ;; Never quit, even if there is no match
- (corfu-preview-current t) ;; Disable current candidate preview
- (corfu-preselect 'prompt) ;; Preselect the prompt
- (corfu-quit-no-match t)
- (corfu-on-exact-match 'show) ;; Configure handling of exact matches
-
- ;; Recommended: Enable Corfu globally. This is recommended since Dabbrev can
- ;; be used globally (M-/). See also the customization variable
- ;; `global-corfu-modes' to exclude certain modes.
- :init
- (global-corfu-mode))
+;; (use-package corfu
+;; :defer t
+;; ;; Optional customizations
+;; :custom
+;; (corfu-cycle t) ;; Enable cycling for `corfu-next/previous'
+;; ;; (corfu-auto t) ;; Enable auto completion
+;; ;; (corfu-quit-at-boundary nil) ;; Never quit at completion boundary
+;; (corfu-quit-no-match t) ;; Never quit, even if there is no match
+;; (corfu-preview-current t) ;; Disable current candidate preview
+;; (corfu-preselect 'prompt) ;; Preselect the prompt
+;; (corfu-quit-no-match t)
+;; (corfu-on-exact-match 'show) ;; Configure handling of exact matches
+;;
+;; ;; Recommended: Enable Corfu globally. This is recommended since Dabbrev can
+;; ;; be used globally (M-/). See also the customization variable
+;; ;; `global-corfu-modes' to exclude certain modes.
+;; :init
+;; (global-corfu-mode)
+;; (corfu-popupinfo-mode))
(use-package dabbrev
;; Swap M-/ and C-M-/
@@ -367,6 +367,10 @@
:custom
(completion-cycle-threshold 5)
(enable-recursive-minibuffers t)
+ (completion-auto-help 'always)
+ (completions-max-height 10)
+ (completions-format 'horizontal)
+ (completion-auto-select 'second-tab)
(completion-ignore-case t))
(use-package pass
@@ -792,11 +796,11 @@
(use-package dbus)
-
(use-package ido
:defer t
:init
(ido-mode t)
+ (ido-everywhere)
:bind
(:repeat-map ido-completion-mode-map
("s" . ido-next-match)
@@ -811,7 +815,12 @@
(use-package completion
:custom
- (completion-styles '(substring basic partial-completion emacs22)))
+ (read-file-name-completion-ignore-case t)
+ (read-buffer-completion-ignore-case t)
+ (completion-styles '(basic initials partial-completion substring))
+ (completion-category-defaults nil) ; ehh
+ (completion-show-help 't)
+ (completion-category-overrides '((file (styles basic partial-completion)))))
(use-package calendar
:defer t
@@ -869,6 +878,9 @@
((go-mode . (lambda ()
(add-hook
'before-save-hook 'eglot-format-buffer nil t)))
+ (go-mode . (lambda ()
+ (add-hook
+ 'before-save-hook 'eglot-format-buffer nil t)))
(go-mode . (lambda ()
(setq-local compile-command "go build .")))))
@@ -1082,7 +1094,7 @@
:empty-lines 1)
("l" "Log"
entry (file+datetree "~/personal-db/notes/log.org")
- "** %? :cyprus:paramytha:\n%T"
+ "** %? :sweden:bastad:\n%T"
:prepend t
:empty-lines 0)
("n" "Inbox"
@@ -1092,10 +1104,6 @@
:bind
(("C-c c" . org-capture)))
-(defun org-agenda-switch-to-narrowed-subtree ()
- (interactive)
- (org-agenda-switch-to)
- (org-narrow-to-subtree))
(use-package org-agenda
:defer t
@@ -1119,7 +1127,7 @@
:bind
(("C-c a" . org-agenda)
:map org-agenda-mode-map
- ("<return>" . org-agenda-switch-to-narrowed-subtree)))
+ ("<return>" . org-agenda-tree-to-indirect-buffer)))
(use-package autorevert
:diminish auto-revert-mode
diff --git a/home/dots/.emacs.d/BOGO-theme.el b/home/dots/.emacs.d/BOGO-theme.el
index ca3ba8f..c0a96da 100644
--- a/home/dots/.emacs.d/BOGO-theme.el
+++ b/home/dots/.emacs.d/BOGO-theme.el
@@ -2,7 +2,7 @@
"Created 2024-11-20.")
(custom-theme-set-faces
- 'BOGO
+ 'BOGO
'(default ((t (:inherit nil :extend nil :stipple nil :background "#fffff8" :foreground "#111111" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight regular :height 150 :width expanded :foundry "UKWN" :family "Iosevka SS13 Extended"))))
'(avy-lead-face ((t (:inherit fixed-pitch :background "dark red" :foreground "white"))))
'(calendar-weekend-header ((t (:inherit nil))))
@@ -87,7 +87,7 @@
'(org-scheduled-today ((t nil)))
'(org-list-dt ((t (:weight bold))))
'(org-agenda-calendar-event ((t nil)))
- '(org-drawer ((t nil)))
+ '(org-drawer ((t :inherit fixed-pitch)))
'(org-hide ((t (:foreground "#FFFFF8"))))
'(org-done ((t (:inherit (org-agenda-dimmed-todo-face fixed-pitch) :strike-through nil :extend nil :weight bold))))
'(org-todo ((t (:weight bold :inherit fixed-pitch))))
@@ -95,7 +95,7 @@
'(org-priority ((t (:inherit fixed-pitch))))
'(org-headline-done ((t (:inherit org-agenda-dimmed-todo-face))))
'(org-level-1 ((t (:inherit outline-1 :extend nil :weight regular))))
- '(org-tag ((t (:foreground "gray70"))))
+ '(org-tag ((t (:foreground "gray70" :inherit fixed-pitch))))
'(org-time-grid ((t (:foreground "gray"))))
'(org-meta-line ((t (:foreground "gray" :inherit fixed-pitch))))
'(org-block-begin-line ((t :inherit org-tag)))
@@ -114,7 +114,7 @@
'(tldr-command-itself ((t (:background "khaki" :foreground "#111111" :weight bold))))
'(tldr-introduction ((t (:foreground "#111111" :slant italic))))
'(tldr-title ((t (:inherit variable-pitch :foreground "#111111" :weight bold))))
- '(variable-pitch ((t (:family "Iosevka Aile" :height 1.0))))
+ '(variable-pitch ((t (:family "Iosevka Aile"))))
'(window-divider ((t (:foreground "gray90")))))
(provide-theme 'BOGO)
diff --git a/home/dots/.emacs.d/elisp/org-link-minor-mode.el b/home/dots/.emacs.d/elisp/org-link-minor-mode.el
index 7f1faaa..06ad48e 100644
--- a/home/dots/.emacs.d/elisp/org-link-minor-mode.el
+++ b/home/dots/.emacs.d/elisp/org-link-minor-mode.el
@@ -11,26 +11,26 @@
;; Package-Version: 20200129.0141
;; Keywords: hypermedia
;; Url: https://github.com/seanohalpin/org-link-minor-mode
-;;
+;;
;; Changes for org v9: Stefan-W. Hahn <stefan dot hahn at s-hahn dot de>
;;
;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
-;;
+;;
;; This file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
-;;
+;;
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;;
;;; Commentary:
;;
;; Enables org-mode links of the form:
-;;
+;;
;; http://www.bbc.co.uk
;; man:emacs
;; info:emacs
@@ -39,7 +39,7 @@
;; [[org-link-minor-mode]]
;; [2012-08-18]
;; <2012-08-18>
-;;
+;;
;; Note that `org-toggle-link-display' will also work when this mode
;; is enabled.
;;