Compare commits
3 commits
main
...
voltus-mac
Author | SHA1 | Date | |
---|---|---|---|
|
bfb6703b1b | ||
|
dad453ac3c | ||
|
7559e2879a |
14 changed files with 134 additions and 180 deletions
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
(global-set-key [C-tab] #'other-window)
|
||||
(global-set-key [C-S-tab] #'sother-window)
|
||||
(global-set-key [C-iso-lefttab] #'sother-window)
|
||||
|
|
6
init.el
6
init.el
|
@ -28,7 +28,8 @@
|
|||
'("nebkor-modules" "custom-lisp"))
|
||||
|
||||
;;; Install Elpaca
|
||||
(defvar elpaca-installer-version 0.11)
|
||||
|
||||
(defvar elpaca-installer-version 0.10)
|
||||
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
||||
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
||||
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
|
||||
|
@ -63,11 +64,10 @@
|
|||
(unless (require 'elpaca-autoloads nil t)
|
||||
(require 'elpaca)
|
||||
(elpaca-generate-autoloads "elpaca" repo)
|
||||
(let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
|
||||
(load "./elpaca-autoloads")))
|
||||
(add-hook 'after-init-hook #'elpaca-process-queues)
|
||||
(elpaca `(,@elpaca-order))
|
||||
|
||||
|
||||
;; Install use-package support for Elpaca
|
||||
(elpaca elpaca-use-package
|
||||
;; Enable use-package :ensure support for Elpaca.
|
||||
|
|
|
@ -216,8 +216,7 @@ be updated accordingly.
|
|||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle no :results none
|
||||
;; -*- lexical-binding: t; -*-
|
||||
(org-babel-tangle)
|
||||
(org-babel-tangle)
|
||||
#+end_src
|
||||
|
||||
|
||||
|
@ -500,7 +499,8 @@ When using ~elpaca~, here are some gotchas you should be aware of
|
|||
|
||||
#+begin_src emacs-lisp :tangle "init.el"
|
||||
;;; Install Elpaca
|
||||
(defvar elpaca-installer-version 0.11)
|
||||
|
||||
(defvar elpaca-installer-version 0.10)
|
||||
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
|
||||
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
|
||||
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
|
||||
|
@ -535,11 +535,10 @@ When using ~elpaca~, here are some gotchas you should be aware of
|
|||
(unless (require 'elpaca-autoloads nil t)
|
||||
(require 'elpaca)
|
||||
(elpaca-generate-autoloads "elpaca" repo)
|
||||
(let ((load-source-file-function nil)) (load "./elpaca-autoloads"))))
|
||||
(load "./elpaca-autoloads")))
|
||||
(add-hook 'after-init-hook #'elpaca-process-queues)
|
||||
(elpaca `(,@elpaca-order))
|
||||
|
||||
|
||||
;; Install use-package support for Elpaca
|
||||
(elpaca elpaca-use-package
|
||||
;; Enable use-package :ensure support for Elpaca.
|
||||
|
@ -674,7 +673,6 @@ Now we are ready to load our per-module configuration files:
|
|||
This module defines everything related to the aesthetics of Emacs.
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-theme.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; Everything related to the look of Emacs
|
||||
|
||||
#+end_src
|
||||
|
@ -875,7 +873,7 @@ Another section defines some complementary functionality
|
|||
'((small
|
||||
:default-height 120)
|
||||
(regular
|
||||
:default-height 130)
|
||||
:default-height 160)
|
||||
(medium
|
||||
:default-weight semilight
|
||||
:default-height 170
|
||||
|
@ -892,7 +890,7 @@ Another section defines some complementary functionality
|
|||
(t
|
||||
;; See the fontaine manual for the technicalities:
|
||||
;; <https://protesilaos.com/emacs/fontaine>.
|
||||
:default-family "Noto Sans Mono"
|
||||
:default-family "Menlo"
|
||||
:default-weight normal
|
||||
:variable-pitch-family "Iosevka"
|
||||
:variable-pitch-height 1.05)))
|
||||
|
@ -1017,7 +1015,6 @@ in the function ~prot/enable-variable-pitch~.
|
|||
:END:
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-essentials.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; Essential configurations
|
||||
(use-package emacs
|
||||
:ensure nil
|
||||
|
@ -1362,6 +1359,7 @@ These are modifications to basic configuration I use on my Mac OSX machine.
|
|||
;; domain name
|
||||
(setq system-name (car (split-string system-name "\\.")))
|
||||
;;; Binaries
|
||||
(setq insert-directory-program "/opt/homebrew/bin/gls")
|
||||
(setq vc-git-program (or (executable-find "git") "/usr/local/bin/git"))
|
||||
(setq epg-gpg-program (or (executable-find "gpg") "/usr/local/bin/gpg"))))
|
||||
#+end_src
|
||||
|
@ -1573,12 +1571,11 @@ soon as I type a space after some characters I am using ~orderless~.
|
|||
(There are more details in Prot's file, for the interested reader)
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-completion.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; General minibuffer settings
|
||||
(use-package minibuffer
|
||||
;;; General minibuffer settings
|
||||
(use-package minibuffer
|
||||
:ensure nil
|
||||
:config
|
||||
;;;; Completion styles
|
||||
;;;; Completion styles
|
||||
(setq completion-styles '(basic substring initials flex orderless)) ; also see `completion-category-overrides'
|
||||
(setq completion-pcm-leading-wildcard t) ; Emacs 31: make `partial-completion' behave like `substring'
|
||||
|
||||
|
@ -2241,7 +2238,6 @@ I use ~vertico-repeat~ to mimic the functionality that ~helm-resume~ would provi
|
|||
My old custom functions file.
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-functions.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
(defun diff-and-set-modified-p ()
|
||||
"Diff the current buffer with its associated file and set buffer modified status."
|
||||
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
||||
|
@ -2433,7 +2429,6 @@ Now on to the configurations.
|
|||
tweak to ensure that ~consult-imenu~ returns good ~imenu~ results to us.
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-search.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
(use-package imenu
|
||||
:ensure nil
|
||||
:config
|
||||
|
@ -2751,9 +2746,8 @@ them manually. I prefer this extra layer of safety. Plus, we have the
|
|||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-dired.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; Dired file manager and prot-dired.el extras
|
||||
(use-package dired
|
||||
;;; Dired file manager and prot-dired.el extras
|
||||
(use-package dired
|
||||
:ensure nil
|
||||
:commands (dired)
|
||||
:config
|
||||
|
@ -3101,12 +3095,11 @@ name.
|
|||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-window.el"
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; General window and buffer configurations
|
||||
(use-package uniquify
|
||||
;;; General window and buffer configurations
|
||||
(use-package uniquify
|
||||
:ensure nil
|
||||
:config
|
||||
;;;; `uniquify' (unique names for buffers)
|
||||
;;;; `uniquify' (unique names for buffers)
|
||||
(setq uniquify-buffer-name-style 'forward)
|
||||
(setq uniquify-strip-common-suffix t)
|
||||
(setq uniquify-after-kill-buffer-p t))
|
||||
|
@ -3285,9 +3278,8 @@ integrates with ~magit~ ([[#h:b08af527-9ebf-4425-ac3a-24b4f371a4fd][The =nebkor-
|
|||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-git.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;;; `ediff'
|
||||
(use-package ediff
|
||||
;;;; `ediff'
|
||||
(use-package ediff
|
||||
:ensure nil
|
||||
:commands (ediff-buffers ediff-files ediff-buffers3 ediff-files3)
|
||||
:init
|
||||
|
@ -3464,22 +3456,6 @@ branches, etc.
|
|||
'(("~/src/prototypes" . 1))))
|
||||
#+end_src
|
||||
|
||||
#+begin_quote
|
||||
The difftastic Emacs package is designed to integrate difftastic - a structural diff tool - into
|
||||
your Emacs workflow, enhancing your code review and comparison experience. This package
|
||||
automatically displays difftastic’s output within Emacs using faces from your user theme, ensuring
|
||||
consistency with your overall coding environment.
|
||||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-git.el"
|
||||
(elpaca (difftastic :host "github.com" :repo "pkryger/difftastic.el")
|
||||
(use-package difftastic))
|
||||
|
||||
(use-package difftastic-bindings
|
||||
:after difftastic
|
||||
:config (difftastic-bindings-mode))
|
||||
#+end_src
|
||||
|
||||
** Finally, we provide the =nebkor-git.el= module
|
||||
:PROPERTIES:
|
||||
:CUSTOM_ID: h:4e7035c5-9350-4c51-be85-85f2539ed295
|
||||
|
@ -3563,9 +3539,8 @@ Org is far more capable, so I switched to it completely.
|
|||
#+end_quote
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-org.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;; Calendar
|
||||
(use-package calendar
|
||||
;;; Calendar
|
||||
(use-package calendar
|
||||
:ensure nil
|
||||
:commands (calendar)
|
||||
:config
|
||||
|
@ -4540,7 +4515,6 @@ title of the task, and the like. The documentation string of
|
|||
:END:
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-langs.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
;;;; Tabs, indentation, and the TAB key
|
||||
(use-package emacs
|
||||
:ensure nil
|
||||
|
@ -4774,12 +4748,12 @@ of packaging. I use it whenever I work on my numerous Emacs packages.
|
|||
(use-package flymake
|
||||
:ensure nil
|
||||
:bind
|
||||
(:map flymake-mode-map
|
||||
( :map flymake-mode-map
|
||||
("C-c ! s" . flymake-start)
|
||||
("C-c ! l" . flymake-show-buffer-diagnostics) ; Emacs28
|
||||
("C-c ! L" . flymake-show-project-diagnostics) ; Emacs28
|
||||
("M-g n" . flymake-goto-next-error)
|
||||
("M-g p" . flymake-goto-prev-error))
|
||||
("C-c ! n" . flymake-goto-next-error)
|
||||
("C-c ! p" . flymake-goto-prev-error))
|
||||
:hook
|
||||
(prog-mode . turn-on-flymake)
|
||||
:config
|
||||
|
@ -5361,8 +5335,7 @@ go-to place for studying anything.
|
|||
PDF Tools is an absolute powerhouse for reading and annotating PDF
|
||||
files. It is my goto tool for reading any academic papers.
|
||||
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-study.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-study.el"
|
||||
;;; PDF Tools for reading and annotating PDF files
|
||||
(use-package pdf-tools
|
||||
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
||||
|
@ -6347,7 +6320,6 @@ figure it out.
|
|||
:END:
|
||||
|
||||
#+begin_src emacs-lisp :tangle "custom-lisp/nebkor-personal.el" :mkdirp yes
|
||||
;; -*- lexical-binding: t; -*-
|
||||
(global-set-key [C-tab] #'other-window)
|
||||
(global-set-key [C-S-tab] #'sother-window)
|
||||
(global-set-key [C-iso-lefttab] #'sother-window)
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; General minibuffer settings
|
||||
(use-package minibuffer
|
||||
:ensure nil
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; Dired file manager and prot-dired.el extras
|
||||
(use-package dired
|
||||
:ensure nil
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; Essential configurations
|
||||
(use-package emacs
|
||||
:ensure nil
|
||||
|
@ -175,6 +174,7 @@ word. Fall back to regular `expreg-expand'."
|
|||
;; domain name
|
||||
(setq system-name (car (split-string system-name "\\.")))
|
||||
;;; Binaries
|
||||
(setq insert-directory-program "/opt/homebrew/bin/gls")
|
||||
(setq vc-git-program (or (executable-find "git") "/usr/local/bin/git"))
|
||||
(setq epg-gpg-program (or (executable-find "gpg") "/usr/local/bin/gpg"))))
|
||||
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
(defun diff-and-set-modified-p ()
|
||||
"Diff the current buffer with its associated file and set buffer modified status."
|
||||
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;;; `ediff'
|
||||
(use-package ediff
|
||||
:ensure nil
|
||||
|
@ -75,11 +74,4 @@
|
|||
(setq magit-repository-directories
|
||||
'(("~/src/prototypes" . 1))))
|
||||
|
||||
(elpaca (difftastic :host "github.com" :repo "pkryger/difftastic.el")
|
||||
(use-package difftastic))
|
||||
|
||||
(use-package difftastic-bindings
|
||||
:after difftastic
|
||||
:config (difftastic-bindings-mode))
|
||||
|
||||
(provide 'nebkor-git)
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;;; Tabs, indentation, and the TAB key
|
||||
(use-package emacs
|
||||
:ensure nil
|
||||
|
@ -78,12 +77,12 @@
|
|||
(use-package flymake
|
||||
:ensure nil
|
||||
:bind
|
||||
(:map flymake-mode-map
|
||||
( :map flymake-mode-map
|
||||
("C-c ! s" . flymake-start)
|
||||
("C-c ! l" . flymake-show-buffer-diagnostics) ; Emacs28
|
||||
("C-c ! L" . flymake-show-project-diagnostics) ; Emacs28
|
||||
("M-g n" . flymake-goto-next-error)
|
||||
("M-g p" . flymake-goto-prev-error))
|
||||
("C-c ! n" . flymake-goto-next-error)
|
||||
("C-c ! p" . flymake-goto-prev-error))
|
||||
:hook
|
||||
(prog-mode . turn-on-flymake)
|
||||
:config
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; Calendar
|
||||
(use-package calendar
|
||||
:ensure nil
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
(use-package imenu
|
||||
:ensure nil
|
||||
:config
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; PDF Tools for reading and annotating PDF files
|
||||
(use-package pdf-tools
|
||||
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; Everything related to the look of Emacs
|
||||
|
||||
;;(add-to-list 'default-frame-alist '(background-color . "snow"))
|
||||
|
@ -96,7 +95,7 @@
|
|||
'((small
|
||||
:default-height 120)
|
||||
(regular
|
||||
:default-height 130)
|
||||
:default-height 160)
|
||||
(medium
|
||||
:default-weight semilight
|
||||
:default-height 170
|
||||
|
@ -113,7 +112,7 @@
|
|||
(t
|
||||
;; See the fontaine manual for the technicalities:
|
||||
;; <https://protesilaos.com/emacs/fontaine>.
|
||||
:default-family "Noto Sans Mono"
|
||||
:default-family "Menlo"
|
||||
:default-weight normal
|
||||
:variable-pitch-family "Iosevka"
|
||||
:variable-pitch-height 1.05)))
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
;; -*- lexical-binding: t; -*-
|
||||
;;; General window and buffer configurations
|
||||
(use-package uniquify
|
||||
:ensure nil
|
||||
|
|
Loading…
Reference in a new issue