Merge branch 'master' of gitlab.com:marcus-kammer/emacs.d

This commit is contained in:
Marcus Kammer 2019-05-07 19:26:30 +02:00
commit 1e95dedc86
2 changed files with 26 additions and 28 deletions

View file

@ -1,6 +1,9 @@
(when (eq system-type 'windows-nt)
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
(require 'evo-feeds)
(when (display-graphic-p)
(set-default-font "Hack NF 10")
(add-to-list 'default-frame-alist '(font . "Hack NF-10"))
(add-to-list 'default-frame-alist '(height . 55))
(add-to-list 'default-frame-alist '(width . 80))))
(provide 'windows-customs)

51
init.el
View file

@ -1,11 +1,22 @@
;; -*- coding: utf-8 -*-
(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"))
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/markdown-mode"))
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative"))
(load-theme 'nord t)
(require 'markdown-mode)
(require 'linum-relative)
(require 'fill-column-indicator)
;; 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.
;; You may delete these explanatory comments.
(package-initialize)
(add-to-list 'package-archives
'("melpa-stable" . "https://stable.melpa.org/packages/"))
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
@ -18,21 +29,28 @@
(quote
(("UTC+7" "Los Angeles")
("UTC+4" "New York")
("UTC+4" "Nassau")
("UTC-1" "London")
("UTC-2" "Berlin")
("UTC-3" "Istanbul")
("UTC-8" "Shanghai")
("UTC-8" "Hong Kong")
("UTC-9" "Tokyo"))))
'(fill-column 72)
'(font-lock-maximum-decoration (quote ((ReST . 0))))
'(global-font-lock-mode nil)
'(global-hl-line-mode nil)
'(newsticker-url-list
'(indent-tabs-mode nil)
'(inhibit-startup-screen t)
'(line-spacing 5)
'(linum-relative-backend (quote display-line-numbers-mode))
'(newsticker-url-list-defaults
(quote
(("bbc" "https://feeds.bbci.co.uk/news/world/rss.xml" nil nil nil)
("nzz" "https://www.nzz.ch/recent.rss" nil nil nil)
("datacamp" "https://www.datacamp.com/community/rss.xml" nil nil nil)))))
(("Emacs Wiki" "https://www.emacswiki.org/emacs?action=rss" nil 3600)
("LWN (Linux Weekly News)" "https://lwn.net/headlines/rss")
("Tagesschau (german)" "http://www.tagesschau.de/newsticker.rdf" nil 1800))))
'(package-selected-packages (quote (magit)))
'(require-final-newline t)
'(visible-bell 1))
(custom-set-faces
;; custom-set-faces was added by Custom.
@ -41,29 +59,6 @@
;; If there is more than one, they won't work right.
)
(add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/bundle/nord-theme/"))
(load-theme 'nord t)
;; load paths
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle"))
(autoload 'fill-column-indicator "~/.emacs.d/bundle/fill-column-indicator.el")
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/markdown-mode"))
(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative"))
;; required packages
(require 'markdown-mode)
(require 'linum-relative)
;; configurations
(setq-default indent-tabs-mode nil)
(setq-default fill-column 72)
(setq visible-bell 1)
(setq linum-relative-backend 'display-line-numbers-mode)
(setq require-final-newline t)
(setq font-lock-maximum-decoration t)
(setq inhibit-startup-screen t initial-buffer-choice t)
;; set modes
(line-number-mode -1)
(column-number-mode -1)