Merge branch 'main' of gitlab.com:marcuskammer/emacs.d into main

This commit is contained in:
Marcus Kammer 2020-09-29 19:33:42 +02:00
commit b1edfeecdb
8 changed files with 27 additions and 15 deletions

View file

@ -1,5 +1,7 @@
;; PACKAGE
(require 'package)
(require 'use-package)
(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos))
(not (gnutls-available-p))))
(proto (if no-ssl "http" "https")))
@ -19,39 +21,35 @@ There are two things you can do about this warning:
(package-initialize)
;; PACKAGES
;; USE-PACKAGE
(setq use-package-always-ensure t)
(use-package company
:ensure t
:init
(global-company-mode))
(use-package ivy
:ensure t
:bind (("C-s" . swiper))
:init
(ivy-mode 1))
(use-package nov
:ensure t
:config
(setq nov-text-width 80))
(use-package projectile
:ensure t
:init
(projectile-mode +1))
(define-key projectile-mode-map (kbd "s-p") 'projectile-command-map)
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
(use-package elpy
:ensure t)
(use-package elpy)
(use-package eglot
:ensure t
:hook ((python-mode . eglot-ensure)))
(use-package js2-mode
:ensure t
:interpreter (("node" . js2-mode))
:bind (:map js2-mode-map ("C-c C-p" . js2-print-json-path))
:mode "\\.\\(js\\|json\\)$"
@ -63,7 +61,6 @@ There are two things you can do about this warning:
js2-mode-show-strict-warnings nil))
(use-package web-mode
:ensure t
:mode "\\.html?\\'"
:init
(dolist (hook '(emmet-mode ac-emmet-html-setup ac-emmet-css-setup))
@ -88,13 +85,11 @@ There are two things you can do about this warning:
(setq emmet-use-css-transform nil))))))
(use-package slime
:ensure t
:config (setq inferior-lisp-program (executable-find "sbcl")))
(use-package org
:ensure t
:config
(setq org-agenda-dim-blocked-tasks nil
org-agenda-inhibit-startup nil
@ -108,3 +103,20 @@ There are two things you can do about this warning:
org-startup-truncated nil
org-todo-keywords (quote ((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
org-use-property-inheritance nil))
(use-package helpful
:bind (("C-h f" . #'helpful-callable)
("C-h v" . #'helpful-variable)
("C-h k" . #'helpful-key)
("C-c C-d" . #'helpful-at-point)
("C-h F" . #'helpful-function)
("C-h C" . #'helpful-command)))
(use-package counsel
:bind (("M-x" . counsel-M-x)
("C-x b" . counsel-ibuffer)
("C-x C-f" . counsel-find-file)
:map minibuffer-local-map
("C-r" . 'counsel-minibuffer-history)))
(use-package ox-reveal)

View file

@ -23,8 +23,7 @@
(width . 88)
(height . 64)
(alpha . 98)
(fullscreen . maximized)
(vertical-scroll-bars))))
(fullscreen . maximized))))
'(delete-by-moving-to-trash t)
'(diary-file
"d:/UserData/marcus.kammer/OneDrive - Siemens AG/Diary/diary")
@ -96,7 +95,8 @@
"c:/Users/Marcus.Kammer/AppData/Local/Programs/plantuml/plantuml.jar")
'(package-selected-packages
(quote
(nov gnu-elpa-keyring-update slime-company elpy eglot color-theme-sanityinc-tomorrow ein projectile markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ace-window htmlize ivy magit)))
(ox-reveal counsel all-the-icons-dired all-the-icons-gnus all-the-icons-ibuffer all-the-icons-ivy all-the-icons-ivy-rich helpful nov gnu-elpa-keyring-update slime-company elpy eglot color-theme-sanityinc-tomorrow ein projectile markdown-preview-mode request rust-mode sphinx-frontend sphinx-mode racket-mode geiser slime web-mode js2-mode markdown-mode yaml-mode olivetti use-package nord-theme nordless-theme org toc-org ace-window htmlize ivy magit)))
'(projectile-completion-system (quote ivy))
'(python-indent-guess-indent-offset nil)
'(python-shell-interpreter "ipython")
'(ring-bell-function (quote ignore))

BIN
fonts/all-the-icons.ttf Normal file

Binary file not shown.

BIN
fonts/file-icons.ttf Normal file

Binary file not shown.

BIN
fonts/fontawesome.ttf Normal file

Binary file not shown.

Binary file not shown.

BIN
fonts/octicons.ttf Normal file

Binary file not shown.

BIN
fonts/weathericons.ttf Normal file

Binary file not shown.