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

init.el

@@ -1,27 +1,30 @@
-
 ;; -*- coding: utf-8 -*-
-(add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/bundle/nord-theme/"))
+;; (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"))
-
-(setq nord-region-highlight "snowstorm")
-(setq nord-comment-brightness 15)
-(load-theme 'nord t)
-
-(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,
 ;; just comment it out by adding a semicolon to the start of the line.
 ;; You may delete these explanatory comments.
 (require 'package)
-(add-to-list 'package-archives
+(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
-             '("melpa-stable" . "https://stable.melpa.org/packages/"))
+                    (not (gnutls-available-p))))
+       (proto (if no-ssl "http" "https")))
+  (when no-ssl
+    (warn "\
+Your version of Emacs does not support SSL connections,
+which is unsafe because it allows man-in-the-middle attacks.
+There are two things you can do about this warning:
+1. Install an Emacs version that does support SSL and be safe.
+2. Remove this warning from your init file so you won't see it again."))
+  ;; Comment/uncomment these two lines to enable/disable MELPA and MELPA Stable as desired
+  (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t)
+  ;;(add-to-list 'package-archives (cons "melpa-stable" (concat proto "://stable.melpa.org/packages/")) t)
+  (when (< emacs-major-version 24)
+    ;; For important compatibility libraries like cl-lib
+    (add-to-list 'package-archives (cons "gnu" (concat proto "://elpa.gnu.org/packages/")))))
 (package-initialize)
+
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -29,14 +32,19 @@
  ;; If there is more than one, they won't work right.
  '(auto-save-default nil)
  '(backup-directory-alist (quote (("" . "~/.emacs.d/_backup_files"))))
+ '(blink-cursor-mode nil)
  '(cal-html-directory "~/Documents/Diary")
  '(calendar-date-style (quote iso))
  '(calendar-week-start-day 1)
+ '(column-number-mode nil)
  '(custom-safe-themes
    (quote
     ("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
  '(delete-selection-mode nil)
  '(diary-file "~/Documents/Diary/diary")
+ '(display-battery-mode nil)
+ '(display-line-numbers (quote relative))
+ '(display-time-mode t)
  '(display-time-world-list
    (quote
     (("America/Los_Angeles" "Seattle")
@@ -52,6 +60,7 @@
  '(global-hl-line-mode t)
  '(indent-tabs-mode nil)
  '(inhibit-startup-screen t)
+ '(line-number-mode t)
  '(line-spacing 3)
  '(linum-relative-backend (quote display-line-numbers-mode))
  '(major-mode (quote text-mode))
@@ -68,29 +77,43 @@
      ("Python PEP" "https://www.python.org/dev/peps/peps.rss/")
      ("openSuse News" "https://news.opensuse.org/feed"))))
  '(org-agenda-files (quote ("~/Documents/Journal")))
+ '(org-babel-load-languages
+   (quote
+    ((js . t)
+     (emacs-lisp . t)
+     (python . t)
+     (sqlite . t)
+     (lisp . t))))
  '(org-default-notes-file "~/Documents/Journal/notes.org")
  '(package-enable-at-startup t)
- '(package-selected-packages (quote (magit)))
+ '(package-selected-packages
+   (quote
+    (ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit)))
  '(require-final-newline t)
+ '(size-indication-mode nil)
  '(timeclock-file "~/Documents/Diary/timelog")
  '(timeclock-mode-line-display t)
  '(visible-bell 1))
 
+(setq nord-region-highlight "snowstorm")
+(setq nord-comment-brightness 15)
+(load-theme 'nord t)
+
+(require 'markdown-mode)
+(require 'linum-relative)
+(require 'fill-column-indicator)
+(require 'tls)
+(require 'request)
+(require 'yaml-mode)
+
 (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 . "Hack-11")))
+(when (display-graphic-p) (add-to-list 'default-frame-alist '(font . "Hack-11")))
-;; set modes
-(line-number-mode -1)
-(column-number-mode -1)
-(blink-cursor-mode -1)
-(display-battery-mode -1)
-(display-time-mode 1)
-(size-indication-mode -1)
 
 ;; UTF-8 FTW
 (prefer-coding-system 'utf-8)
@@ -125,13 +148,15 @@
       (add-to-list 'default-frame-alist '(width . 80))))
 
 (when (eq system-type 'windows-nt)
-  (setq-default line-spacing 5)
+  ;; (setq-default line-spacing 5)
   (add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
   (require 'evo-feeds)
   (when (display-graphic-p)
-      (add-to-list 'default-frame-alist '(height . 60))
+      (add-to-list 'default-frame-alist '(height . 50))
       (add-to-list 'default-frame-alist '(width . 80))
-      (add-to-list 'default-frame-alist '(alpha . (96)))))
+      (add-to-list 'default-frame-alist '(fullscreen . maximized))
+      ;; (add-to-list 'default-frame-alist '(alpha . (96)))
+      ))
 
 (when (eq system-type 'gnu/linux)
     (setq-default line-spacing 3)
@@ -152,10 +177,12 @@
 (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
 (global-set-key "\C-cc" 'org-capture)
 (global-set-key "\C-ca" 'org-agenda)
+
 (setq org-todo-keywords
   '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
 (put 'narrow-to-region 'disabled nil)
 (put 'narrow-to-page 'disabled nil)
+
 (defun duplicate-line()
   (interactive)
   (move-beginning-of-line 1)
@@ -166,3 +193,4 @@
   (yank)
 )
 ;;(global-set-key (kbd "C-d") 'duplicate-line)
+(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))