fix up from work
This commit is contained in:
parent
1c82c0ccf4
commit
d8cab4e766
13 changed files with 160 additions and 114 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
(global-set-key [C-tab] #'other-window)
|
(global-set-key [C-tab] #'other-window)
|
||||||
(global-set-key [C-S-tab] #'sother-window)
|
(global-set-key [C-S-tab] #'sother-window)
|
||||||
(global-set-key [C-iso-lefttab] #'sother-window)
|
(global-set-key [C-iso-lefttab] #'sother-window)
|
||||||
|
|
|
@ -216,7 +216,8 @@ be updated accordingly.
|
||||||
#+end_quote
|
#+end_quote
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle no :results none
|
#+begin_src emacs-lisp :tangle no :results none
|
||||||
(org-babel-tangle)
|
;; -*- lexical-binding: t; -*-
|
||||||
|
(org-babel-tangle)
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
|
||||||
|
@ -672,6 +673,7 @@ Now we are ready to load our per-module configuration files:
|
||||||
This module defines everything related to the aesthetics of Emacs.
|
This module defines everything related to the aesthetics of Emacs.
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-theme.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-theme.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Everything related to the look of Emacs
|
;;; Everything related to the look of Emacs
|
||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
@ -1014,6 +1016,7 @@ in the function ~prot/enable-variable-pitch~.
|
||||||
:END:
|
:END:
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-essentials.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-essentials.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Essential configurations
|
;;; Essential configurations
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
@ -1569,11 +1572,12 @@ 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)
|
(There are more details in Prot's file, for the interested reader)
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-completion.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-completion.el" :mkdirp yes
|
||||||
;;; General minibuffer settings
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package minibuffer
|
;;; General minibuffer settings
|
||||||
|
(use-package minibuffer
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
;;;; Completion styles
|
;;;; Completion styles
|
||||||
(setq completion-styles '(basic substring initials flex orderless)) ; also see `completion-category-overrides'
|
(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'
|
(setq completion-pcm-leading-wildcard t) ; Emacs 31: make `partial-completion' behave like `substring'
|
||||||
|
|
||||||
|
@ -2236,6 +2240,7 @@ I use ~vertico-repeat~ to mimic the functionality that ~helm-resume~ would provi
|
||||||
My old custom functions file.
|
My old custom functions file.
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-functions.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-functions.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
(defun diff-and-set-modified-p ()
|
(defun diff-and-set-modified-p ()
|
||||||
"Diff the current buffer with its associated file and set buffer modified status."
|
"Diff the current buffer with its associated file and set buffer modified status."
|
||||||
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
||||||
|
@ -2427,6 +2432,7 @@ Now on to the configurations.
|
||||||
tweak to ensure that ~consult-imenu~ returns good ~imenu~ results to us.
|
tweak to ensure that ~consult-imenu~ returns good ~imenu~ results to us.
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-search.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-search.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package imenu
|
(use-package imenu
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
|
@ -2744,8 +2750,9 @@ them manually. I prefer this extra layer of safety. Plus, we have the
|
||||||
#+end_quote
|
#+end_quote
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-dired.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-dired.el" :mkdirp yes
|
||||||
;;; Dired file manager and prot-dired.el extras
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package dired
|
;;; Dired file manager and prot-dired.el extras
|
||||||
|
(use-package dired
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:commands (dired)
|
:commands (dired)
|
||||||
:config
|
:config
|
||||||
|
@ -3093,11 +3100,12 @@ name.
|
||||||
#+end_quote
|
#+end_quote
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-window.el"
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-window.el"
|
||||||
;;; General window and buffer configurations
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package uniquify
|
;;; General window and buffer configurations
|
||||||
|
(use-package uniquify
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
;;;; `uniquify' (unique names for buffers)
|
;;;; `uniquify' (unique names for buffers)
|
||||||
(setq uniquify-buffer-name-style 'forward)
|
(setq uniquify-buffer-name-style 'forward)
|
||||||
(setq uniquify-strip-common-suffix t)
|
(setq uniquify-strip-common-suffix t)
|
||||||
(setq uniquify-after-kill-buffer-p t))
|
(setq uniquify-after-kill-buffer-p t))
|
||||||
|
@ -3276,8 +3284,9 @@ integrates with ~magit~ ([[#h:b08af527-9ebf-4425-ac3a-24b4f371a4fd][The =nebkor-
|
||||||
#+end_quote
|
#+end_quote
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-git.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-git.el" :mkdirp yes
|
||||||
;;;; `ediff'
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package ediff
|
;;;; `ediff'
|
||||||
|
(use-package ediff
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:commands (ediff-buffers ediff-files ediff-buffers3 ediff-files3)
|
:commands (ediff-buffers ediff-files ediff-buffers3 ediff-files3)
|
||||||
:init
|
:init
|
||||||
|
@ -3454,6 +3463,21 @@ branches, etc.
|
||||||
'(("~/src/prototypes" . 1))))
|
'(("~/src/prototypes" . 1))))
|
||||||
#+end_src
|
#+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
|
||||||
|
:config (difftastic-bindings-mode))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
** Finally, we provide the =nebkor-git.el= module
|
** Finally, we provide the =nebkor-git.el= module
|
||||||
:PROPERTIES:
|
:PROPERTIES:
|
||||||
:CUSTOM_ID: h:4e7035c5-9350-4c51-be85-85f2539ed295
|
:CUSTOM_ID: h:4e7035c5-9350-4c51-be85-85f2539ed295
|
||||||
|
@ -3537,8 +3561,9 @@ Org is far more capable, so I switched to it completely.
|
||||||
#+end_quote
|
#+end_quote
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-org.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-org.el" :mkdirp yes
|
||||||
;;; Calendar
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package calendar
|
;;; Calendar
|
||||||
|
(use-package calendar
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:commands (calendar)
|
:commands (calendar)
|
||||||
:config
|
:config
|
||||||
|
@ -4513,6 +4538,7 @@ title of the task, and the like. The documentation string of
|
||||||
:END:
|
:END:
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-langs.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-langs.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;;; Tabs, indentation, and the TAB key
|
;;;; Tabs, indentation, and the TAB key
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
@ -5334,6 +5360,7 @@ PDF Tools is an absolute powerhouse for reading and annotating PDF
|
||||||
files. It is my goto tool for reading any academic papers.
|
files. It is my goto tool for reading any academic papers.
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-study.el" :mkdirp yes
|
#+begin_src emacs-lisp :tangle "nebkor-modules/nebkor-study.el" :mkdirp yes
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; PDF Tools for reading and annotating PDF files
|
;;; PDF Tools for reading and annotating PDF files
|
||||||
(use-package pdf-tools
|
(use-package pdf-tools
|
||||||
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
||||||
|
@ -6318,6 +6345,7 @@ figure it out.
|
||||||
:END:
|
:END:
|
||||||
|
|
||||||
#+begin_src emacs-lisp :tangle "custom-lisp/nebkor-personal.el" :mkdirp yes
|
#+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-tab] #'other-window)
|
||||||
(global-set-key [C-S-tab] #'sother-window)
|
(global-set-key [C-S-tab] #'sother-window)
|
||||||
(global-set-key [C-iso-lefttab] #'sother-window)
|
(global-set-key [C-iso-lefttab] #'sother-window)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; General minibuffer settings
|
;;; General minibuffer settings
|
||||||
(use-package minibuffer
|
(use-package minibuffer
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Dired file manager and prot-dired.el extras
|
;;; Dired file manager and prot-dired.el extras
|
||||||
(use-package dired
|
(use-package dired
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Essential configurations
|
;;; Essential configurations
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
(defun diff-and-set-modified-p ()
|
(defun diff-and-set-modified-p ()
|
||||||
"Diff the current buffer with its associated file and set buffer modified status."
|
"Diff the current buffer with its associated file and set buffer modified status."
|
||||||
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
(let* ((tmpfile (diff-file-local-copy (current-buffer)))
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;;; `ediff'
|
;;;; `ediff'
|
||||||
(use-package ediff
|
(use-package ediff
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
@ -74,4 +75,10 @@
|
||||||
(setq magit-repository-directories
|
(setq magit-repository-directories
|
||||||
'(("~/src/prototypes" . 1))))
|
'(("~/src/prototypes" . 1))))
|
||||||
|
|
||||||
|
(elpaca (difftastic :host "github.com" :repo "pkryger/difftastic.el")
|
||||||
|
(use-package difftastic))
|
||||||
|
|
||||||
|
(use-package difftastic-bindings
|
||||||
|
:config (difftastic-bindings-mode))
|
||||||
|
|
||||||
(provide 'nebkor-git)
|
(provide 'nebkor-git)
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;;; Tabs, indentation, and the TAB key
|
;;;; Tabs, indentation, and the TAB key
|
||||||
(use-package emacs
|
(use-package emacs
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Calendar
|
;;; Calendar
|
||||||
(use-package calendar
|
(use-package calendar
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
(use-package imenu
|
(use-package imenu
|
||||||
:ensure nil
|
:ensure nil
|
||||||
:config
|
:config
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; PDF Tools for reading and annotating PDF files
|
;;; PDF Tools for reading and annotating PDF files
|
||||||
(use-package pdf-tools
|
(use-package pdf-tools
|
||||||
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
:ensure (:host github :repo "vedang/pdf-tools" :branch "master")
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; Everything related to the look of Emacs
|
;;; Everything related to the look of Emacs
|
||||||
|
|
||||||
;;(add-to-list 'default-frame-alist '(background-color . "snow"))
|
;;(add-to-list 'default-frame-alist '(background-color . "snow"))
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
;; -*- lexical-binding: t; -*-
|
||||||
;;; General window and buffer configurations
|
;;; General window and buffer configurations
|
||||||
(use-package uniquify
|
(use-package uniquify
|
||||||
:ensure nil
|
:ensure nil
|
||||||
|
|
Loading…
Reference in a new issue