Update bundle

This commit is contained in:
Marcus Kammer 2019-11-14 13:00:42 +01:00
parent f98b4fbee8
commit 7f0da1e818
5 changed files with 65 additions and 19 deletions

2
.gitignore vendored
View file

@ -5,3 +5,5 @@ elpa/
newsticker/
__evo/
transient
bookmarks
org-clock-*

View file

@ -3,7 +3,7 @@
;; 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.
'(auto-save-default nil)
'(auto-save-default t)
'(backup-directory-alist (quote (("" . "~/.emacs.d/_backup_files"))))
'(blink-cursor-mode nil)
'(cal-html-directory "~/Documents/Diary" t)
@ -33,12 +33,12 @@
(left . 5)
(top . 5)
(width . 86)
(height . 45)
(height . 52)
(font . "Iosevka Term-13.0")
(vertical-scroll-bars)
(horizontal-scroll-bars)
(menu-bar-lines . 0)
(line-spacing . 2)
(line-spacing . 3)
(undecorated . t))))
'(delete-selection-mode t)
'(diary-file "~/Documents/Diary/diary")
@ -56,22 +56,28 @@
("Europe/Paris" "Paris")
("Asia/Calcutta" "Bangalore")
("Asia/Tokyo" "Tokyo"))))
'(fill-column 72)
'(fill-column 80)
'(font-lock-maximum-decoration t)
'(global-auto-revert-mode t)
'(global-display-line-numbers-mode nil)
'(global-font-lock-mode t)
'(global-hl-line-mode t)
'(help-window-select t)
'(history-delete-duplicates t)
'(icomplete-mode t)
'(indent-tabs-mode nil)
'(inferior-lisp-program (executable-find "sbcl") t)
'(inhibit-startup-screen t)
'(initial-major-mode (quote emacs-lisp-mode))
'(kill-read-only-ok t)
'(line-number-mode t)
'(line-spacing 3)
'(linum-relative-backend (quote display-line-numbers-mode))
'(load-prefer-newer t)
'(major-mode (quote text-mode))
'(make-backup-files nil)
'(max-lisp-eval-depth 24000)
'(max-mini-window-height 0.35)
'(max-specpdl-size 19500)
'(network-security-level (quote medium))
'(newsticker-download-logos nil)
@ -130,12 +136,16 @@
(quote
(web-mode zenburn-theme immaterial-theme arc-dark-theme url-http-ntlm syslog-mode org-pomodoro ox-html5slide ox-hugo ox-impress-js ox-ioslide ox-jira ox-json ox-pandoc nov vimish-fold w3 pickle feature-mode elpy elnode ein latex-extra latex-preview-pane docker docker-api docker-cli docker-compose-mode dockerfile-mode python-docstring pytest py-autopep8 pydoc pylint python-info auto-complete-rst sphinx-doc sphinx-frontend sphinx-mode ox-mediawiki ox-minutes ox-nikola cargo racket-mode rust-mode 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 "python3" t)
'(register-preview-delay 2)
'(register-separator 43)
'(request-log-level (quote debug))
'(request-message-level (quote debug))
'(require-final-newline t)
'(resize-mini-windows t)
'(restclient-log-request t)
'(restclient-same-buffer-response t)
'(size-indication-mode nil)
'(tab-width 2)
'(timeclock-file "~/Documents/Diary/timelog")
'(timeclock-mode-line-display t)
'(tool-bar-mode nil)

24
bundle/display.el Normal file
View file

@ -0,0 +1,24 @@
(setq echo-keystrokes 0.02)
(global-font-lock-mode)
(setq-default indicate-buffer-boundaries 'left)
(show-paren-mode)
(setq show-paren-delay 0)
(setq show-paren-style 'expression)
(global-hl-line-mode)
(setq whitespace-style '(tab-mark))
(global-whitespace-mode)
(size-indication-mode)
(column-number-mode)
(setq column-number-indicator-zero-based nil)
(setq prettify-symbols-unprettify-at-point 'right-edge)
(global-prettify-symbols-mode)
(provide 'display)

View file

@ -1,31 +1,38 @@
;; ++++++++++++++++++++ OS
(defun win-set-sbcl ()
;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe
;; (setq inferior-lisp-program (executable-find "sbcl"))
(setq sbcl-exe (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.exe"))
(setq sbcl-core (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.core"))
(setq inferior-lisp-program "sbcl")
(setq slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core)))))
(defun evo-load-paths ()
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
(unless (file-directory-p (expand-file-name "~/Documents"))
(let ((docs-path (getenv "DOCS_PATH")))
(setq org-agenda-files `(,(concat docs-path "\\Journal")))
(setq org-default-notes-file (concat docs-path "\\Journal\\notes.org"))
(setq cal-html-directory (concat docs-path "\\Diary"))
(setq diary-file (concat docs-path "\\Diary\\diary"))
(setq timeclock-file (concat docs-path "\\Diary\\timelog")))))
(when (eq system-type 'darwin)
(when (display-graphic-p)
(add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
(add-to-list 'default-frame-alist '(ns-appearance . dark))))
(when (eq system-type 'windows-nt)
;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe
;; (setq inferior-lisp-program (executable-find "sbcl"))
(setq sbcl-exe (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.exe"))
(setq sbcl-core (expand-file-name "~/AppData/Local/Programs/Steel Bank Common Lisp/1.4.14/sbcl.core"))
(setq slime-lisp-implementations `((sbcl (,sbcl-exe "--core" ,sbcl-core))))
(win-set-sbcl)
(setq python-shell-interpreter "python")
(setq inferior-lisp-program "sbcl")
(add-to-list 'load-path (expand-file-name "~/AppData/Roaming/__secrets"))
(cd "~/opt")
(when (display-graphic-p)
(add-to-list 'default-frame-alist '(undecorated . nil))
(add-to-list 'default-frame-alist '(font . "Iosevka Term-12")))
(when (string= (system-name) "EVG02667NB")
(add-to-list 'load-path (expand-file-name "~/.emacs.d/__evo"))
(unless (file-directory-p (expand-file-name "~/Documents"))
(let ((docs-path (getenv "DOCS_PATH")))
(setq org-agenda-files `(,(concat docs-path "\\Journal")))
(setq org-default-notes-file (concat docs-path "\\Journal\\notes.org"))
(setq cal-html-directory (concat docs-path "\\Diary"))
(setq diary-file (concat docs-path "\\Diary\\diary"))
(setq timeclock-file (concat docs-path "\\Diary\\timelog")))))
(evo-load-paths))
(when (string= (system-name) "XPS-8930")
(setq python-shell-interpreter "ipython")))
@ -37,5 +44,6 @@
(setq-default line-spacing 3)
(add-to-list 'default-frame-alist '(font . "Iosevka Term-14")))
(when (string= (system-name) "XPS-13-9380")))
;; ++++++++++++++++++++ OS
(provide 'os)

View file

@ -38,6 +38,8 @@ There are two things you can do about this warning:
(setq big-font "Iosevka Term-14")
(require 'os)
(require 'display)
;; start a server, unless one is already running
(when (require 'server nil t)
(unless (server-running-p)
@ -56,7 +58,7 @@ There are two things you can do about this warning:
;; I got sick of typing "yes"
(defalias 'yes-or-no-p 'y-or-n-p)
(with-current-buffer "*scratch*" (emacs-lock-mode 'kill))
(defun copy-whole-buffer ()
"Copy entire buffer to clipboard"