Skip to content

Commit b578a28

Browse files
a13a13
committed
update
1 parent 1662bfd commit b578a28

File tree

2 files changed

+44
-34
lines changed

2 files changed

+44
-34
lines changed

‎README.org

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
(require 'package)
7373
(customize-set-variable 'package-archives
7474
`(("melpa" . "https://melpa.org/packages/")
75-
("org" . "https://orgmode.org/elpa/")
7675
,@package-archives))
7776
(customize-set-variable 'package-enable-at-startup nil)
7877
(package-initialize)
@@ -523,24 +522,17 @@
523522
Provide [[https://www.gnu.org/software/emacs/manual/html_node/elisp/Font-Selection.html][face-font-family-alternatives]] for all the fonts we are going to use to avoid errors in case of their absense.
524523
#+BEGIN_SRC emacs-lisp
525524
(use-package faces
526-
:defer t
527525
:custom
528526
(face-font-family-alternatives
529527
'(("Monospace" "courier" "fixed")
530528
("Consolas" "Monaco" "Roboto Mono" "PT Mono" "Terminus" "Monospace")
531529
("Monospace Serif" "CMU Typewriter Text" "Courier 10 Pitch" "Monospace")
532-
("Serif" "CMU Serif" "Georgia" "Cambria" "Times New Roman" "DejaVu Serif" "serif")))
530+
("Serif" "Alegreya" "CMU Serif" "Georgia" "Cambria" "Times New Roman" "DejaVu Serif" "serif")))
533531
:custom-face
534-
(variable-pitch ((t (:family "Serif" :height 125))))
532+
(variable-pitch ((t (:family "Serif" :height 135))))
535533
(fixed-pitch ((t (:family "Monospace Serif" :height 125))))
536534
(default ((t (:family "Monospace Serif" :height 125)))))
537535

538-
539-
(use-package fnhh
540-
:quelpa
541-
(justify-kp :repo "Fuco1/justify-kp" :fetcher github))
542-
543-
544536
(use-package font-lock
545537
:defer t
546538
:custom-face
@@ -552,11 +544,17 @@
552544

553545
** Color themes
554546
#+BEGIN_SRC emacs-lisp
555-
(use-package lor-theme
556-
:config
557-
(load-theme 'lor t)
547+
(use-package open-color
558548
:quelpa
559-
(lor-theme :repo "a13/lor-theme" :fetcher github :version original))
549+
(open-color :repo "a13/open-color.el" :fetcher github :version original))
550+
551+
(use-package lor-oc-theme
552+
:config
553+
(load-theme 'lor-oc t)
554+
:load-path "/home/dk/git/lor-theme"
555+
;; :quelpa
556+
;; (lor-theme :repo "a13/lor-theme" :fetcher github :version original)
557+
)
560558
#+END_SRC
561559

562560
** GUI
@@ -696,8 +694,8 @@
696694
:custom
697695
(rainbow-identifiers-cie-l*a*b*-lightness 80)
698696
(rainbow-identifiers-cie-l*a*b*-saturation 50)
699-
(rainbow-identifiers-choose-face-function
700-
#'rainbow-identifiers-cie-l*a*b*-choose-face)
697+
;; (rainbow-identifiers-choose-face-function
698+
;; #'rainbow-identifiers-cie-l*a*b*-choose-face)
701699
:hook
702700
(emacs-lisp-mode . rainbow-identifiers-mode) ; actually, turn it off
703701
(prog-mode . rainbow-identifiers-mode))
@@ -805,8 +803,10 @@
805803
("C" . counsel-world-clock)))
806804

807805
(use-package ivy-rich
806+
808807
:ensure t
809808
:config
809+
(ivy-rich-project-root-cache-mode t)
810810
(ivy-rich-mode 1))
811811

812812
(use-package helm-make
@@ -1198,6 +1198,7 @@
11981198
(org-mode . variable-pitch-mode)
11991199
(org-mode . visual-line-mode)
12001200
:custom
1201+
(org-adapt-indentation t)
12011202
(org-src-tab-acts-natively t))
12021203

12031204
;; (use-package org-passwords
@@ -1473,6 +1474,10 @@
14731474
:defer t
14741475
:config
14751476
(avy-flycheck-setup))
1477+
1478+
(use-package cov
1479+
:ensure t
1480+
:defer t)
14761481
#+END_SRC
14771482

14781483
** Languages support
@@ -1576,6 +1581,7 @@
15761581
:defer t
15771582
:config
15781583
(define-clojure-indent
1584+
(pfor 1)
15791585
(if-let-failed? 'defun)
15801586
(if-let-ok? 'defun)
15811587
(when-let-failed? 'defun)
@@ -1911,7 +1917,6 @@
19111917
:url "https://raw.githubusercontent.com/a13/xkb-custom/master/contrib/unipunct-ng.el"))
19121918

19131919
(use-package reverse-im
1914-
:defer 0.2
19151920
:ensure t
19161921
:demand t
19171922
:after unipunct-ng char-fold

‎init.el

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
(require 'package)
44
(customize-set-variable 'package-archives
55
`(("melpa" . "https://melpa.org/packages/")
6-
("org" . "https://orgmode.org/elpa/")
76
,@package-archives))
87
(customize-set-variable 'package-enable-at-startup nil)
98
(package-initialize)
@@ -365,36 +364,35 @@
365364
("C-c $" . flyspell-correct-at-point)))
366365

367366
(use-package faces
368-
:defer t
369367
:custom
370368
(face-font-family-alternatives
371369
'(("Monospace" "courier" "fixed")
372370
("Consolas" "Monaco" "Roboto Mono" "PT Mono" "Terminus" "Monospace")
373371
("Monospace Serif" "CMU Typewriter Text" "Courier 10 Pitch" "Monospace")
374-
("Serif" "CMU Serif" "Georgia" "Cambria" "Times New Roman" "DejaVu Serif" "serif")))
372+
("Serif" "Alegreya" "CMU Serif" "Georgia" "Cambria" "Times New Roman" "DejaVu Serif" "serif")))
375373
:custom-face
376-
(variable-pitch ((t (:family "Serif" :height 125))))
374+
(variable-pitch ((t (:family "Serif" :height 135))))
377375
(fixed-pitch ((t (:family "Monospace Serif" :height 125))))
378376
(default ((t (:family "Monospace Serif" :height 125)))))
379377

380-
381-
(use-package fnhh
382-
:quelpa
383-
(justify-kp :repo "Fuco1/justify-kp" :fetcher github))
384-
385-
386378
(use-package font-lock
387379
:defer t
388380
:custom-face
389381
(font-lock-comment-face ((t (:inherit font-lock-comment-face :italic t))))
390382
(font-lock-doc-face ((t (:inherit font-lock-doc-face :italic t))))
391383
(font-lock-string-face ((t (:inherit font-lock-string-face :italic t)))))
392384

393-
(use-package lor-theme
394-
:config
395-
(load-theme 'lor t)
385+
(use-package open-color
396386
:quelpa
397-
(lor-theme :repo "a13/lor-theme" :fetcher github :version original))
387+
(open-color :repo "a13/open-color.el" :fetcher github :version original))
388+
389+
(use-package lor-oc-theme
390+
:config
391+
(load-theme 'lor-oc t)
392+
:load-path "/home/dk/git/lor-theme"
393+
;; :quelpa
394+
;; (lor-theme :repo "a13/lor-theme" :fetcher github :version original)
395+
)
398396

399397
(use-package mwheel
400398
:custom
@@ -515,8 +513,8 @@
515513
:custom
516514
(rainbow-identifiers-cie-l*a*b*-lightness 80)
517515
(rainbow-identifiers-cie-l*a*b*-saturation 50)
518-
(rainbow-identifiers-choose-face-function
519-
#'rainbow-identifiers-cie-l*a*b*-choose-face)
516+
;; (rainbow-identifiers-choose-face-function
517+
;; #'rainbow-identifiers-cie-l*a*b*-choose-face)
520518
:hook
521519
(emacs-lisp-mode . rainbow-identifiers-mode) ; actually, turn it off
522520
(prog-mode . rainbow-identifiers-mode))
@@ -619,8 +617,10 @@
619617
("C" . counsel-world-clock)))
620618

621619
(use-package ivy-rich
620+
622621
:ensure t
623622
:config
623+
(ivy-rich-project-root-cache-mode t)
624624
(ivy-rich-mode 1))
625625

626626
(use-package helm-make
@@ -979,6 +979,7 @@
979979
(org-mode . variable-pitch-mode)
980980
(org-mode . visual-line-mode)
981981
:custom
982+
(org-adapt-indentation t)
982983
(org-src-tab-acts-natively t))
983984

984985
;; (use-package org-passwords
@@ -1226,6 +1227,10 @@
12261227
:config
12271228
(avy-flycheck-setup))
12281229

1230+
(use-package cov
1231+
:ensure t
1232+
:defer t)
1233+
12291234
(use-package lisp
12301235
:hook
12311236
(after-save . check-parens))
@@ -1313,6 +1318,7 @@
13131318
:defer t
13141319
:config
13151320
(define-clojure-indent
1321+
(pfor 1)
13161322
(if-let-failed? 'defun)
13171323
(if-let-ok? 'defun)
13181324
(when-let-failed? 'defun)
@@ -1590,7 +1596,6 @@
15901596
:url "https://raw.githubusercontent.com/a13/xkb-custom/master/contrib/unipunct-ng.el"))
15911597

15921598
(use-package reverse-im
1593-
:defer 0.2
15941599
:ensure t
15951600
:demand t
15961601
:after unipunct-ng char-fold

0 commit comments

Comments
 (0)