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

This commit is contained in:
Marcus Kammer 2020-05-01 23:28:08 +02:00
commit 72e4419f5a
7 changed files with 9 additions and 3 deletions

2
.gitignore vendored
View file

@ -16,3 +16,5 @@ elpy/rpc-venv/
/network-security.data
session.*
elpa/
projectile-bookmarks.eld
/projectile.cache

View file

@ -8,6 +8,7 @@
(require 'sbcl-settings)
(require 'hooks)
(require 'elpy-settings)
(require 'org-attach-git)
(provide 'bundles)

View file

@ -69,7 +69,7 @@
'(package-enable-at-startup t)
'(package-selected-packages
(quote
(ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit)))
(gnuplot org org-ref gnu-elpa-keyring-update ob-dart dart-mode dart-server projectile python-django ivy elpy olivetti ace-window graphviz-dot-mode dot-mode plantuml-mode elisp-format elisp-lint flymake-racket google-translate org-pomodoro elm-mode dashboard pickle poet-theme flymake-eslint json-mode darkroom dockerfile-mode ein spacemacs-theme flucui-themes leuven-theme htmlize scss-mode berrys-theme web-mode python-docstring sphinx-doc sphinx-frontend sphinx-mode ox-nikola racket-mode slime gherkin-mode powershell typescript-mode ob-http ob-ipython ob-restclient nord-theme restclient request restclient-test yaml-mode magit)))
'(python-shell-interpreter "python3")
'(register-preview-delay 2)
'(register-separator 43)

View file

@ -17,7 +17,7 @@
(display-time-mode -1) ; Display time in the mode line
(add-to-list 'default-frame-alist '(fullscreen . maximized)) ; Maximize Window
(add-to-list 'default-frame-alist '(font . "Iosevka Term Medium-13"))
(add-to-list 'default-frame-alist '(font . "Iosevka Term-12"))
(when (eq system-type 'gnu/linux)
(add-to-list 'default-frame-alist '(undecorated . t)))

View file

@ -4,6 +4,7 @@
org-agenda-inhibit-startup nil
org-babel-load-languages (quote
((js . t)
(gnuplot . t)
(emacs-lisp . t)
(python . t)
(sqlite . t)

View file

@ -51,6 +51,8 @@ There are two things you can do about this warning:
(require 'bundles)
(ivy-mode 1)
(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)
;; UTF-8 FTW
(prefer-coding-system 'utf-8)
(set-default-coding-systems 'utf-8)

View file

@ -315,7 +315,7 @@ window_resize_step_lines 2
#: resizing windows. The cells value is used for horizontal resizing
#: and the lines value for vertical resizing.
window_border_width 0.4
window_border_width 0.5
#: The width (in pts) of window borders. Will be rounded to the
#: nearest number of pixels based on screen resolution. Note that