From 9ef4d3da43ad1aafb7aa9257d631301898f3fb95 Mon Sep 17 00:00:00 2001 From: Marc Coquand Date: Sun, 29 Sep 2024 12:27:20 +0300 Subject: . --- Xresources | 2 +- emacs | 35 +++++++++++++++++++++++------------ xinitrc | 1 + 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Xresources b/Xresources index d225ec1..ccf50ae 100644 --- a/Xresources +++ b/Xresources @@ -12,7 +12,7 @@ XTerm*HiBackColor: #FFFFFF XTerm*scaleHeight: 1.2 urxvt*selectToClipboard: true -urxvt*font: xft:Iosevka Slab Extended:size=14:style=Regular:antialias=true:hinting=false +urxvt*font: xft:Iosevka SS13 Extended:size=14:style=Regular:antialias=true:hinting=false urxvt*scrollBar: false urxvt*rightScrollbar: false urxvt.termName: xterm-256color diff --git a/emacs b/emacs index 3052222..03aa1a5 100644 --- a/emacs +++ b/emacs @@ -6,15 +6,21 @@ (scroll-bar-mode -1) (display-battery-mode t) (pixel-scroll-precision-mode) +(tab-bar-mode) (delete-selection-mode 1) (fset 'yes-or-no-p 'y-or-n-p) (setq-default frame-title-format '("%b")) -(setq ring-bell-function 'ignore) -(setq inhibit-startup-screen t) -(setq line-spacing 0.2) -(setq display-time-format "%a, %d/%m/%y %H:%M") +(setq + inhibit-startup-screen t + line-spacing 0.2 + display-time-format "%a, %d/%m/%y %H:%M" + undo-limit 10000000 + undo-outer-limit 20000000 + ring-bell-function 'ignore) (display-time) -(tab-bar-mode) + + + ;; Put Emacs auto-save and backup files to /tmp (defconst emacs-tmp-dir (expand-file-name (format "emacs%d" (user-uid)) temporary-file-directory)) @@ -71,6 +77,8 @@ (global-set-key (kbd "C-,") 'er/contract-region) (global-set-key (kbd "C-h D") 'devdocs-lookup) +;; Html +(add-to-list 'auto-mode-alist '("\\.njk\\'" . html-mode)) ;; Markdown (add-hook 'markdown-mode-hook 'variable-pitch-mode) @@ -175,6 +183,7 @@ (add-hook 'org-mode-hook 'org-indent-mode) (add-hook 'org-mode-hook 'visual-line-mode) (add-hook 'org-mode-hook 'variable-pitch-mode) +(setq org-hide-emphasis-markers t) (set-face-attribute 'org-block nil :inherit 'fixed-pitch) (set-face-attribute 'org-code nil :inherit 'fixed-pitch) (set-face-attribute 'org-table nil :inherit 'fixed-pitch) @@ -184,11 +193,11 @@ ("t" "Todo" entry (file+headline "~/personal-db/todo.org" "Todo") "* TODO %?\n%i\n%a\n:Created: %T\n " - :empty-lines 0) + :empty-lines 1) ("n" "Inbox" entry (file+headline "~/personal-db/notes/inbox.org" "Notes") - "** %?" - :empty-lines 0))) + "** %?\n:Created: %T" + :empty-lines 1))) ;; Magit (global-set-key (kbd "C-c g") 'magit) @@ -332,18 +341,20 @@ '(font-lock-type-face ((t (:foreground "black")))) '(font-lock-variable-name-face ((t (:foreground "black")))) '(fringe ((t (:background "white")))) - '(header-line ((t (:inherit nil :background "white" :foreground "grey20" :box (:line-width (2 . 2) :color "white") :underline (:color "gray50" :style line :position 0))))) + '(header-line ((t (:inherit nil :background "white" :foreground "grey20" :box (:line-width (8 . 8) :color "white") :underline (:color "gray80" :style line :position 0))))) '(highlight ((t (:background "white smoke")))) '(info-header-xref ((t (:inherit info-xref :underline (:color "RoyalBlue3" :style line :position t))))) + '(info-node ((t (:foreground "brown" :box (:line-width (4 . 4) :color "white") :slant italic :weight bold)))) '(markdown-inline-code-face ((t (:inherit markdown-code-face)))) '(markdown-pre-face ((t (:inherit markdown-code-face)))) '(mastodon-display-name-face ((t (:inherit nil :weight bold)))) - '(mode-line ((t (:inherit variable-pitch :background "white" :foreground "black" :box (:line-width (2 . 2) :style flat-button) :overline "gray50")))) + '(mode-line ((t (:inherit variable-pitch :background "white" :foreground "black" :box (:line-width (8 . 8) :style flat-button) :overline "gray80")))) '(mode-line-inactive ((t (:inherit mode-line :background "grey90" :foreground "grey20" :underline (:color "black" :style line :position 0) :weight light)))) '(mu4e-header-highlight-face ((t (:inherit hl-line :extend t :weight bold)))) '(mu4e-highlight-face ((t (:inherit highlight)))) '(org-level-1 ((t (:inherit outline-1 :extend nil :weight bold)))) - '(tab-bar ((t (:inherit variable-pitch :background "white" :foreground "gray20" :box (:line-width (4 . 4) :color "white" :style flat-button))))) + '(org-time-grid ((t (:foreground "gray")))) + '(tab-bar ((t (:inherit variable-pitch :background "white" :foreground "gray20" :box (:line-width (8 . 8) :color "white" :style flat-button))))) '(tldr-code-block ((t (:background "cornsilk" :foreground "black")))) '(tldr-command-argument ((t (:background "cornsilk" :foreground "black")))) '(tldr-command-itself ((t (:background "khaki" :foreground "black" :weight bold)))) @@ -377,7 +388,7 @@ '((:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119) (:name "Messages with images" :query "mime:image/*" :key 112))) '(org-agenda-files - '("~/builds/sustainably/worklog-marc.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/todo.org")) + '("/home/mccd/builds/sustainably/piva.org" "/home/mccd/builds/comma.directory/comma.org" "/home/mccd/personal-db/notes/frugal.org" "/home/mccd/personal-db/notes/inbox.org" "/home/mccd/personal-db/notes/emacs.org" "/home/mccd/personal-db/todo.org")) '(org-fold-core-style 'overlays) '(package-selected-packages '(pdf-tools elfeed-protocol lem yasnippet-snippets elfeed yasnippet smartparens markdown-mode mastodon tldr almost-mono-themes rec-mode magit go-mode expand-region devdocs)) diff --git a/xinitrc b/xinitrc index 5f5039e..45df51d 100755 --- a/xinitrc +++ b/xinitrc @@ -10,4 +10,5 @@ gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' & gsettings set org.gnome.desktop.interface cursor-size 32 & gsettings set org.gnome.desktop.interface cursor-theme Adwaita & setxkbmap -layout us -variant colemak -option "caps:ctrl_modifier" & +xkbcomp $HOME/.config/keymap_locked_modifier.xkb $DISPLAY & dbus-run-session cwm -- cgit v1.2.3