From 84abc0efa5c0a382118e497bf152b93fc93e6b39 Mon Sep 17 00:00:00 2001
From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com>
Date: Tue, 7 May 2019 17:20:19 +0200
Subject: [PATCH] Update settings and init

---
 bundle/windows-customs.el |  1 +
 init.el                   | 67 +++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/bundle/windows-customs.el b/bundle/windows-customs.el
index e2defa3f..6f8a4973 100644
--- a/bundle/windows-customs.el
+++ b/bundle/windows-customs.el
@@ -1,6 +1,7 @@
 (when (eq system-type 'windows-nt)
     (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)
diff --git a/init.el b/init.el
index b20059b0..4c9a6236 100644
--- a/init.el
+++ b/init.el
@@ -1,11 +1,25 @@
 ;; -*- 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"))
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
 
+(load-theme 'nord t)
+
+(require 'markdown-mode)
+(require 'linum-relative)
+(require 'fill-column-indicator)
+
+(require 'evo-feeds)
 
 ;; 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.
@@ -16,22 +30,28 @@
     ("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
  '(display-time-world-list
    (quote
-    (("America/New_York" "New York")
-     ("America/Los_Angeles" "Los Angeles")
-     ("America/Nassau" "Nassau")
-     ("Europe/Istanbul" "Istanbul")
-     ("Europe/London" "London")
-     ("Europe/Berlin" "Berlin")
-     ("Asia/Shanghai" "China")
-     ("Asia/Tokyo" "Tokyo"))))
+    (("UTC+7" "Los Angeles")
+     ("UTC+4" "New York")
+     ("UTC-1" "London")
+     ("UTC-2" "Berlin")
+     ("UTC-3" "Istanbul")
+     ("UTC-8" "Shanghai")
+     ("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)
+ '(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.
@@ -40,29 +60,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)