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

bundle/darwin-customs.el

@@ -1,11 +0,0 @@
-(when (eq system-type 'darwin)
-    (when (display-graphic-p)
-      ;;(set-default-font "RobotoMono Nerd Font 13")
-      (set-frame-font "RobotoMono Nerd Font 13")
-      (add-to-list 'default-frame-alist '(font . "RobotoMono Nerd Font-13"))
-      (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
-      (add-to-list 'default-frame-alist '(ns-appearance . dark))
-      (add-to-list 'default-frame-alist '(height . 60))
-      (add-to-list 'default-frame-alist '(width . 80)))
-    (unless (display-graphic-p)))
-(provide 'darwin-customs)

bundle/windows-customs.el

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

init.el

@@ -11,6 +11,7 @@
 (require 'markdown-mode)
 (require 'linum-relative)
 (require 'fill-column-indicator)
+(require 'tls)
 
 ;; Added by Package.el.  This must come before configurations of
 ;; installed packages.  Don't delete this line.  If you don't want it,
@@ -44,20 +45,20 @@
  '(global-font-lock-mode t)
  '(global-hl-line-mode t)
  '(indent-tabs-mode nil)
- '(inhibit-startup-screen t)
+ '(inhibit-startup-screen nil)
  '(line-spacing 3)
  '(linum-relative-backend (quote display-line-numbers-mode))
  '(major-mode (quote text-mode))
+ '(newsticker-download-logos nil)
+ '(newsticker-frontend (quote newsticker-plainview))
+ '(newsticker-show-descriptions-of-new-items nil)
  '(newsticker-url-list-defaults
    (quote
     (("Emacs Wiki" "https://www.emacswiki.org/emacs?action=rss" nil 3600)
-     ("LWN (Linux Weekly News)" "https://lwn.net/headlines/rss")
+     ("Linuxjournal" "https://www.linuxjournal.com/node/feed")
-     ("USN" "https://usn.ubuntu.com/atom.xml")
+     ("Phoronix" "https://www.phoronix.com/rss.php")
-     ("gitlab" "https://about.gitlab.com/atom.xml")
+     ("Python PEP" "https://www.python.org/dev/peps/peps.rss/")
-     ("nzz" "https://www.nzz.ch/recent.rss")
+     ("USN" "https://usn.ubuntu.com/atom.xml"))))
-     ("Wikipedia" "https://de.wikipedia.org/w/api.php?action=featuredfeed&feed=onthisday&feedformat=atom")
-     ("mailutils" "http://savannah.gnu.org/news/atom.php?group=mailutils")
-     ("Tagesschau (german)" "https://www.tagesschau.de/newsticker.rdf" nil 1800))))
  '(org-agenda-files (quote ("~/Documents/Journal")))
  '(org-default-notes-file "~/Documents/Journal/notes.org")
  '(package-selected-packages (quote (magit)))
@@ -103,8 +104,23 @@
 (when (require 'server nil t) (unless (server-running-p) (server-start)))
 
 ;; custom packages
-(require 'darwin-customs)
+(when (eq system-type 'darwin)
-(require 'windows-customs)
+    (when (display-graphic-p)
+      ;;(set-default-font "RobotoMono Nerd Font 13")
+      (set-frame-font "RobotoMono Nerd Font 13")
+      (add-to-list 'default-frame-alist '(font . "RobotoMono Nerd Font-13"))
+      (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
+      (add-to-list 'default-frame-alist '(ns-appearance . dark))
+      (add-to-list 'default-frame-alist '(height . 60))
+      (add-to-list 'default-frame-alist '(width . 80))))
+
+(when (eq system-type 'windows-nt)
+    (add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
+    (require 'evo-feeds)
+    (when (display-graphic-p)
+      (add-to-list 'default-frame-alist '(font . "Roboto Mono-11"))
+      (add-to-list 'default-frame-alist '(height . 55))
+      (add-to-list 'default-frame-alist '(width . 80))))
 
 (defun copy-whole-buffer ()
   "Copy entire buffer to clipboard"
@@ -121,3 +137,4 @@
 (global-set-key "\C-ca" 'org-agenda)
 (setq org-todo-keywords
   '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
+(put 'narrow-to-region 'disabled nil)