From c85a3bee329acfae68cfdebd6c2d7587a474690a Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Thu, 11 May 2017 21:27:48 +0300 Subject: [PATCH] Add multi-term to Readme --- README.md | 6 +++++- emacs | 2 +- languages.el | 3 +++ packages.el | 4 ---- themes.el | 14 +++----------- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8bdf53e..f7c7cf1 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ git clone git@github.com:maciej-szlosarczyk/emacs.git ~/.emacs.d ln -s ~/.emacs.d/emacs ~/.emacs ``` - ## Selected packages The following packages are included or required: @@ -32,3 +31,8 @@ The following packages are included or required: ## Compatibility notes Tested on MacOS, requires additional packages such as ag (`the_silver_searcher`). + +## TODO + +1. Add and configure multiterm + * Add `multi-term-mode-hook` for trailing whitespace. diff --git a/emacs b/emacs index a211a2c..6f4e54b 100644 --- a/emacs +++ b/emacs @@ -25,7 +25,7 @@ '(hl-paren-colors (quote ("#ecf0f1" "#ecf0f1" "#c0392b"))) '(package-selected-packages (quote - (groovy-mode flycheck-rust racer column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag))) + (multi-term groovy-mode flycheck-rust racer column-enforce-mode column-marker web-mode helm-themes less-css-mode jade-mode zenburn-theme monokai-theme smart-mode-line-powerline-theme smart-mode-line mode-icons airline-themes atom-one-dark-theme neotree ant rainbow-delimiters rust-mode scala-mode haskell-mode yasnippet yaml-mode ujelly-theme rvm ruby-end rinari noctilux-theme markdown-mode jira indent-guide helm-projectile helm-ag haml-mode flycheck flatui-theme exec-path-from-shell evil-terminal-cursor-changer evil-nerd-commenter evil-magit evil-leader dumb-jump dockerfile-mode diff-hl base16-theme avk-emacs-themes alchemist aggressive-indent ag))) '(safe-local-variable-values (quote ((encoding . utf-8)))) '(sml/active-background-color "#34495e") '(sml/active-foreground-color "#ecf0f1") diff --git a/languages.el b/languages.el index 7111259..6fac314 100644 --- a/languages.el +++ b/languages.el @@ -98,5 +98,8 @@ (setq web-mode-markup-indent-offset 2) (setq web-mode-code-indent-offset 2) +;; CSS-mode +(setq css-indent-offset 2) + ;;; languages.el ends here diff --git a/packages.el b/packages.el index 14d02ea..904e919 100644 --- a/packages.el +++ b/packages.el @@ -129,10 +129,6 @@ (package-refresh-contents) (package-install 'atom-one-dark-theme)) -(unless (package-installed-p 'color-theme-approximate) - (package-refresh-contents) - (package-install 'color-theme-approximate)) - (unless (package-installed-p 'helm-themes) (package-refresh-contents) (package-install 'helm-themes)) diff --git a/themes.el b/themes.el index 457b79b..3fb2334 100644 --- a/themes.el +++ b/themes.el @@ -18,8 +18,6 @@ (setq display-time-format "%H:%M") (display-time-mode t) -;; NOTE: airline is extremely slow, do not use it - ;; (load-theme 'ujelly t t) (load-theme 'avk-daylight t t) (load-theme 'monokai t t) @@ -27,20 +25,14 @@ (load-theme 'atom-one-dark t t) (load-theme 'flatui t t) (load-theme 'noctilux t t) +(load-theme 'whiteboard t t) (require 'helm-themes) (if (display-graphic-p) (progn - (enable-theme 'atom-one-dark)) - ;; (enable-theme 'airline-doom-one) - ;; (helm-themes 'avk-daylight t)) - + (enable-theme 'flatui)) (progn - ;; (enable-theme 'flatui)) - (enable-theme 'flatui) - ;; (enable-theme 'airline-base16-shell-dark) - ) - ) + (enable-theme 'flatui))) (color-theme-approximate-on) (set-face-attribute 'default nil :font "Hasklig 13")