diff --git a/emacs.d/init.el b/emacs.d/init.el index d211421..ee384b3 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,10 +1,6 @@ ;; -*- mode: emacs-lisp; buffer-read-only: t; -*- -;; this emacs configuration is heavily dependant on the guix configuration, which manages the packages. -;; the org-roam-ui packages uses a specific version of org-roam, please dont install the org-roam from -;; the main guix repo, let the package org-roam-ui do that automatically. - (add-hook 'scheme-mode-hook 'guix-devel-mode) (dirvish-override-dired-mode) @@ -13,8 +9,7 @@ (setq cursor-type 'box) - -(load-file "~/.emacs.d/org-roam-templates/main.el") +(global-set-key (kbd "C-z") 'undo) (set-frame-parameter nil 'alpha-background 100) @@ -37,6 +32,29 @@ (global-set-key (kbd "C-c t") 'toggle-transparency) +;;--------------------- +(load-file "~/.emacs.d/keys/xah-fly-keys.el") +(require 'xah-fly-keys) + +;; specify a layout +(xah-fly-keys-set-layout "qwerty") + +(xah-fly-keys 1) + +;;------------------------- + +(defun enable-olivetti () + "Enable `olivetti-mode' for Org mode files." + (when (and buffer-file-name + (string-match "\\.org\\'" buffer-file-name)) + (olivetti-mode 1))) + +(add-hook 'org-mode-hook 'enable-olivetti) + + +(load-file "~/.emacs.d/org-roam-templates/main.el") + + (load-file "~/.emacs.d/extensions/alert/alert.el") ;; needs alert (load-file "~/.emacs.d/extensions/pomidor/pomidor.el") @@ -66,11 +84,23 @@ (advice-add 'xeft-next :after #'xeft--eager-preview) (advice-add 'xeft-previous :after #'xeft--eager-preview) - (global-set-key (kbd "C-c C-n") 'org-roam-capture) (global-set-key (kbd "C-c C-k") 'xeft) + +(defun enable-rainbow-delimiters-mode () + "Enable rainbow-delimiters-mode." + (rainbow-delimiters-mode 1)) + +(add-hook 'prog-mode-hook 'enable-rainbow-delimiters-mode) + +;; Associate file extensions with major modes +(add-to-list 'auto-mode-alist '("\\.scm\\'" . scheme-mode)) +(add-to-list 'auto-mode-alist '("\\.cl\\'" . lisp-mode)) +(add-to-list 'auto-mode-alist '("\\.el\\'" . emacs-lisp-mode)) + + ;; Disable menu bar, tool bar, and scroll bar (menu-bar-mode -1) (tool-bar-mode -1) @@ -81,7 +111,7 @@ inhibit-startup-message t) ;; Set default font and size -(set-face-attribute 'default nil :family "DejaVu Sans Mono" :height 120) +(set-face-attribute 'default nil :family "Iosevka Comfy" :height 100) ;; Show line numbers (global-display-line-numbers-mode) @@ -118,20 +148,7 @@ ;; Set font to Iosevka Comfy with aliasing (set-face-attribute 'default nil :family "Iosevka Comfy" - :height 120 - :weight 'normal - :width 'normal - :foundry "CTDB" - :slant 'normal - :underline nil - :overline nil - :strike-through nil - :box nil - :inverse-video nil - :foreground "unspecified" - :background "unspecified" - :stipple nil - :inherit 'unspecified + :height 100 :antialias 'subpixel)