marcuskammer/emacs.d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Marcus Kammer 2019-08-12 10:38:28 +02:00
commit 7121e54087
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init.el
View file

@ -1,7 +1,7 @@
;; -*- coding: utf-8 -*- ;; -*- 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"))
(global-unset-key "\C-z")
;; Added by Package.el. This must come before configurations of ;; Added by Package.el. This must come before configurations of
;; installed packages. Don't delete this line. If you don't want it, ;; 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. ;; just comment it out by adding a semicolon to the start of the line.
@ -37,9 +37,10 @@ There are two things you can do about this warning:
'(calendar-date-style (quote iso)) '(calendar-date-style (quote iso))
'(calendar-week-start-day 1) '(calendar-week-start-day 1)
'(column-number-mode nil) '(column-number-mode nil)
'(custom-enabled-themes (quote (nord)))
'(custom-safe-themes '(custom-safe-themes
(quote (quote
("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) ("82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default)))
'(delete-selection-mode t) '(delete-selection-mode t)
'(diary-file "~/Documents/Diary/diary") '(diary-file "~/Documents/Diary/diary")
'(display-battery-mode nil) '(display-battery-mode nil)
@ -94,8 +95,8 @@ There are two things you can do about this warning:
'(package-enable-at-startup t) '(package-enable-at-startup t)
'(package-selected-packages '(package-selected-packages
(quote (quote
(docker docker-api docker-cli docker-compose-mode dockerfile-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode w3m slime gherkin-mode gitlab gitlab-ci-mode org-jira powershell helm gitconfig-mode gitignore-mode ox-rst typescript-mode ## skewer-mode ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit))) (latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode w3m slime gherkin-mode gitlab gitlab-ci-mode org-jira powershell helm gitconfig-mode gitignore-mode ox-rst typescript-mode ## skewer-mode ob-http ob-ipython ob-restclient linum-relative markdown-mode nord-theme restclient request restclient-test yaml-mode magit)))
'(python-shell-interpreter "ipython") '(python-shell-interpreter "python3")
'(request-log-level (quote debug)) '(request-log-level (quote debug))
'(request-message-level (quote debug)) '(request-message-level (quote debug))
'(require-final-newline t) '(require-final-newline t)
@ -104,8 +105,6 @@ There are two things you can do about this warning:
'(timeclock-mode-line-display t) '(timeclock-mode-line-display t)
'(visible-bell 1)) '(visible-bell 1))
(require 'markdown-mode) (require 'markdown-mode)
(require 'linum-relative) (require 'linum-relative)
(require 'fill-column-indicator) (require 'fill-column-indicator)
@ -216,6 +215,5 @@ There are two things you can do about this warning:
(setq slime-contribs '(slime-fancy)) (setq slime-contribs '(slime-fancy))
(org-clock-persistence-insinuate) (org-clock-persistence-insinuate)
(load-theme 'nord t)
;; start a server, unless one is already running ;; start a server, unless one is already running
(when (require 'server nil t) (unless (server-running-p) (server-start))) (when (require 'server nil t) (unless (server-running-p) (server-start)))