Merge branch 'master' of gitlab.com:marcus-kammer/emacs.d
This commit is contained in:
commit
477f3c7f35
1 changed files with 43 additions and 29 deletions
72
init.el
72
init.el
|
@ -1,6 +1,7 @@
|
|||
;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe
|
||||
;; (add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/bundle/nord-theme/"))
|
||||
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle"))
|
||||
(global-unset-key "\C-z")
|
||||
|
||||
;; Added by Package.el. This must come before configurations of
|
||||
;; installed packages. Don't delete this line. If you don't want it,
|
||||
;; just comment it out by adding a semicolon to the start of the line.
|
||||
|
@ -25,6 +26,13 @@ There are two things you can do about this warning:
|
|||
(add-to-list 'package-archives (cons "gnu" (concat proto "://elpa.gnu.org/packages/")))))
|
||||
(package-initialize)
|
||||
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
|
@ -52,12 +60,18 @@ There are two things you can do about this warning:
|
|||
(quote
|
||||
("82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
|
||||
'(default-frame-alist
|
||||
(quote
|
||||
((fullscreen . maximized)
|
||||
(width . 86)
|
||||
(height . 46)
|
||||
(font . "Iosevka Term-13.0")
|
||||
(alpha 96 . 80))))
|
||||
(quote
|
||||
((fullscreen . maximized)
|
||||
(width . 86)
|
||||
(height . 46)
|
||||
(font . "Iosevka Term-13.0")
|
||||
(vertical-scroll-bars)
|
||||
(horizontal-scroll-bars)
|
||||
(menu-bar-lines . 0)
|
||||
(tool-bar-lines . 0)
|
||||
(line-spacing . 2)
|
||||
(undecorated . t)
|
||||
(alpha 96 . 80))))
|
||||
'(delete-selection-mode t)
|
||||
'(diary-file "~/Documents/Diary/diary")
|
||||
'(display-battery-mode nil)
|
||||
|
@ -76,6 +90,7 @@ There are two things you can do about this warning:
|
|||
'(global-auto-revert-mode t)
|
||||
'(global-font-lock-mode t)
|
||||
'(global-hl-line-mode t)
|
||||
'(icomplete-mode t)
|
||||
'(indent-tabs-mode nil)
|
||||
'(inferior-lisp-program "/usr/bin/clisp" t)
|
||||
'(inhibit-startup-screen t)
|
||||
|
@ -104,12 +119,12 @@ There are two things you can do about this warning:
|
|||
("doughellmann" "https://doughellmann.com/blog/feed/" nil 3600)
|
||||
("KDE" "https://dot.kde.org/rss.xml" nil 3600)
|
||||
("Metaebene" "https://metaebene.me/feed/" nil 3600)
|
||||
("Heise Newsticker" "https://www.heise.de/rss/heise-atom.xml" nil 3600)
|
||||
("Stack Exchange" "https://emacs.stackexchange.com/feeds" nil 3600)
|
||||
("Stallman" "https://stallman.org/rss/rss.xml" nil 3600)
|
||||
("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600))))
|
||||
'(nord-comment-brightness 15)
|
||||
'(nord-region-highlight "snowstorm")
|
||||
'(nord-uniform-mode-lines t)
|
||||
'(org-agenda-files (quote ("~/Documents/Journal")))
|
||||
'(org-babel-load-languages
|
||||
(quote
|
||||
|
@ -154,13 +169,6 @@ There are two things you can do about this warning:
|
|||
(require 'json)
|
||||
(require 'url)
|
||||
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
;; (when (display-graphic-p) (add-to-list 'default-frame-alist '(font . "Roboto Mono-11.0")))
|
||||
;; UTF-8 FTW
|
||||
(prefer-coding-system 'utf-8)
|
||||
(set-keyboard-coding-system 'utf-8)
|
||||
|
@ -168,18 +176,13 @@ There are two things you can do about this warning:
|
|||
|
||||
;; nuke trailing whitespace when writing to a file
|
||||
(add-hook 'write-file-hooks 'delete-trailing-whitespace)
|
||||
(add-hook 'org-mode-hook 'turn-on-font-lock)
|
||||
|
||||
(add-hook 'markdown-mode-hook 'turn-on-font-lock)
|
||||
(add-hook 'python-mode-hook 'turn-on-font-lock)
|
||||
|
||||
;; I got sick of typing "yes"
|
||||
(defalias 'yes-or-no-p 'y-or-n-p)
|
||||
|
||||
;; Turn off chrome
|
||||
(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode))
|
||||
(when (fboundp mode) (funcall mode -1)))
|
||||
|
||||
;; custom packages
|
||||
(when (eq system-type 'darwin)
|
||||
(when (display-graphic-p)
|
||||
;;(set-default-font "RobotoMono Nerd Font 13")
|
||||
|
@ -208,20 +211,14 @@ There are two things you can do about this warning:
|
|||
(fill-paragraph (point-min) (point-max)))
|
||||
|
||||
(put 'upcase-region 'disabled nil)
|
||||
|
||||
(setq view-diary-entries-initially t
|
||||
mark-diary-entries-in-calendar t
|
||||
number-of-diary-entries 7)
|
||||
(add-hook 'diary-display-hook 'fancy-diary-display)
|
||||
(add-hook 'today-visible-calendar-hook 'calendar-mark-today)
|
||||
|
||||
(global-set-key "\C-cl" 'org-store-link)
|
||||
(global-set-key "\C-ca" 'org-agenda)
|
||||
(global-set-key "\C-cc" 'org-capture)
|
||||
(global-set-key "\C-cb" 'org-switchb)
|
||||
(global-set-key (kbd "C-x g") 'magit-status)
|
||||
(global-set-key (kbd "C-x M-g") 'magit-dispatch)
|
||||
|
||||
(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
|
||||
(put 'narrow-to-region 'disabled nil)
|
||||
(put 'narrow-to-page 'disabled nil)
|
||||
|
||||
|
@ -239,7 +236,6 @@ There are two things you can do about this warning:
|
|||
|
||||
;; slime
|
||||
(setq slime-contribs '(slime-fancy))
|
||||
(org-clock-persistence-insinuate)
|
||||
|
||||
;; start a server, unless one is already running
|
||||
(when (require 'server nil t) (unless (server-running-p) (server-start)))
|
||||
|
@ -252,6 +248,24 @@ There are two things you can do about this warning:
|
|||
(lambda (status) (switch-to-buffer-other-window (current-buffer))))
|
||||
)
|
||||
|
||||
;; ===================== Org-mode ====================== ;;
|
||||
(add-hook 'org-mode-hook 'turn-on-font-lock)
|
||||
(org-clock-persistence-insinuate)
|
||||
(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
|
||||
;; ==================== GLOBAL KEYS ==================== ;;
|
||||
(global-set-key "\C-c l" 'org-store-link)
|
||||
(global-set-key "\C-c a" 'org-agenda)
|
||||
(global-set-key "\C-c c" 'org-capture)
|
||||
(global-set-key "\C-c b" 'org-switchb)
|
||||
(global-set-key (kbd "C-x g") 'magit-status)
|
||||
(global-set-key (kbd "C-x M-g") 'magit-dispatch)
|
||||
(global-unset-key "\C-z")
|
||||
|
||||
;; ================= ALWAYS AT THE END ================= ;;
|
||||
;; Turn off chrome
|
||||
;(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode))
|
||||
; (when (fboundp mode) (funcall mode -1)))
|
||||
|
||||
;; Local Variables:
|
||||
;; mode: emacs-lisp
|
||||
;; coding: utf-8-unix
|
||||
|
|
Loading…
Add table
Reference in a new issue