From 297cc40965814ba29194922cfd48a45aafeb4393 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Fri, 3 May 2019 08:49:23 +0200 Subject: [PATCH 1/3] Remove line hilight --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index c9df57f2..3dfd0380 100644 --- a/init.el +++ b/init.el @@ -33,7 +33,7 @@ (menu-bar-mode -1) (tool-bar-mode -1) (scroll-bar-mode -1) -(global-hl-line-mode 'global-hl-line-highlight) + (blink-cursor-mode -1) (add-to-list 'default-frame-alist '(font . "Hack NF-10:bold")) (add-to-list 'default-frame-alist '(height . 60)) From e6ada2be1e96f66312fcd2ca8a4470a231a39890 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Fri, 3 May 2019 11:49:35 +0200 Subject: [PATCH 2/3] Set correct variables --- bundle/darwin-customs.el | 2 +- bundle/windows-customs.el | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bundle/darwin-customs.el b/bundle/darwin-customs.el index 2c603f2c..b65260a0 100644 --- a/bundle/darwin-customs.el +++ b/bundle/darwin-customs.el @@ -1,4 +1,4 @@ -(if (eq system-type 'darwin) +(when (eq system-type 'darwin) (add-to-list 'default-frame-alist '(font . "Hack Nerd Font Mono-13")) (add-to-list 'default-frame-alist '(height . 100)) (add-to-list 'default-frame-alist '(width . 80)) diff --git a/bundle/windows-customs.el b/bundle/windows-customs.el index 8655bd31..e56d7158 100644 --- a/bundle/windows-customs.el +++ b/bundle/windows-customs.el @@ -1,5 +1,9 @@ -(if (eq system-type 'windows-nt) - (add-to-list 'default-frame-alist '(font . "Hack NF-10:bold")) +(when (eq system-type 'windows-nt) + (add-to-list 'default-frame-alist '(font . "Hack NF-12:bold")) (add-to-list 'default-frame-alist '(height . 60)) - (add-to-list 'default-frame-alist '(width . 80))) + (add-to-list 'default-frame-alist '(width . 80)) + (when (display-graphic-p) + ) + (unless (display-graphic-p) + )) (provide 'windows-customs) From 86d4d1c5bba9572e484b60d22bdfc76f6fdf7385 Mon Sep 17 00:00:00 2001 From: Marcus Kammer <2262664-marcus-kammer@users.noreply.gitlab.com> Date: Fri, 3 May 2019 16:13:49 +0200 Subject: [PATCH 3/3] Update init and add markdown mode --- .gitmodules | 3 +++ bundle/markdown-mode | 1 + bundle/windows-customs.el | 2 +- init.el | 38 ++++++++++++++++++++++---------------- 4 files changed, 27 insertions(+), 17 deletions(-) create mode 160000 bundle/markdown-mode diff --git a/.gitmodules b/.gitmodules index f215357d..fc91e4b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "bundle/linum-relative"] path = bundle/linum-relative url = https://github.com/coldnew/linum-relative.git +[submodule "bundle/markdown-mode"] + path = bundle/markdown-mode + url = https://github.com/jrblevin/markdown-mode.git diff --git a/bundle/markdown-mode b/bundle/markdown-mode new file mode 160000 index 00000000..115f77df --- /dev/null +++ b/bundle/markdown-mode @@ -0,0 +1 @@ +Subproject commit 115f77df9755c6a453f3e5d9623ff885d207ea82 diff --git a/bundle/windows-customs.el b/bundle/windows-customs.el index e56d7158..e7432995 100644 --- a/bundle/windows-customs.el +++ b/bundle/windows-customs.el @@ -1,6 +1,6 @@ (when (eq system-type 'windows-nt) (add-to-list 'default-frame-alist '(font . "Hack NF-12:bold")) - (add-to-list 'default-frame-alist '(height . 60)) + (add-to-list 'default-frame-alist '(height . 55)) (add-to-list 'default-frame-alist '(width . 80)) (when (display-graphic-p) ) diff --git a/init.el b/init.el index fd9d3597..11286134 100644 --- a/init.el +++ b/init.el @@ -15,11 +15,13 @@ ("4515feff287a98863b7b7f762197a78a7c2bfb6ec93879e7284dff184419268c" default))) '(display-time-world-list (quote - (("UTC-2" "Central Europe") - ("UTC-9" "Tokyo") - ("UTC+4" "New York") + ( ("UTC+7" "San Francisco") - ("UTC-1" "London"))))) + ("UTC+4" "New York") + ("UTC-1" "London") + ("UTC-2" "Central Europe") + ("UTC-9" "Tokyo") + )))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -30,30 +32,37 @@ (add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/bundle/nord-theme/")) (load-theme 'nord t) +;; load paths (add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle")) +(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative")) +(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/markdown-mode")) + +;; required packages (require 'rst) (require 'fill-column-indicator) -(add-to-list 'load-path (expand-file-name "~/.emacs.d/bundle/linum-relative")) (require 'linum-relative) +(require 'markdown-mode) + +;; configurations +(setq-default fill-column 72) +(setq visible-bell 1) (setq linum-relative-backend 'display-line-numbers-mode) +(setq require-final-newline t) +(setq font-lock-maximum-decoration t) +(setq inhibit-startup-screen t initial-buffer-choice t) + +;; set modes (line-number-mode 1) (column-number-mode 1) (display-time-mode 1) (display-battery-mode 1) - (blink-cursor-mode -1) -(setq visible-bell 1) -;; wrap at 80 columns - 70 is mad -(setq-default fill-column 80) ;; UTF-8 FTW (set-terminal-coding-system 'utf-8) (set-keyboard-coding-system 'utf-8) (prefer-coding-system 'utf-8) -;; always add a trailing newline - POSIX -(setq require-final-newline t) - ;; nuke trailing whitespace when writing to a file (add-hook 'write-file-hooks 'delete-trailing-whitespace) @@ -64,9 +73,6 @@ (dolist (mode '(menu-bar-mode tool-bar-mode scroll-bar-mode)) (when (fboundp mode) (funcall mode -1))) -;; inhibit startup screen -(setq inhibit-startup-screen t initial-buffer-choice t) - ;; start a server, unless one is already running (when (require 'server nil t) (unless (server-running-p) @@ -74,7 +80,7 @@ ;; always highlight syntax (global-font-lock-mode t) -(setq font-lock-maximum-decoration t) +;; custom packages (require 'darwin-customs) (require 'windows-customs)