diff --git a/dotemacs.el b/dotemacs.el deleted file mode 100644 index 19a2754..0000000 --- a/dotemacs.el +++ /dev/null @@ -1,65 +0,0 @@ -(require 'package) - -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/") t) - -;; 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) - -;; Set path correctly -(when (memq window-system '(mac ns x)) - (exec-path-from-shell-initialize)) - -;; Web-mode -(require 'web-mode) -(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) -(add-to-list 'auto-mode-alist '("\\.mjs\\'" . web-mode)) -(add-to-list 'web-mode-content-types-alist '("jsx" . "\\.[c|m]js[x]?\\'")) - -;; Prettier -(require 'prettier-js) -(add-hook 'js2-mode-hook 'prettier-js-mode) -(add-hook 'web-mode-hook 'prettier-js-mode) - -;; Magit -(global-set-key (kbd "C-x g") 'magit-status) -(add-hook 'after-save-hook 'magit-after-save-refresh-status t) -;; Org -(define-key global-map "\C-cl" 'org-store-link) -(define-key global-map "\C-ca" 'org-agenda) -(setq org-log-done t) -(setq org-agenda-files (list "~/org/work.org" - "~/org/home.org" - "~/org/wow.org" - "~/org/business.org")) - -;; Company -(add-hook 'after-init-hook 'global-company-mode) - -;; Paredit -(autoload 'enable-paredit-mode "paredit" - "Turn on pseudo-structural editing of Lisp code." t) -(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode) -(add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode) -(add-hook 'ielm-mode-hook #'enable-paredit-mode) -(add-hook 'lisp-mode-hook #'enable-paredit-mode) -(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode) -(add-hook 'scheme-mode-hook #'enable-paredit-mode) - -(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 - (paredit magit web-mode js2-mode prettier-js company 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. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - ) diff --git a/init-simple.el b/init-simple.el deleted file mode 100644 index db2fc19..0000000 --- a/init-simple.el +++ /dev/null @@ -1,13 +0,0 @@ -(require 'package) -(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) -(package-initialize) -(package-refresh-contents) - -(defvar packages-to-install '(evil - company)) - -(dolist (p packages-to-install) - (when (not (package-installed-p p)) - (package-install p))) -(require 'evil) -(evil-mode 1) diff --git a/init-template.el b/init-template.el deleted file mode 100644 index b35f41d..0000000 --- a/init-template.el +++ /dev/null @@ -1,195 +0,0 @@ -;;; init: --- Summary -;;; Commentary: -;(load (expand-file-name "~/quicklisp/slime-helper.el")) -;;; Replace "sbcl" with the path to your implementation -;(setq inferior-lisp-program "/usr/local/bin/sbcl") -; -;(add-hook 'slime-mode-hook 'set-up-slime-ac) -;(add-hook 'slime-repl-mode-hook 'set-up-slime-ac) -;(eval-after-load "auto-complete" -; '(add-to-list 'ac-modes 'slime-repl-mode)) -(require 'package) -;;; Code: -(add-to-list 'package-archives - '("marmalade" . "http://marmalade-repo.org/packages/")) - -(add-to-list 'package-archives - '("melpa" . "http://melpa.org/packages/")) -;(add-to-list 'load-path (expand-file-name "~/Sources/tern/emacs/")) -;(autoload 'tern-mode "tern.el" nil t) - - -(package-initialize) -(package-refresh-contents) - -(defvar my-packages '(better-defaults - clojure-mode - cider - evil - auto-complete - js2-mode - ac-js2 - json-mode - skewer-mode - flycheck - web-mode - exec-path-from-shell - js2-refactor - alchemist - ac-slime - company - haskell-emacs - haskell-mode - purescript-mode - neotree - tern - tern-auto-complete - monokai-theme - powerline-evil - relative-line-numbers - starter-kit - icicles - starter-kit-bindings - starter-kit-lisp - starter-kit-eshell)) - -(dolist (p my-packages) - (when (not (package-installed-p p)) - (package-install p))) - -(require 'auto-complete) -(require 'js2-refactor) -(require 'neotree) -(require 'flycheck) -(require 'powerline) -(require 'icicles) -(require 'git) - -(setq ns-command-modifier 'meta) - -(global-auto-complete-mode t) -(evil-mode 1) -(add-hook 'after-init-hook 'global-company-mode) -(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. - '(ansi-color-names-vector - ["#272822" "#F92672" "#A6E22E" "#E6DB74" "#66D9EF" "#FD5FF0" "#A1EFE4" "#F8F8F2"]) - '(compilation-message-face (quote default)) - '(custom-safe-themes - (quote - ("05c3bc4eb1219953a4f182e10de1f7466d28987f48d647c01f1f0037ff35ab9a" "9a9e75c15d4017c81a2fe7f83af304ff52acfadd7dde3cb57595919ef2e8d736" "fb4bf07618eab33c89d72ddc238d3c30918a501cf7f086f2edf8f4edba9bd59f" default))) - '(fci-rule-color "#49483E") - '(haskell-mode-hook (quote (turn-on-haskell-indentation)) t) - '(highlight-changes-colors ("#FD5FF0" "#AE81FF")) - '(highlight-tail-colors - (quote - (("#49483E" . 0) - ("#67930F" . 20) - ("#349B8D" . 30) - ("#21889B" . 50) - ("#968B26" . 60) - ("#A45E0A" . 70) - ("#A41F99" . 85) - ("#49483E" . 100)))) - '(js2-basic-offset 2) - '(js2-bounce-indent-p t) - '(js2-missing-semi-one-line-override nil) - '(js2-mode-show-strict-warnings nil) - '(js2-strict-missing-semi nil t) - '(js2-strict-missing-semicolon nil t) - '(magit-diff-use-overlays nil) - '(purescript-mode-hook - (quote - (turn-on-purescript-indent turn-on-purescript-indentation turn-on-purescript-unicode-input-method))) - '(vc-annotate-background nil) - '(vc-annotate-color-map - (quote - ((20 . "#F92672") - (40 . "#CF4F1F") - (60 . "#C26C0F") - (80 . "#E6DB74") - (100 . "#AB8C00") - (120 . "#A18F00") - (140 . "#989200") - (160 . "#8E9500") - (180 . "#A6E22E") - (200 . "#729A1E") - (220 . "#609C3C") - (240 . "#4E9D5B") - (260 . "#3C9F79") - (280 . "#A1EFE4") - (300 . "#299BA6") - (320 . "#2896B5") - (340 . "#2790C3") - (360 . "#66D9EF")))) - '(vc-annotate-very-old-color nil) - '(weechat-color-list - (unspecified "#272822" "#49483E" "#A20C41" "#F92672" "#67930F" "#A6E22E" "#968B26" "#E6DB74" "#21889B" "#66D9EF" "#A41F99" "#FD5FF0" "#349B8D" "#A1EFE4" "#F8F8F2" "#F8F8F0"))) -(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. - ) -(load-theme 'deeper-blue t) - -(global-linum-mode 0) -(global-relative-line-numbers-mode) - -(electric-pair-mode 1) -(icy-mode 1) -(add-to-list 'auto-mode-alist '("\\.js" . js2-mode)) - -(add-hook 'js-mode-hook 'js2-minor-mode) -;(add-hook 'js2-mode-hook 'ac-js2-mode) -(setq js2-highlight-level 3) - -(when (eq system-type 'darwin) - (setq mac-command-modifier 'meta) - (setq mac-option-modifier nil)) - -;; (eval-after-load 'tern -;; '(progn -;; (require 'tern-auto-complete) -;; (tern-ac-setup))) - - -(add-hook 'js2-mode-hook #'js2-refactor-mode) -(add-hook 'js2-mode-hook (lambda () (tern-mode t))) - -(powerline-center-evil-theme) - -(add-hook 'after-init-hook #'global-flycheck-mode) - -(setq-default flycheck-disabled-checkers - (append flycheck-disabled-checkers - '(javascript-jshint))) - -(flycheck-add-mode 'javascript-eslint 'web-mode) - -(setq-default flycheck-disabled-checkers - (append flycheck-disabled-checkers - '(json-jsonlist))) - -(when (memq window-system '(mac ns)) - (let ((default-directory "/usr/local/share/emacs/site-lisp/")) - (normal-top-level-add-subdirs-to-load-path)) - (exec-path-from-shell-initialize)) - -;; indent settings for web mode -(defun my-web-mode-hook () - "Set my web mode hooks up." - (setq web-mode-markup-indent-offset 2) - (setq web-mode-css-indent-offset 2) - (setq web-mode-code-indent-offset 2)) - - -(add-hook 'web-mode-hook 'my-web-mode-hook) -(setq web-mode-content-types-alist - '(("jsx" . "\\.js[x]?\\'"))) - -(provide 'init) -;;; init.el ends here diff --git a/nicer-init.el b/nicer-init.el deleted file mode 100644 index e915a54..0000000 --- a/nicer-init.el +++ /dev/null @@ -1,56 +0,0 @@ -(load-theme 'deeper-blue t) -(require 'package) - -(add-to-list 'package-archives - '("marmalade" . "http://marmalade-repo.org/packages/")) - -(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) - -(package-initialize) - -(defun maybe-install (p) - (when (not (package-installed-p p)) - (package-install p))) - -(defun install-package-list (pl) - (dolist (p pl) - (maybe-install p))) - -(defvar essential-packages '(better-defaults - evil - relative-line-numbers - company - starter-kit - starter-kit-bindings - starter-kit-lisp - starter-kit-eshell)) - -(defvar programming-packages '(auto-complete - powerline-evil)) - -(defun install-packages () - (interactive) - (progn - (package-refresh-contents) - (install-package-list essential-packages) - (install-package-list programming-packages))) - -(setq ns-command-modifier 'meta) - -(add-hook 'after-init-hook 'global-company-mode) -(global-linum-mode 0) - -(when (package-installed-p 'relative-line-numbers) - (global-relative-line-numbers-mode)) - -(when (package-installed-p 'evil) - (evil-mode 1)) - -(when (eq system-type 'darwin) - (setq mac-command-modifier 'meta) - (setq mac-option-modifier nil)) - -(electric-pair-mode 1) - -;; This removes the annoying glitchy feeling flash when something dings -(setq ring-bell-function 'ignore) diff --git a/vimrc_simple.txt b/vimrc_simple.txt deleted file mode 100644 index 27093cc..0000000 --- a/vimrc_simple.txt +++ /dev/null @@ -1,14 +0,0 @@ -set nocompatible -filetype off -set t_Co=256 -syntax on -set background=dark -set relativenumber -set backspace=indent,eol,start -set tabstop=2 -set shiftwidth=2 -set expandtab -set laststatus=2 -set ruler -au FileType javascript setlocal nocindent -command W w diff --git a/vimrc_template.txt b/vimrc_template.txt deleted file mode 100644 index c559f8d..0000000 --- a/vimrc_template.txt +++ /dev/null @@ -1,55 +0,0 @@ -set nocompatible -filetype off -set t_Co=256 -syntax on -set background=dark -set relativenumber -set backspace=indent,eol,start -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() -" alternatively, pass a path where Vundle should install plugins -"call vundle#begin('~/some/path/here') -set number -" let Vundle manage Vundle, required -Plugin 'gmarik/Vundle.vim' -Plugin 'jelera/vim-javascript-syntax' -Plugin 'othree/yajs.vim' -Plugin 'flazz/vim-colorschemes' -Plugin 'nathanaelkane/vim-indent-guides' -Plugin 'scrooloose/nerdtree' -Plugin 'Raimondi/delimitMate' -Plugin 'scrooloose/syntastic' -Plugin 'raichoo/purescript-vim' -Plugin 'powerline/powerline' -Plugin 'Valloric/YouCompleteMe' -Plugin 'jiangmiao/auto-pairs' -Plugin 'elixir-lang/vim-elixir' -Plugin 'Xuyuanp/nerdtree-git-plugin' -let g:ycm_add_preview_to_completeopt=0 -let g:ycm_confirm_extra_conf=0 -set completeopt-=preview -" All of your Plugins must be added before the following line -call vundle#end() " required -filetype plugin indent on " required -" To ignore plugin indent changes, instead use: -"filetype plugin on -" -" Brief help -" :PluginList - lists configured plugins -" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate -" :PluginSearch foo - searches for foo; append `!` to refresh local cache -" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal -" -" see :h vundle for more details or wiki for FAQ -" Put your non-Plugin stuff after this line -set tabstop=2 -set shiftwidth=2 -set expandtab -set laststatus=2 -set ruler -autocmd vimenter * NERDTree -au FileType javascript setlocal nocindent -colorscheme wasabi256 -let g:syntastic_javascript_checkers = ['jshint'] -command W w