summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--init.el10
-rw-r--r--lisp/general.el28
-rw-r--r--lisp/org-custom.el2
4 files changed, 22 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 38db2e9..c09f90c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,5 @@ games
eln-cache
.projectile
session.*
-emojis \ No newline at end of file
+emojis
+multisession \ No newline at end of file
diff --git a/init.el b/init.el
index 5bfaebd..6248dd3 100644
--- a/init.el
+++ b/init.el
@@ -36,9 +36,15 @@
;; (doom-themes-org-config)
;; )
+
+(use-package kaolin-themes
+ :config
+ (load-theme 'kaolin-dark t)
+ (kaolin-treemacs-theme))
+
(use-package autothemer
:ensure t)
-(load-theme 'modus-operandi)
+;(load-theme 'modus-operandi)
;(load-file "~/.emacs.d/lisp/kanagawa-theme.el")
;(load-theme 'kanagawa t)
;; (use-package material-theme
@@ -76,7 +82,7 @@
'(custom-safe-themes
'("a6f9dd4844bfbfaf1162f04ae3c52070154ef28d18b5d482566015cf429492b0" "f149d9986497e8877e0bd1981d1bef8c8a6d35be7d82cba193ad7e46f0989f6a" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))
'(package-selected-packages
- '(dart-mode yaml-mode meson-mode eglot autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
+ '(kaolin-themes ement dart-mode yaml-mode meson-mode eglot autothemer pyenv-mode pyvenv plantuml-mode ledger-mode centered-window perfect-margin-mode org-download helm-rg htmlize mood-line org-super-agenda material-theme esup glsl-mode fast-scroll yasnippet-snippets jsdoc helm-slack slack smart-mode-line magit rust-mode xref-js2 web-mode vterm-toggle vscode-dark-plus-theme treemacs-projectile tree-sitter-langs tide tern smartparens rtags req-package rainbow-mode pythonic python-mode perfect-margin org-roam org-notify org-modern org-bullets org-alert minimap markdown-mode json-mode js2-refactor js2-highlight-vars js-doc ido-vertical-mode hl-todo highlight-thing highlight-indent-guides helm-projectile helm-posframe helm-ag good-scroll go-mode git-gutter-fringe git-commit flycheck-irony evil eslint-fix emojify eldoc-box drag-stuff doom-themes dashboard css-eldoc counsel company-quickhelp company-irony cmake-mode cmake-ide auctex all-the-icons ac-js2))
'(safe-local-variable-values '((js-indent-level . 4)))
'(warning-suppress-types '((comp))))
(custom-set-faces
diff --git a/lisp/general.el b/lisp/general.el
index 4b51b9b..79cafe2 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -113,21 +113,12 @@
(setq-default left-fringe-width 20)
(setq-default right-fringe-width 20)
-;; Margins: https://stackoverflow.com/a/22320638/7980887
-(defun my-set-text-margins ()
- "Set margins in current buffer."
- (setq left-margin-width 50)
- (setq right-margin-width 50))
-
-(add-hook 'text-mode-hook 'my-set-text-margins)
-
-(defun my-set-prog-margins ()
- "Set margins in current buffer."
- (setq left-margin-width 25)
- (setq right-margin-width 25))
-
-(add-hook 'prog-mode-hook 'my-set-prog-margins)
-
+;; Margin
+(use-package perfect-margin
+ :ensure t
+ :config
+ (perfect-margin-mode 1)
+ )
;; Highlight todos
(use-package hl-todo
@@ -232,9 +223,10 @@
(use-package git-gutter-fringe
:ensure t
:config
- (define-fringe-bitmap 'git-gutter-fr:added [224] nil nil '(center repeated))
- (define-fringe-bitmap 'git-gutter-fr:modified [224] nil nil '(center repeated))
- (define-fringe-bitmap 'git-gutter-fr:deleted [128 192 224 240] nil nil 'bottom))
+ ;(define-fringe-bitmap 'git-gutter-fr:added [224] nil nil '(center repeated))
+ ;(define-fringe-bitmap 'git-gutter-fr:modified [224] nil nil '(center repeated))
+ ;(define-fringe-bitmap 'git-gutter-fr:deleted [128 192 224 240] nil nil 'bottom)
+ )
(use-package magit
:ensure t)
diff --git a/lisp/org-custom.el b/lisp/org-custom.el
index 96bf819..8aa1417 100644
--- a/lisp/org-custom.el
+++ b/lisp/org-custom.el
@@ -112,5 +112,7 @@
(use-package org-download
:ensure t)
+(setq org-log-repeat nil)
+
(provide 'org-custom)
;;; org-custom.el ends here