From 1a911716c091dc7a46d36fb02f0ab2f4143e7cf5 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Sun, 9 Sep 2018 00:31:51 +0300 Subject: [PATCH] Create new, a little bit better structured configuration * Group configuration by package, and only then by language mode * Slim down all the languages --- 01mac.el | 73 ++++++++++++ 02evil.el | 22 ++++ 03ivy.el | 9 ++ 04magit.el | 7 ++ 05prog-mode.el | 49 ++++++++ 06company-yasnippet.el | 42 +++++++ 07projectile.el | 17 +++ 08purpose.el | 84 ++++++++++++++ 10themes.el | 36 ++++++ 20elisp.el | 8 ++ 20ruby.el | 39 +++++++ 20web.el | 1 + init.el | 105 +++++++++++++++--- .ctags => old/.ctags | 0 README.md => old/README.md | 0 .../config}/base16-not-harmonic-theme.el | 0 {config => old/config}/behaviour.el | 0 {config => old/config}/emacs | 0 {config => old/config}/functions.el | 0 {config => old/config}/key-bindings.el | 0 {config => old/config}/languages.el | 0 {config => old/config}/packages.el | 0 {config => old/config}/spelling.el | 0 {config => old/config}/splash.el | 0 {config => old/config}/themes.el | 0 {config => old/config}/windows.el | 0 old/eshell/history | 2 + old/init.el | 37 ++++++ {languages => old/languages}/elisp.el | 0 {languages => old/languages}/elixir.el | 0 {languages => old/languages}/go.el | 0 {languages => old/languages}/haskell.el | 0 {languages => old/languages}/js.el | 0 {languages => old/languages}/python.el | 0 {languages => old/languages}/ruby.el | 0 {languages => old/languages}/rust.el | 0 {languages => old/languages}/sql.el | 0 {languages => old/languages}/web.el | 0 38 files changed, 513 insertions(+), 18 deletions(-) create mode 100644 01mac.el create mode 100644 02evil.el create mode 100644 03ivy.el create mode 100644 04magit.el create mode 100644 05prog-mode.el create mode 100644 06company-yasnippet.el create mode 100644 07projectile.el create mode 100644 08purpose.el create mode 100644 10themes.el create mode 100644 20elisp.el create mode 100644 20ruby.el create mode 100644 20web.el rename .ctags => old/.ctags (100%) rename README.md => old/README.md (100%) rename {config => old/config}/base16-not-harmonic-theme.el (100%) rename {config => old/config}/behaviour.el (100%) rename {config => old/config}/emacs (100%) rename {config => old/config}/functions.el (100%) rename {config => old/config}/key-bindings.el (100%) rename {config => old/config}/languages.el (100%) rename {config => old/config}/packages.el (100%) rename {config => old/config}/spelling.el (100%) rename {config => old/config}/splash.el (100%) rename {config => old/config}/themes.el (100%) rename {config => old/config}/windows.el (100%) create mode 100644 old/eshell/history create mode 100644 old/init.el rename {languages => old/languages}/elisp.el (100%) rename {languages => old/languages}/elixir.el (100%) rename {languages => old/languages}/go.el (100%) rename {languages => old/languages}/haskell.el (100%) rename {languages => old/languages}/js.el (100%) rename {languages => old/languages}/python.el (100%) rename {languages => old/languages}/ruby.el (100%) rename {languages => old/languages}/rust.el (100%) rename {languages => old/languages}/sql.el (100%) rename {languages => old/languages}/web.el (100%) diff --git a/01mac.el b/01mac.el new file mode 100644 index 0000000..89aacd1 --- /dev/null +++ b/01mac.el @@ -0,0 +1,73 @@ +;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;; +(global-set-key (kbd "RET") 'newline) + +;;;;;;;;; Mac binding (fix) ;;;;;;;;;;;;;;;;;; +(define-key global-map [home] 'beginning-of-line) +(define-key global-map [end] 'end-of-line) +(global-set-key (kbd "s-") 'end-of-line) +(global-set-key (kbd "s-") 'beginning-of-line) +(global-set-key (kbd "s-") 'scroll-down) ; WTF is this reverse, I dunno +(global-set-key (kbd "s-") 'scroll-up) + +;;; Window display +(menu-bar-mode -1) +(tool-bar-mode -1) +(scroll-bar-mode -1) + +;#====================== Backup config #============================== +(setq backup-directory-alist + `((".*" . "~/.emacs_backups/auto-save-list"))) +(setq auto-save-file-name-transforms + `((".*", "~/.emacs_backups/auto-save-list" t))) + +(setq backup-by-copying t) +(setq delete-old-versions t + kept-new-versions 6 + kept-old-versions 2 + version-control t) + +; Enable line numbers and show cursors position +(global-linum-mode t) +(column-number-mode 1) + +;; Turn off sounds +(setq ring-bell-function 'ignore) + +;; Enable y/n answers to questions +(fset 'yes-or-no-p 'y-or-n-p) + +;;;;;;;;;;;;;;;;;;;;;; Shell stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) + +;; Add pgp binary +(add-to-list 'exec-path "/usr/local/bin") + +; Use Shells variables +(when (memq window-system '(mac ns)) + (exec-path-from-shell-initialize) + (exec-path-from-shell-copy-env "GOPATH") + (exec-path-from-shell-copy-env "GOROOT")) + + + +;;;;;;;;;;;;;;;;;;;;;; Font configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun set-font-size (size) + "Set font SIZE to X px." + (interactive "NNew font size: ") + (set-face-attribute 'default nil :font (format "Hasklig %d" size)) + (set-face-attribute 'mode-line nil :font (format "Hasklig %d" size))) + +;;;;;;;;;;;;;;;;;;;;;; Window configuration ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Always start in fullscreen +(defun toggle-fullscreen () + "Toggle full screen." + (interactive) + (set-frame-parameter + nil 'fullscreen + (when (not (frame-parameter nil 'fullscreen)) 'fullboth))) + +(toggle-fullscreen) + + +;; Disable meta on right alt (useful for Polish characters) +(setq ns-right-alternate-modifier nil) diff --git a/02evil.el b/02evil.el new file mode 100644 index 0000000..83a92e7 --- /dev/null +++ b/02evil.el @@ -0,0 +1,22 @@ +(evil-mode 1) +(global-evil-leader-mode 1) + +(require 'evil-leader) +;;;;;;;;; EVIL Leader ;;;;;;;;;;;;;;;;;;;;;;;; +(evil-leader/set-leader "") + +(evil-leader/set-key + "w" 'delete-window + "," 'previous-buffer + "." 'next-buffer + "k" 'kill-buffer-and-window + "rb" 'revert-buffer) ; Reload current file from disk + +(evil-leader/set-key "hs" 'split-window-below) +(evil-leader/set-key "vs" 'split-window-right) + +(evil-leader/set-key + "gk" 'windmove-up + "gj" 'windmove-down + "gl" 'windmove-right + "gh" 'windmove-left) diff --git a/03ivy.el b/03ivy.el new file mode 100644 index 0000000..8021ca8 --- /dev/null +++ b/03ivy.el @@ -0,0 +1,9 @@ +(setq-default ivy-use-virtual-buffers t) +(setq-default ivy-count-format "(%d of %d) ") + +(counsel-mode 1) + +(evil-leader/set-key "ag" 'counsel-ag) +(evil-leader/set-key "b" 'ivy-switch-buffer) +(evil-leader/set-key "/" 'swiper) +(evil-leader/set-key "t" 'counsel-find-file) diff --git a/04magit.el b/04magit.el new file mode 100644 index 0000000..2d16650 --- /dev/null +++ b/04magit.el @@ -0,0 +1,7 @@ +;; Magit +(evil-leader/set-key + "gs" 'magit-status + "gco" 'magit-checkout + ;; TODO: Connect these two into one key + "gb" 'magit-blame + "gq" 'magit-blame-quit) diff --git a/05prog-mode.el b/05prog-mode.el new file mode 100644 index 0000000..f50f093 --- /dev/null +++ b/05prog-mode.el @@ -0,0 +1,49 @@ +;;; Programmers mode + +;;; Wrap long lines +(toggle-truncate-lines t) + +;;; Show trailing whitespace and remove whitespace on save +(require 'whitespace) +(add-hook 'prog-mode-hook 'whitespace-mode) +(setq whitespace-style '(face trailing empty)) + +;;; Cleanup whitespace on save +(add-hook 'before-save-hook 'whitespace-cleanup) + +;;; Tabs are spaces and are general at 2. Guide indent with lines +(setq-default indent-tabs-mode nil) + +;;; Insert newline on save +(setq require-final-newline t) + +;;; Match parenthasis (left-right) +(electric-pair-mode 1) + +;;; Rainbow parenthesis +(add-hook 'prog-mode-hook 'rainbow-delimiters-mode) + +;;; Show hex colors as colors +(add-hook 'prog-mode-hook 'rainbow-mode) + +;;; When pasting/writing over a selection, replace it. +(delete-selection-mode 1) + +;; Key bindings +(evil-leader/set-key "cl" 'evilnc-comment-or-uncomment-lines) ;; Comment lines +(evil-leader/set-key "al" 'align-regexp) ;; Align code to some regexp +(evil-leader/set-key "ir" 'indent-region) ;; Indent selected region +(evil-leader/set-key "d" 'dash-at-point) ;; Jump to dash definition + +;; When possible, show code documentation +(global-eldoc-mode 1) + +;; Function for definiting indentation +(defun set-indent (step) + "Set indentation to X STEPs." + (interactive "NNumber of columns for one step: ") + (setq tab-width step) + (setq tab-stop-list (number-sequence step 200 step))) + +;; Enforce column width by number +(global-column-enforce-mode 1) diff --git a/06company-yasnippet.el b/06company-yasnippet.el new file mode 100644 index 0000000..592f002 --- /dev/null +++ b/06company-yasnippet.el @@ -0,0 +1,42 @@ +;; Company completion framework configuration +(require 'company); Add completion + +;; Company configuration +(setq-default company-minimum-prefix-length 2 ; minimum prefix character number for auto complete. + company-idle-delay 0.3 + company-echo-delay 0 + ;; company-show-numbers t + company-tooltip-align-annotations t ; align annotations to the right tooltip border. + company-tooltip-flip-when-above t + company-tooltip-limit 10 ; tooltip candidates max limit. + company-tooltip-minimum 2 ; minimum candidates limit. + company-tooltip-minimum-width 0 ; The minimum width of the tooltip's inner area. + ; This doesn't include the margins and the scroll bar. + company-tooltip-margin 2 ; width of margin columns to show around the tooltip + company-tooltip-offset-display 'scrollbar ; 'lines - how to show tooltip unshown candidates number. + company-show-numbers nil ; t: show quick-access numbers for the first ten candidates. + company-selection-wrap-around t ; loop over candidates + ;; company-async-wait 0.03 + ;; company-async-timeout 2 + ) + +(setq-default company-backends '((company-capf company-keywords + company-yasnippet + ) + company-elisp ; Emacs Lisp + ;; company-semantic ; C/C++ + (company-clang company-cmake) ; C/C++ + company-robe + ;; company-eclim ; Java + ;; company-ropemacs ; Python + company-nxml company-css ; HTML, CSS, XML + ;; company-xcode ; for Xcode projects + company-bbdb ; BBDB + (company-dabbrev-code company-dabbrev company-abbrev) ; abbrev + company-files ; files & directory + company-ispell ; Ispell + ;; company-oddmuse ; wiki + )) + +(global-company-mode 1) +(yas-global-mode 1) diff --git a/07projectile.el b/07projectile.el new file mode 100644 index 0000000..8f0bcf6 --- /dev/null +++ b/07projectile.el @@ -0,0 +1,17 @@ +(require 'projectile) + + +(setq-default projectile-enable-caching t ;; Cache project files + projectile-file-exists-local-cache-expire (* 3 60) ;; keep cache for 3 minutes + projectile-sort-order (quote recently-active) ;; Order by recently active projects + projectile-globally-ignored-directories + (append '("node_modules" ".svn" "_build" "tmp" "log") projectile-globally-ignored-directories) + ;; Add certain folders to ignored + ) + +(projectile-mode t) + +(evil-leader/set-key "ps" 'counsel-projectile-switch-project) +(evil-leader/set-key "pt" 'counsel-projectile-find-file) +(evil-leader/set-key "pa" 'counsel-projectile-ag) +(evil-leader/set-key "pc" 'projectile-invalidate-cache) diff --git a/08purpose.el b/08purpose.el new file mode 100644 index 0000000..6d613c6 --- /dev/null +++ b/08purpose.el @@ -0,0 +1,84 @@ +;;; windows.el -- summary +;;; Commentary: +;;; Windows management things, mostly with purpose +;;; Code: +(require 'window-purpose) +(purpose-mode t) + +;; Set everything to use code window +(add-to-list 'purpose-user-mode-purposes '(fundamental-mode . code)) + +;; Test +(add-to-list 'purpose-user-regexp-purposes + '("_spec\\.rb\\(<.*>\\)?$" . test)) ;; Rspec +(add-to-list 'purpose-user-regexp-purposes + '("_test\\.rb\\(<.*>\\)?$" . test)) ;; Minitest +(add-to-list 'purpose-user-regexp-purposes + '("_preview\\.rb\\(<.*>\\)?$" . test)) ;; Mailer Previews +(add-to-list 'purpose-user-regexp-purposes + '("_test\\.exs\\(<.*>\\)?$" . test)) ;; ExUnit +(add-to-list 'purpose-user-regexp-purposes + '("test_.*\\.py\\(<.*>\\)?$" . test)) ;; Pytest +(add-to-list 'purpose-user-regexp-purposes + '("tests.rs\\(<.*>\\)?$" . test)) ;; Rust tests +(add-to-list 'purpose-user-regexp-purposes + '("_test.go\\(<.*>\\)?$" . test)) ;; Go tests + +(add-to-list 'purpose-user-mode-purposes '(shell-mode . test)) +(add-to-list 'purpose-user-mode-purposes '(magit-diff-mode . test)) + +;; Enumerate through all stuff. +;; Git things +(add-to-list 'purpose-user-regexp-purposes + '("COMMIT_EDITMSG\\(<.*>\\)?$" . code)) +(add-to-list 'purpose-user-regexp-purposes + '("git-rebase-todo\\(<.*>\\)?$" . code)) +(add-to-list 'purpose-user-mode-purposes '(diff-mode . code)) + +;; Programming files +(add-to-list 'purpose-user-mode-purposes '(ruby-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(elixir-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(rust-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(haskell-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(haskell-cabal-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(web-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(java-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(python-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(js-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(emacs-lisp-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(sql-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(go-mode . code)) + +;; Other files that fall into 'code' +(add-to-list 'purpose-user-mode-purposes '(xml-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(markdown-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(terraform-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(yaml-mode . code)) +(add-to-list 'purpose-user-mode-purposes '(dockerfile-mode . code)) + +;; Tools +(add-to-list 'purpose-user-mode-purposes '(dired-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(magit-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(help-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(helm-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(compilation-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(etags-select-mode . tools)) +(add-to-list 'purpose-user-mode-purposes '(reb-mode . tools)) ;; Regexp builder + +(setq purpose-use-default-configuration nil) +(purpose-compile-user-configuration) + +;; Functions for changing layout +(defun purpose-big-screen () + "Load coding_with_magit." + (interactive) + (purpose-load-window-layout "coding_with_magit")) + +(defun purpose-small-screen () + "Load small_screen." + (interactive) + (purpose-load-window-layout "small_screen")) +;;; windows.el ends here + +(global-set-key (kbd "") 'purpose-big-screen) +(global-set-key (kbd "") 'purpose-small-screen) diff --git a/10themes.el b/10themes.el new file mode 100644 index 0000000..92c5fc0 --- /dev/null +++ b/10themes.el @@ -0,0 +1,36 @@ +;; Use smart-mode-line +(require 'smart-mode-line) + +(setq-default sml/no-confirm-load-theme t) +(setq-default display-time-format "%H:%M") ;; time format to display on mode line + +(sml/setup) +(sml/apply-theme 'respectful) + +(load-theme 'base16-mexico-light t t) +(load-theme 'flatui t t) + +(defun base16-mexico-light-custom () + "Additional configuration for Base16 theme." + (set-face-attribute 'mode-line nil :font "Hasklig 15") + (set-face-attribute 'linum nil :font "Hasklig 15" + :slant 'normal)) + +(if (display-graphic-p) + (progn + (enable-theme 'base16-mexico-light) + (base16-mexico-light-custom)) + (progn + (enable-theme 'flatui))) + +;; Set font face +(set-face-attribute 'default nil :font "Hasklig 15") + +;; Remove ugly black line +(set-face-attribute 'vertical-border nil :foreground + (face-attribute 'fringe :background)) + +;; Set fringe colors to default, so it does not bother you. +(set-face-attribute 'fringe nil + :foreground (face-foreground 'default) +:background (face-background 'default)) diff --git a/20elisp.el b/20elisp.el new file mode 100644 index 0000000..759dea2 --- /dev/null +++ b/20elisp.el @@ -0,0 +1,8 @@ +(add-hook 'emacs-lisp-mode-hook 'flymake-mode) + +(defun activate-emacs-lisp-mode () + "Goodies for editing emacs files." + (set-indent 2) ;; Default indentation of 2 characters + ) + +(add-hook 'emacs-lisp-mode-hook 'activate-emacs-lisp-mode) diff --git a/20ruby.el b/20ruby.el new file mode 100644 index 0000000..7d3b8d4 --- /dev/null +++ b/20ruby.el @@ -0,0 +1,39 @@ +;; Start rvm before starting robe +(defadvice inf-ruby-console-auto (before activate-rvm-for-robe activate) + (rvm-activate-corresponding-ruby)) + +(add-hook 'ruby-mode-hook 'enh-ruby-mode) +(add-hook 'enh-ruby-mode-hook 'robe-mode) +(add-hook 'enh-ruby-mode-hook 'ruby-end-mode) +(add-hook 'enh-ruby-mode-hook 'flymake-mode) + +(eval-after-load 'company + '(push 'company-robe company-backends)) + +(defun activate-ruby-mode () + "All things for ruby mode." + (set-indent 2) + + ;; Set column enforcement at 80 for normal projects, and at 100 for work + (if (string-match-p "internetee" (buffer-file-name)) + (column-enforce-n 100) + (column-enforce-n 80)) + + ;; Do not insert magic encoding comment at the begining of each file + (setq ruby-insert-encoding-magic-comment nil) + + ;; Start flymake + (flymake-ruby-load)) + +(add-hook 'enh-ruby-mode-hook 'activate-ruby-mode) + +;; Ruby specific key bindings +(evil-leader/set-key-for-mode 'enh-ruby-mode "j" 'robe-jump) + +;;; ERB specific things +(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) +(setq web-mode-extra-auto-pairs + '(("erb" . (("<%" "%>") + ("beg" "end"))) + )) +(add-hook 'web-mode-hook 'flymake-mode) diff --git a/20web.el b/20web.el new file mode 100644 index 0000000..b7f4382 --- /dev/null +++ b/20web.el @@ -0,0 +1 @@ +(add-hook 'web-mode-hook 'flymake-mode) diff --git a/init.el b/init.el index af21847..5ae973a 100644 --- a/init.el +++ b/init.el @@ -1,25 +1,95 @@ -;;; init.el --- Summary +;;; init.el -- Summary ;;; Commentary: ;;; Code: +;; list the repositories containing them +(setq package-archives '(("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/"))) -;; 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. -;; You may delete these explanatory comments. +;; activate all the packages (in particular autoloads) (package-initialize) -(load "~/.emacs.d/config/packages.elc") -(load "~/.emacs.d/config/functions.elc") -(load "~/.emacs.d/config/behaviour.elc") -(load "~/.emacs.d/config/splash.elc") -(load "~/.emacs.d/config/themes.elc") -(load "~/.emacs.d/config/key-bindings.elc") -(load "~/.emacs.d/config/spelling.elc") -(load "~/.emacs.d/config/languages.elc") -(load "~/.emacs.d/config/windows.elc") +;; fetch the list of packages available +(unless package-archive-contents + (package-refresh-contents)) + +;; list the packages you want +(setq package-list '( + exec-path-from-shell ;; Allow to execute path from shell + + evil ;; Behave like VIM + evil-leader ;; Allow to set leader key (usually space) + evil-nerd-commenter ;; Add comments to files + + rainbow-delimiters ;; Colorize matching parens + rainbow-mode ;; Make color symbols like #FFF colorfull + + magit ;; Git interface for Emacs + diff-hl ;; Highlight diff (also useful for git) + + column-enforce-mode ;; Enforce column length of X + + window-purpose ;; Make sure that windows are of grouped by + ;; purpose. + + ;;; Helm replacements + ivy + counsel + swiper + + ;;; Code + dash-at-point + + company ;; Code completion framework + yasnippet ;; Code snippets framework + yasnippet-snippets ;; Actual snippets for various languages + + ;; Project management + projectile + counsel-projectile + + ;; Themes + smart-mode-line + base16-theme + flatui-theme + + ;; Ruby + enh-ruby-mode ;; Enhanced Ruby mode + robe ;; Ruby REPL inside emacs + rvm ;; Support rvm usage + ruby-end ;; Insert end for methods automatically + + ;; Web + web-mode + + ;; Infrastructure files + yaml-mode + dockerfile-mode + terraform-mode + ansible + ) + ) + +;; install the missing packages +(dolist (package package-list) + (unless (package-installed-p package) + (package-install package))) + +;; Additional files +(load "~/.emacs.d/01mac.el") +(load "~/.emacs.d/02evil.el") +(load "~/.emacs.d/03ivy.el") +(load "~/.emacs.d/04magit.el") +(load "~/.emacs.d/05prog-mode.el") +(load "~/.emacs.d/06company-yasnippet.el") +(load "~/.emacs.d/07projectile.el") +(load "~/.emacs.d/08purpose.el") +(load "~/.emacs.d/10themes.el") + +;; Actual supported languages +(load "~/.emacs.d/20elisp.el") +(load "~/.emacs.d/20ruby.el") +(load "~/.emacs.d/20web.el") -(provide 'init) -;;; init.el ends here (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -27,8 +97,7 @@ ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (flymake-go go-flymake flycheck-go company-go go-mode expand-region sql-indent json-mode terraform-mode flycheck-rust company-ghc company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag))) - '(safe-local-variable-values (quote ((encoding . utf-8))))) + (window-purpose column-enforce-mode yaml-mode ansible dockerfile-mode evil-nerd-commenter ruby-end web-mode flymake-ruby rvm dash-at-point robe base16-theme exec-path-from-shell evil)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.ctags b/old/.ctags similarity index 100% rename from .ctags rename to old/.ctags diff --git a/README.md b/old/README.md similarity index 100% rename from README.md rename to old/README.md diff --git a/config/base16-not-harmonic-theme.el b/old/config/base16-not-harmonic-theme.el similarity index 100% rename from config/base16-not-harmonic-theme.el rename to old/config/base16-not-harmonic-theme.el diff --git a/config/behaviour.el b/old/config/behaviour.el similarity index 100% rename from config/behaviour.el rename to old/config/behaviour.el diff --git a/config/emacs b/old/config/emacs similarity index 100% rename from config/emacs rename to old/config/emacs diff --git a/config/functions.el b/old/config/functions.el similarity index 100% rename from config/functions.el rename to old/config/functions.el diff --git a/config/key-bindings.el b/old/config/key-bindings.el similarity index 100% rename from config/key-bindings.el rename to old/config/key-bindings.el diff --git a/config/languages.el b/old/config/languages.el similarity index 100% rename from config/languages.el rename to old/config/languages.el diff --git a/config/packages.el b/old/config/packages.el similarity index 100% rename from config/packages.el rename to old/config/packages.el diff --git a/config/spelling.el b/old/config/spelling.el similarity index 100% rename from config/spelling.el rename to old/config/spelling.el diff --git a/config/splash.el b/old/config/splash.el similarity index 100% rename from config/splash.el rename to old/config/splash.el diff --git a/config/themes.el b/old/config/themes.el similarity index 100% rename from config/themes.el rename to old/config/themes.el diff --git a/config/windows.el b/old/config/windows.el similarity index 100% rename from config/windows.el rename to old/config/windows.el diff --git a/old/eshell/history b/old/eshell/history new file mode 100644 index 0000000..0a519e8 --- /dev/null +++ b/old/eshell/history @@ -0,0 +1,2 @@ +bundle install +exit diff --git a/old/init.el b/old/init.el new file mode 100644 index 0000000..af21847 --- /dev/null +++ b/old/init.el @@ -0,0 +1,37 @@ +;;; init.el --- Summary +;;; Commentary: +;;; Code: + +;; 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. +;; You may delete these explanatory comments. +(package-initialize) + +(load "~/.emacs.d/config/packages.elc") +(load "~/.emacs.d/config/functions.elc") +(load "~/.emacs.d/config/behaviour.elc") +(load "~/.emacs.d/config/splash.elc") +(load "~/.emacs.d/config/themes.elc") +(load "~/.emacs.d/config/key-bindings.elc") +(load "~/.emacs.d/config/spelling.elc") +(load "~/.emacs.d/config/languages.elc") +(load "~/.emacs.d/config/windows.elc") + +(provide 'init) +;;; init.el ends here +(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. + '(package-selected-packages + (quote + (flymake-go go-flymake flycheck-go company-go go-mode expand-region sql-indent json-mode terraform-mode flycheck-rust company-ghc company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag))) + '(safe-local-variable-values (quote ((encoding . utf-8))))) +(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. + ) diff --git a/languages/elisp.el b/old/languages/elisp.el similarity index 100% rename from languages/elisp.el rename to old/languages/elisp.el diff --git a/languages/elixir.el b/old/languages/elixir.el similarity index 100% rename from languages/elixir.el rename to old/languages/elixir.el diff --git a/languages/go.el b/old/languages/go.el similarity index 100% rename from languages/go.el rename to old/languages/go.el diff --git a/languages/haskell.el b/old/languages/haskell.el similarity index 100% rename from languages/haskell.el rename to old/languages/haskell.el diff --git a/languages/js.el b/old/languages/js.el similarity index 100% rename from languages/js.el rename to old/languages/js.el diff --git a/languages/python.el b/old/languages/python.el similarity index 100% rename from languages/python.el rename to old/languages/python.el diff --git a/languages/ruby.el b/old/languages/ruby.el similarity index 100% rename from languages/ruby.el rename to old/languages/ruby.el diff --git a/languages/rust.el b/old/languages/rust.el similarity index 100% rename from languages/rust.el rename to old/languages/rust.el diff --git a/languages/sql.el b/old/languages/sql.el similarity index 100% rename from languages/sql.el rename to old/languages/sql.el diff --git a/languages/web.el b/old/languages/web.el similarity index 100% rename from languages/web.el rename to old/languages/web.el