From 895663ba805a9b5f17c77cd64b87a8ec8b044efb Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Wed, 18 Sep 2019 12:46:12 +0200 Subject: [PATCH 1/4] Update init --- init.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 6cf32cef..fef63209 100755 --- a/init.el +++ b/init.el @@ -1,3 +1,4 @@ +;; %USERPROFILE%\AppData\Local\Programs\emacs-26.2-x86_64\bin\emacsclientw.exe -c -n -a runemacs.exe ;; (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")) (global-unset-key "\C-z") @@ -76,6 +77,7 @@ There are two things you can do about this warning: '(global-auto-revert-mode t) '(global-font-lock-mode t) '(global-hl-line-mode t) + '(icomplete-mode t) '(indent-tabs-mode nil) '(inferior-lisp-program "/usr/bin/clisp" t) '(inhibit-startup-screen t) @@ -102,7 +104,6 @@ There are two things you can do about this warning: ("doughellmann" "https://doughellmann.com/blog/feed/" nil 3600) ("KDE" "https://dot.kde.org/rss.xml" nil 3600) ("Metaebene" "https://metaebene.me/feed/" nil 3600) - ("Heise Newsticker" "https://www.heise.de/rss/heise-atom.xml" nil 3600) ("Stack Exchange" "https://emacs.stackexchange.com/feeds" nil 3600) ("Stallman" "https://stallman.org/rss/rss.xml" nil 3600) ("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600)))) @@ -132,7 +133,7 @@ There are two things you can do about this warning: '(package-selected-packages (quote (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) + '(python-shell-interpreter "python3") '(request-log-level (quote debug)) '(request-message-level (quote debug)) '(require-final-newline t) From f4dc4fe1bf5b50623f80997063da45b92f0cf0de Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Wed, 18 Sep 2019 13:13:20 +0200 Subject: [PATCH 2/4] Update init --- init.el | 250 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 127 insertions(+), 123 deletions(-) diff --git a/init.el b/init.el index fef63209..a111cb31 100755 --- a/init.el +++ b/init.el @@ -26,123 +26,6 @@ There are two things you can do about this warning: (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. - ;; Your init file should contain only one such instance. - ;; 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-intermonth-text - (quote - (propertize - (format "%2d" - (car - (calendar-iso-from-absolute - (calendar-absolute-from-gregorian - (list month day year))))) - (quote font-lock-face) - (quote font-lock-function-name-face)))) - '(calendar-week-start-day 1) - '(column-number-mode t) - '(custom-enabled-themes (quote (nord))) - '(custom-safe-themes - (quote - ("82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) - '(default-frame-alist - (quote - ((fullscreen . maximized) - (width . 86) - (height . 46) - (font . "Iosevka Term-13.0") - (alpha 96 . 80)))) - '(delete-selection-mode t) - '(diary-file "~/Documents/Diary/diary") - '(display-battery-mode nil) - '(display-line-numbers nil) - '(display-time-mode t) - '(display-time-world-list - (quote - (("America/Los_Angeles" "Seattle") - ("America/New_York" "New York") - ("Europe/London" "London") - ("Europe/Paris" "Paris") - ("Asia/Calcutta" "Bangalore") - ("Asia/Tokyo" "Tokyo")))) - '(fill-column 72) - '(font-lock-maximum-decoration t) - '(global-auto-revert-mode t) - '(global-font-lock-mode t) - '(global-hl-line-mode t) - '(icomplete-mode t) - '(indent-tabs-mode nil) - '(inferior-lisp-program "/usr/bin/clisp" t) - '(inhibit-startup-screen t) - '(line-number-mode t) - '(line-spacing 3) - '(linum-relative-backend (quote display-line-numbers-mode)) - '(major-mode (quote text-mode)) - '(make-backup-files nil) - '(network-security-level (quote medium)) - '(newsticker-download-logos nil) - '(newsticker-frontend (quote newsticker-plainview)) - '(newsticker-show-descriptions-of-new-items nil) - '(newsticker-url-list-defaults - (quote - (("Emacs Wiki" "https://www.emacswiki.org/emacs?action=rss" nil 3600) - ("Sachachua" "https://sachachua.com/blog/feed/" nil 3600) - ("openSuse News" "https://news.opensuse.org/feed" nil 3600) - ("Phoronix" "https://www.phoronix.com/rss.php" nil 3600) - ("Ubuntu" "https://blog.ubuntu.com/feed" nil 3600) - ("Netzpolitik" "https://logbuch-netzpolitik.de/feed" nil 3600) - ("PBP" "https://pbpython.com/feeds/all.atom.xml" nil 3600) - ("Planet Python" "https://planetpython.org/rss20.xml" nil 3600) - ("lucumr" "http://lucumr.pocoo.org/feed.atom" nil 3600) - ("doughellmann" "https://doughellmann.com/blog/feed/" nil 3600) - ("KDE" "https://dot.kde.org/rss.xml" nil 3600) - ("Metaebene" "https://metaebene.me/feed/" nil 3600) - ("Stack Exchange" "https://emacs.stackexchange.com/feeds" nil 3600) - ("Stallman" "https://stallman.org/rss/rss.xml" nil 3600) - ("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600)))) - '(nord-comment-brightness 15) - '(nord-region-highlight "snowstorm") - '(org-agenda-files (quote ("~/Documents/Journal"))) - '(org-babel-load-languages - (quote - ((js . t) - (emacs-lisp . t) - (python . t) - (sqlite . t) - (lisp . t) - (shell . t) - (css . t) - (calc . t)))) - '(org-babel-shell-names - (quote - ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh"))) - '(org-clock-persist t) - '(org-confirm-babel-evaluate nil) - '(org-default-notes-file "~/Documents/Journal/notes.org") - '(org-html-doctype "html5") - '(org-html-html5-fancy t) - '(org-log-done (quote time)) - '(package-enable-at-startup t) - '(package-selected-packages - (quote - (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") - '(request-log-level (quote debug)) - '(request-message-level (quote debug)) - '(require-final-newline t) - '(restclient-log-request t) - '(restclient-same-buffer-response t) - '(size-indication-mode nil) - '(timeclock-file "~/Documents/Diary/timelog") - '(timeclock-mode-line-display t) - '(visible-bell 1)) (require 'markdown-mode) (require 'linum-relative) @@ -153,12 +36,7 @@ There are two things you can do about this warning: (require 'json) (require 'url) -(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 . "Roboto Mono-11.0"))) ;; UTF-8 FTW (prefer-coding-system 'utf-8) @@ -251,6 +129,132 @@ There are two things you can do about this warning: (lambda (status) (switch-to-buffer-other-window (current-buffer)))) ) +(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. + ) + +(custom-set-variables + ;; custom-set-variables 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. + '(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-intermonth-text + (quote + (propertize + (format "%2d" + (car + (calendar-iso-from-absolute + (calendar-absolute-from-gregorian + (list month day year))))) + (quote font-lock-face) + (quote font-lock-function-name-face)))) + '(calendar-week-start-day 1) + '(column-number-mode t) + '(custom-enabled-themes (quote (nord))) + '(custom-safe-themes + (quote + ("82358261c32ebedfee2ca0f87299f74008a2e5ba5c502bde7aaa15db20ee3731" "4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) + '(default-frame-alist + (quote + ((fullscreen . maximized) + (width . 86) + (height . 46) + (font . "Iosevka Term-13.0") + (alpha 96 . 80)))) + '(delete-selection-mode t) + '(diary-file "~/Documents/Diary/diary") + '(display-battery-mode nil) + '(display-line-numbers nil) + '(display-time-mode t) + '(display-time-world-list + (quote + (("America/Los_Angeles" "Seattle") + ("America/New_York" "New York") + ("Europe/London" "London") + ("Europe/Paris" "Paris") + ("Asia/Calcutta" "Bangalore") + ("Asia/Tokyo" "Tokyo")))) + '(fill-column 72) + '(font-lock-maximum-decoration t) + '(global-auto-revert-mode t) + '(global-font-lock-mode t) + '(global-hl-line-mode t) + '(icomplete-mode t) + '(indent-tabs-mode nil) + '(inferior-lisp-program "/usr/bin/clisp" t) + '(inhibit-startup-screen t) + '(line-number-mode t) + '(line-spacing 3) + '(linum-relative-backend (quote display-line-numbers-mode)) + '(major-mode (quote text-mode)) + '(make-backup-files nil) + '(network-security-level (quote medium)) + '(newsticker-download-logos nil) + '(newsticker-frontend (quote newsticker-plainview)) + '(newsticker-show-descriptions-of-new-items nil) + '(newsticker-url-list-defaults + (quote + (("Emacs Wiki" "https://www.emacswiki.org/emacs?action=rss" nil 3600) + ("Sachachua" "https://sachachua.com/blog/feed/" nil 3600) + ("openSuse News" "https://news.opensuse.org/feed" nil 3600) + ("Phoronix" "https://www.phoronix.com/rss.php" nil 3600) + ("Ubuntu" "https://blog.ubuntu.com/feed" nil 3600) + ("Netzpolitik" "https://logbuch-netzpolitik.de/feed" nil 3600) + ("PBP" "https://pbpython.com/feeds/all.atom.xml" nil 3600) + ("Planet Python" "https://planetpython.org/rss20.xml" nil 3600) + ("lucumr" "http://lucumr.pocoo.org/feed.atom" nil 3600) + ("doughellmann" "https://doughellmann.com/blog/feed/" nil 3600) + ("KDE" "https://dot.kde.org/rss.xml" nil 3600) + ("Metaebene" "https://metaebene.me/feed/" nil 3600) + ("Stack Exchange" "https://emacs.stackexchange.com/feeds" nil 3600) + ("Stallman" "https://stallman.org/rss/rss.xml" nil 3600) + ("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600)))) + '(nord-comment-brightness 15) + '(nord-region-highlight "snowstorm") + '(nord-uniform-mode-lines t) + '(org-agenda-files (quote ("~/Documents/Journal"))) + '(org-babel-load-languages + (quote + ((js . t) + (emacs-lisp . t) + (python . t) + (sqlite . t) + (lisp . t) + (shell . t) + (css . t) + (calc . t)))) + '(org-babel-shell-names + (quote + ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh"))) + '(org-clock-persist t) + '(org-confirm-babel-evaluate nil) + '(org-default-notes-file "~/Documents/Journal/notes.org") + '(org-html-doctype "html5") + '(org-html-html5-fancy t) + '(org-log-done (quote time)) + '(package-enable-at-startup t) + '(package-selected-packages + (quote + (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) + '(request-log-level (quote debug)) + '(request-message-level (quote debug)) + '(require-final-newline t) + '(restclient-log-request t) + '(restclient-same-buffer-response t) + '(size-indication-mode nil) + '(timeclock-file "~/Documents/Diary/timelog") + '(timeclock-mode-line-display t) + '(visible-bell 1)) + ;; Local Variables: ;; mode: emacs-lisp ;; coding: utf-8-unix From 1d4ea773010441637b2b6840880b9a3498018efb Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Wed, 18 Sep 2019 14:10:12 +0200 Subject: [PATCH 3/4] Update init --- init.el | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/init.el b/init.el index 6cf32cef..250d6940 100755 --- a/init.el +++ b/init.el @@ -1,6 +1,6 @@ ;; (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")) -(global-unset-key "\C-z") + ;; 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. @@ -76,9 +76,11 @@ There are two things you can do about this warning: '(global-auto-revert-mode t) '(global-font-lock-mode t) '(global-hl-line-mode t) + '(icomplete-mode t) '(indent-tabs-mode nil) '(inferior-lisp-program "/usr/bin/clisp" t) '(inhibit-startup-screen t) + '(initial-frame-alist nil) '(line-number-mode t) '(line-spacing 3) '(linum-relative-backend (quote display-line-numbers-mode)) @@ -102,12 +104,12 @@ There are two things you can do about this warning: ("doughellmann" "https://doughellmann.com/blog/feed/" nil 3600) ("KDE" "https://dot.kde.org/rss.xml" nil 3600) ("Metaebene" "https://metaebene.me/feed/" nil 3600) - ("Heise Newsticker" "https://www.heise.de/rss/heise-atom.xml" nil 3600) ("Stack Exchange" "https://emacs.stackexchange.com/feeds" nil 3600) ("Stallman" "https://stallman.org/rss/rss.xml" nil 3600) ("Python PEP" "https://www.python.org/dev/peps/peps.rss/" nil 3600)))) '(nord-comment-brightness 15) '(nord-region-highlight "snowstorm") + '(nord-uniform-mode-lines t) '(org-agenda-files (quote ("~/Documents/Journal"))) '(org-babel-load-languages (quote @@ -158,7 +160,7 @@ There are two things you can do about this warning: ;; 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 . "Roboto Mono-11.0"))) + ;; UTF-8 FTW (prefer-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) @@ -173,11 +175,6 @@ 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) -;; Turn off chrome -(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) - (when (fboundp mode) (funcall mode -1))) - -;; custom packages (when (eq system-type 'darwin) (when (display-graphic-p) ;;(set-default-font "RobotoMono Nerd Font 13") @@ -212,13 +209,6 @@ There are two things you can do about this warning: (add-hook 'diary-display-hook 'fancy-diary-display) (add-hook 'today-visible-calendar-hook 'calendar-mark-today) -(global-set-key "\C-cl" 'org-store-link) -(global-set-key "\C-ca" 'org-agenda) -(global-set-key "\C-cc" 'org-capture) -(global-set-key "\C-cb" 'org-switchb) -(global-set-key (kbd "C-x g") 'magit-status) -(global-set-key (kbd "C-x M-g") 'magit-dispatch) - (setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))) (put 'narrow-to-region 'disabled nil) (put 'narrow-to-page 'disabled nil) @@ -250,6 +240,19 @@ There are two things you can do about this warning: (lambda (status) (switch-to-buffer-other-window (current-buffer)))) ) +;; ==================== GLOBAL KEYS ==================== ;; +(global-set-key "\C-cl" 'org-store-link) +(global-set-key "\C-ca" 'org-agenda) +(global-set-key "\C-cc" 'org-capture) +(global-set-key "\C-cb" 'org-switchb) +(global-set-key (kbd "C-x g") 'magit-status) +(global-set-key (kbd "C-x M-g") 'magit-dispatch) +(global-unset-key "\C-z") +;; ================= ALWAYS AT THE END ================= ;; +;; Turn off chrome +(dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) + (when (fboundp mode) (funcall mode -1))) + ;; Local Variables: ;; mode: emacs-lisp ;; coding: utf-8-unix From 2e055a72185a74fc9b390469a9d07327cd44d46f Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Wed, 18 Sep 2019 16:35:12 +0200 Subject: [PATCH 4/4] Update init --- init.el | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/init.el b/init.el index 9eec2eee..a8cd3012 100755 --- a/init.el +++ b/init.el @@ -174,7 +174,7 @@ There are two things you can do about this warning: ;; nuke trailing whitespace when writing to a file (add-hook 'write-file-hooks 'delete-trailing-whitespace) -(add-hook 'org-mode-hook 'turn-on-font-lock) + (add-hook 'markdown-mode-hook 'turn-on-font-lock) (add-hook 'python-mode-hook 'turn-on-font-lock) @@ -209,13 +209,14 @@ There are two things you can do about this warning: (fill-paragraph (point-min) (point-max))) (put 'upcase-region 'disabled nil) + (setq view-diary-entries-initially t mark-diary-entries-in-calendar t number-of-diary-entries 7) (add-hook 'diary-display-hook 'fancy-diary-display) (add-hook 'today-visible-calendar-hook 'calendar-mark-today) -(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))) + (put 'narrow-to-region 'disabled nil) (put 'narrow-to-page 'disabled nil) @@ -233,7 +234,6 @@ There are two things you can do about this warning: ;; slime (setq slime-contribs '(slime-fancy)) -(org-clock-persistence-insinuate) ;; start a server, unless one is already running (when (require 'server nil t) (unless (server-running-p) (server-start))) @@ -246,11 +246,15 @@ There are two things you can do about this warning: (lambda (status) (switch-to-buffer-other-window (current-buffer)))) ) +;; ===================== Org-mode ====================== ;; +(add-hook 'org-mode-hook 'turn-on-font-lock) +(org-clock-persistence-insinuate) +(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED"))) ;; ==================== GLOBAL KEYS ==================== ;; -(global-set-key "\C-cl" 'org-store-link) -(global-set-key "\C-ca" 'org-agenda) -(global-set-key "\C-cc" 'org-capture) -(global-set-key "\C-cb" 'org-switchb) +(global-set-key "\C-c l" 'org-store-link) +(global-set-key "\C-c a" 'org-agenda) +(global-set-key "\C-c c" 'org-capture) +(global-set-key "\C-c b" 'org-switchb) (global-set-key (kbd "C-x g") 'magit-status) (global-set-key (kbd "C-x M-g") 'magit-dispatch) (global-unset-key "\C-z")