From 1346ffa38cd554571171a1b4fb20b3ad7faf2c3d Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 3 Jul 2016 13:25:44 -0700 Subject: [emacs] move everything back to one file for now. --- emacs.d/core/core-autocompletion.el | 7 --- emacs.d/core/core-bindings.el | 13 ------ emacs.d/core/core-default.el | 20 -------- emacs.d/core/core-defun.el | 42 ----------------- emacs.d/core/core-editor.el | 56 ---------------------- emacs.d/core/core-flycheck.el | 55 ---------------------- emacs.d/core/core-flyspell.el | 11 ----- emacs.d/core/core-git.el | 46 ------------------ emacs.d/core/core-load-paths.el | 14 ------ emacs.d/core/core-modes.el | 7 --- emacs.d/core/core-pants.el | 12 ----- emacs.d/core/core-term.el | 93 ------------------------------------- emacs.d/core/core-ui.el | 79 ------------------------------- 13 files changed, 455 deletions(-) delete mode 100644 emacs.d/core/core-autocompletion.el delete mode 100644 emacs.d/core/core-bindings.el delete mode 100644 emacs.d/core/core-default.el delete mode 100644 emacs.d/core/core-defun.el delete mode 100644 emacs.d/core/core-editor.el delete mode 100644 emacs.d/core/core-flycheck.el delete mode 100644 emacs.d/core/core-flyspell.el delete mode 100644 emacs.d/core/core-git.el delete mode 100644 emacs.d/core/core-load-paths.el delete mode 100644 emacs.d/core/core-modes.el delete mode 100644 emacs.d/core/core-pants.el delete mode 100644 emacs.d/core/core-term.el delete mode 100644 emacs.d/core/core-ui.el (limited to 'emacs.d/core') diff --git a/emacs.d/core/core-autocompletion.el b/emacs.d/core/core-autocompletion.el deleted file mode 100644 index 724ccf3..0000000 --- a/emacs.d/core/core-autocompletion.el +++ /dev/null @@ -1,7 +0,0 @@ -(use-package company - :ensure t - :config - (progn - (add-hook 'prog-mode-hook 'company-mode))) - -(provide 'core-autocompletion) diff --git a/emacs.d/core/core-bindings.el b/emacs.d/core/core-bindings.el deleted file mode 100644 index 629eb54..0000000 --- a/emacs.d/core/core-bindings.el +++ /dev/null @@ -1,13 +0,0 @@ -(global-set-key (kbd "M-j") 'join-line) - -(global-set-key (kbd "C-x C-b") 'ibuffer) - -(global-set-key (kbd "") 'toggle-frame-fullscreen) - -(global-set-key (kbd "C-c s") 'fc/visit-term-buffer) - -(global-set-key (kbd "s-N") 'fc/switch-to-scratch) - -(define-key emacs-lisp-mode-map (kbd "C-c C-e") 'eval-buffer) - -(provide 'core-bindings) diff --git a/emacs.d/core/core-default.el b/emacs.d/core/core-default.el deleted file mode 100644 index 7756257..0000000 --- a/emacs.d/core/core-default.el +++ /dev/null @@ -1,20 +0,0 @@ -;; alias yes-or-no to y-or-n -(fset 'yes-or-no-p 'y-or-n-p) - -;; set utf-8 as the default encoding -(prefer-coding-system 'utf-8-unix) - -(global-auto-revert-mode 1) - -(setq - auto-save-default nil - auto-save-list-file-prefix nil - make-backup-files nil - require-final-newline t - vc-follow-symlinks t - next-screen-context-lines 5 - tab-always-indent 'complete) - -(setq-default indent-tabs-mode nil) - -(provide 'core-default) diff --git a/emacs.d/core/core-defun.el b/emacs.d/core/core-defun.el deleted file mode 100644 index ad17af4..0000000 --- a/emacs.d/core/core-defun.el +++ /dev/null @@ -1,42 +0,0 @@ -(defun fc/switch-to-scratch () - "Switch to scratch, grab the region if it's active." - (interactive) - (let ((contents - (and (region-active-p) - (buffer-substring (region-beginning) - (region-end))))) - (switch-to-buffer "*scratch*") - (if contents - (progn - (goto-char (buffer-end 1)) - (insert contents))))) - -(defun fc/rename-this-buffer-and-file () - "Renames current buffer and file it is visiting." - (interactive) - (let ((name (buffer-name)) - (filename (buffer-file-name)) - (read-file-name-function 'read-file-name-default)) - (if (not (and filename (file-exists-p filename))) - (error "Buffer '%s' is not visiting a file!" name) - (let ((new-name (read-file-name "New name: " filename))) - (cond ((get-buffer new-name) - (error "A buffer named '%s' already exists!" new-name)) - (t - (rename-file filename new-name 1) - (rename-buffer new-name) - (set-visited-file-name new-name) - (set-buffer-modified-p nil) - (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name)))))))) - -(defun fc/visit-term-buffer () - "Create or visit a terminal buffer." - (interactive) - (if (not (get-buffer "*ansi-term*")) - (progn - (split-window-sensibly (selected-window)) - (other-window 1) - (ansi-term (getenv "SHELL"))) - (switch-to-buffer-other-window "*ansi-term*"))) - -(provide 'core-defun) diff --git a/emacs.d/core/core-editor.el b/emacs.d/core/core-editor.el deleted file mode 100644 index ddc59b4..0000000 --- a/emacs.d/core/core-editor.el +++ /dev/null @@ -1,56 +0,0 @@ -(use-package swiper - :ensure t - :bind (("C-s" . swiper)) - :config - (setq ivy-use-virtual-buffers t) - (ivy-mode)) - -(use-package counsel - :ensure t - :config - (setq counsel-find-file-at-point t)) - -(use-package helm - :ensure t) - -(when (memq window-system '(mac ns x)) - (use-package exec-path-from-shell - :ensure t - :init (setq exec-path-from-shell-debug +1) - :config - (exec-path-from-shell-initialize) - (exec-path-from-shell-copy-envs '("TMPDIR")))) - -(use-package dired - :commands dired - :init - (setq dired-listing-switches "-laGhv")) - -(use-package ag - :ensure t - :defer t) - -(use-package smartparens - :ensure t - :config - (progn - (require 'smartparens-config) - (smartparens-global-mode 1) - (setq sp-show-pair-delay 0) - (setq sp-autoinsert-if-followed-by-word nil) - (show-smartparens-global-mode t))) - -(use-package projectile - :ensure t - :init - (setq projectile-enable-caching t) - (setq projectile-completion-system 'ivy) - :config - (projectile-global-mode)) - -(use-package server - :config - (unless (server-running-p) - (server-start))) - -(provide 'core-editor) diff --git a/emacs.d/core/core-flycheck.el b/emacs.d/core/core-flycheck.el deleted file mode 100644 index 11bb20b..0000000 --- a/emacs.d/core/core-flycheck.el +++ /dev/null @@ -1,55 +0,0 @@ -(use-package flycheck - :ensure t - :defer t - :preface (progn - (defun check-source-predicate () - (and (executable-find "check.pex") - (buffer-file-name) - (string-match "src/source/.*\.py$" (buffer-file-name))))) - :init - (progn - (add-hook 'prog-mode-hook 'flycheck-mode) - (setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))) - :config - (progn - (setq flycheck-mode-line - '(:eval - (pcase flycheck-last-status-change - (`not-checked nil) - (`no-checker (propertize " -" 'face 'warning)) - (`running "") - (`errored (propertize " ✘" 'face 'error)) - (`finished - (if flycheck-current-errors - (let* ((error-counts (flycheck-count-errors flycheck-current-errors)) - (no-errors (cdr (assq 'error error-counts))) - (no-warnings (cdr (assq 'warning error-counts))) - (flycheck-face (cond (no-errors 'error) - (no-warnings 'warning)))) - (propertize (format " [✗:%s/%s]" (or no-errors 0) (or no-warnings 0)) 'face flycheck-face)) - (propertize " [✓]" 'face 'success))) - (`interrupted " -") - (`suspicious '(propertize " ?" 'face 'warning))))) - - (setq flycheck-puppet-lint-rc "/Users/fcuny/src/twitter-ops/utilities/puppet/.puppet-lint.rc") - - (flycheck-define-checker source-check - "A syntax checker for python source code in Source, using `check.pex'" - :command ("check.pex" source) - ;;; errors are reported like this: - ;;; E241:ERROR : - :error-patterns ((error line-start (id (1+ nonl)) ":ERROR" (1+ nonl) ":" line (message) line-end) - (warning line-start (id (1+ nonl)) ":WARNING" (1+ nonl) ":" line (message) line-end)) - :predicate check-source-predicate - :modes (python-mode)) - (add-to-list 'flycheck-checkers 'source-check))) - -(use-package flycheck-pos-tip - :defer t - :init - (progn - (eval-after-load 'feature-flycheck - '(setq-default flycheck-display-errors-function #'flycheck-pos-tip-error-messages))) - :ensure t) - -(provide 'core-flycheck) diff --git a/emacs.d/core/core-flyspell.el b/emacs.d/core/core-flyspell.el deleted file mode 100644 index 551c59b..0000000 --- a/emacs.d/core/core-flyspell.el +++ /dev/null @@ -1,11 +0,0 @@ -(use-package flyspell - :ensure t - :init - (progn - (setq ispell-program-name "aspell" - ispell-list-command "--list") - (add-hook 'prog-mode-hook 'flyspell-prog-mode) - (add-hook 'text-mode-hook 'turn-on-flyspell) - (add-hook 'org-mode-hook 'turn-on-flyspell))) - -(provide 'core-flyspell) diff --git a/emacs.d/core/core-git.el b/emacs.d/core/core-git.el deleted file mode 100644 index a695def..0000000 --- a/emacs.d/core/core-git.el +++ /dev/null @@ -1,46 +0,0 @@ -;; this makes emacs slow to work with source -(delete 'Git vc-handled-backends) - -(use-package magit - :ensure t - :bind ("C-x g" . magit-status) - :config - (progn - (setq magit-completing-read-function 'ivy-completing-read) - (setq magit-item-highlight-face 'bold))) - -(use-package gitconfig-mode - :ensure t) - -(use-package gitignore-mode - :ensure t) - -(use-package gist - :ensure t - :bind ("C-c g p" . gist-region-or-buffer-private) - :config - (setq gist-view-gist t)) - -(use-package github-browse-file - :ensure t - :defer t) - -;; run magit in full screen -;; http://www.lunaryorn.com/2016/04/28/fullscreen-magit-status.html -(add-to-list 'display-buffer-alist - `(,(rx "*magit: ") - (fcuny/display-buffer-fullframe) - (reusable-frames . nil))) - -(defun fcuny/display-buffer-fullframe (buffer alist) - "Display BUFFER in fullscreen. - -ALIST is a `display-buffer' ALIST. - -Return the new window for BUFFER." - (let ((window (display-buffer-pop-up-window buffer alist))) - (when window - (delete-other-windows window)) - window)) - -(provide 'core-git) diff --git a/emacs.d/core/core-load-paths.el b/emacs.d/core/core-load-paths.el deleted file mode 100644 index cfb2840..0000000 --- a/emacs.d/core/core-load-paths.el +++ /dev/null @@ -1,14 +0,0 @@ -(add-to-list 'load-path (concat user-emacs-directory "core/")) - -(require 'core-default) -(require 'core-ui) -(require 'core-editor) -(require 'core-defun) -(require 'core-git) -(require 'core-flycheck) -(require 'core-flyspell) -(require 'core-autocompletion) -(require 'core-bindings) -(require 'core-pants) -(require 'core-modes) -(require 'core-term) diff --git a/emacs.d/core/core-modes.el b/emacs.d/core/core-modes.el deleted file mode 100644 index b994b1e..0000000 --- a/emacs.d/core/core-modes.el +++ /dev/null @@ -1,7 +0,0 @@ -(defun fcuny/load-layers () - (mapc 'load - (directory-files (concat user-emacs-directory "modes") t "\\.el$"))) - -(fcuny/load-layers) - -(provide 'core-modes) diff --git a/emacs.d/core/core-pants.el b/emacs.d/core/core-pants.el deleted file mode 100644 index cc9a93e..0000000 --- a/emacs.d/core/core-pants.el +++ /dev/null @@ -1,12 +0,0 @@ -(load-file "~/src/pants.el/pants.el") - -(use-package pants - :bind (("C-c b" . pants-find-build-file) - ("C-c r" . pants-run-binary) - ("C-c t" . pants-run-test)) - :config - (progn - (setq pants-source-tree-root "/Users/fcuny/src/source" - pants-bury-compilation-buffer t))) - -(provide 'core-pants) diff --git a/emacs.d/core/core-term.el b/emacs.d/core/core-term.el deleted file mode 100644 index 19877c3..0000000 --- a/emacs.d/core/core-term.el +++ /dev/null @@ -1,93 +0,0 @@ -(use-package eshell - :ensure t - :defer t - :init - (progn - (setq eshell-cmpl-cycle-completions nil - ;; auto truncate after 20k lines - eshell-buffer-maximum-lines 20000 - ;; history size - eshell-history-size 350 - ;; no duplicates in history - eshell-hist-ignoredups t - ;; buffer shorthand -> echo foo > #'buffer - eshell-buffer-shorthand t - ;; my prompt is easy enough to see - eshell-highlight-prompt nil - ;; treat 'echo' like shell echo - eshell-plain-echo-behavior t) - - ;; Caution! this will erase buffer's content at C-l - (add-hook 'eshell-mode-hook - #'(lambda () - (define-key eshell-mode-map (kbd "C-l") 'eshell/clear)))) - :config - (progn - (require 'esh-opt) - - ;; quick commands - (defalias 'eshell/e 'find-file-other-window) - (defalias 'eshell/d 'dired) - (setenv "PAGER" "less") - - ;; support `em-smart' - (require 'em-smart) - (setq eshell-where-to-jump 'begin - eshell-review-quick-commands nil - eshell-smart-space-goes-to-end t) - (add-hook 'eshell-mode-hook 'eshell-smart-initialize) - - ;; Visual commands - (require 'em-term) - (mapc (lambda (x) (push x eshell-visual-commands)) - '("el" "elinks" "htop" "less" "ssh" "tmux" "top")) - - ;; automatically truncate buffer after output - (when (boundp 'eshell-output-filter-functions) - (push 'eshell-truncate-buffer eshell-output-filter-functions)))) - -(use-package multi-term - :ensure t - :defer t - :init - (progn - (defun multiterm (_) - "Wrapper to be able to call multi-term from shell-pop" - (interactive) - (multi-term))) - :config - (progn - (defun term-send-tab () - "Send tab in term mode." - (interactive) - (term-send-raw-string "\t")) - (add-to-list 'term-bind-key-alist '("" . term-send-tab)))) - -(use-package shell-pop - :ensure t - :defer t - :bind (("C-:" . shell-pop)) - :init - (progn - (setq shell-pop-window-position 'bottom - shell-pop-window-size 30 - shell-pop-term-shell 'ansi-term - shell-pop-full-span t) - (defmacro make-shell-pop-command (type &optional shell) - (let* ((name (symbol-name type))) - `(defun ,(intern (concat "shell-pop-" name)) (index) - (interactive "P") - (require 'shell-pop) - (shell-pop--set-shell-type - 'shell-pop-shell-type - (backquote (,name - ,(concat "*" name "*") - (lambda nil (funcall ',type ,shell))))) - (shell-pop index)))) - (make-shell-pop-command eshell) - (make-shell-pop-command shell) - (make-shell-pop-command term shell-pop-term-shell) - (make-shell-pop-command multiterm) - (make-shell-pop-command ansi-term shell-pop-term-shell))) - -(provide 'core-term) diff --git a/emacs.d/core/core-ui.el b/emacs.d/core/core-ui.el deleted file mode 100644 index cc86ede..0000000 --- a/emacs.d/core/core-ui.el +++ /dev/null @@ -1,79 +0,0 @@ -(defvar fcuny/font-family "Droid Sans Mono") -(defvar fcuny/font-size 130) - -(defun fcuny/set-font-size (size) - (interactive) - (set-face-attribute 'default nil :height size)) - -(defun fcuny/regular-mode () - (interactive) - (set-frame-font fcuny/font-family) - (fcuny/set-font-size fcuny/font-size)) - -(defun fcuny/presentation-mode () - (interactive) - (set-frame-font fcuny/font-family) - (fcuny/set-font-size 190)) - -;; no menu -(menu-bar-mode -1) - -;; show parenthesis -(show-paren-mode +1) - -;; enable colors -(global-font-lock-mode +1) - -;; no startup screen -(setq inhibit-startup-message t) -(setq initial-scratch-message "") - -;; highlight the current line -(global-hl-line-mode -1) - -(setq frame-title-format '("%b - "(:eval (format "%s" (projectile-project-name))))) - -;; no blink cursor -(blink-cursor-mode -1) - -;; show the column number in the mode-line -(setq column-number-mode t) - -(when window-system - ;;hide tool-bar - (tool-bar-mode 0) - ;;hide scroll-bar - (scroll-bar-mode 0) - ;;hide menu-bar - (menu-bar-mode -1) - ;; set the font size and family - (fcuny/regular-mode)) - -(require 'whitespace) -(global-whitespace-mode 1) -(setq whitespace-style '(face trailing tabs tab-mark)) - -(use-package rainbow-delimiters - :ensure t - :defer t - :init - (progn - (add-hook 'emacs-lisp-mode-hook #'rainbow-delimiters-mode))) - -(setq-default mode-line-position - '((line-number-mode ("(%04l" (column-number-mode ",%03c)"))))) - -(setq-default mode-line-buffer-identification - (list (propertize "%50b" 'face (list :weight 'bold)))) - -(setq-default mode-line-format - '("%e" mode-line-front-space - ;; Standard info about the current buffer - mode-line-mule-info - mode-line-client - mode-line-modified - mode-line-frame-identification - mode-line-buffer-identification " %m " mode-line-position - (flycheck-mode flycheck-mode-line))) - -(provide 'core-ui) -- cgit 1.4.1