From 8d28053a2ce5b4d5c8d274d6ba64b660a95b925a Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Sat, 2 Apr 2016 00:15:29 -0700 Subject: Formatting --- home/.emacs.d/config/decoration.el | 31 ++++++++-------- home/.emacs.d/config/markdown.el | 6 ++-- home/.emacs.d/config/navigation.el | 74 ++++++++++++++++---------------------- home/.emacs.d/config/spotify.el | 5 +-- home/.emacs.d/init.el | 5 +-- 5 files changed, 57 insertions(+), 64 deletions(-) diff --git a/home/.emacs.d/config/decoration.el b/home/.emacs.d/config/decoration.el index c256e44..abec0b8 100644 --- a/home/.emacs.d/config/decoration.el +++ b/home/.emacs.d/config/decoration.el @@ -1,18 +1,19 @@ (use-package minimap - :config (progn - (setq minimap-width-fraction 0.1 - minimap-window-location (quote right)) - (set-face-attribute 'minimap-active-region-background nil :background "dim gray"))) + :config + (setq minimap-width-fraction 0.1 + minimap-window-location (quote right)) + (set-face-attribute 'minimap-active-region-background nil :background "dim gray")) (use-package neotree - :config (progn - (custom-set-faces - '(neo-banner-face ((t :inherit shadow)) t) - '(neo-button-face ((t :inherit dired-directory)) t) - '(neo-dir-link-face ((t :inherit dired-directory)) t) - '(neo-expand-btn-face ((t :inherit button)) t) - '(neo-file-link-face ((t :inherit default)) t) - '(neo-header-face ((t :inherit shadow)) t) - '(neo-root-dir-face ((t :inherit link-visited :underline nil)) t)) - (setq neo-theme 'ascii)) - :bind (("" . neotree-toggle))) + :config + (custom-set-faces + '(neo-banner-face ((t :inherit shadow)) t) + '(neo-button-face ((t :inherit dired-directory)) t) + '(neo-dir-link-face ((t :inherit dired-directory)) t) + '(neo-expand-btn-face ((t :inherit button)) t) + '(neo-file-link-face ((t :inherit default)) t) + '(neo-header-face ((t :inherit shadow)) t) + '(neo-root-dir-face ((t :inherit link-visited :underline nil)) t)) + (setq neo-theme 'ascii) + :bind + ("" . neotree-toggle)) diff --git a/home/.emacs.d/config/markdown.el b/home/.emacs.d/config/markdown.el index 1b71c18..66ffa89 100644 --- a/home/.emacs.d/config/markdown.el +++ b/home/.emacs.d/config/markdown.el @@ -1,3 +1,5 @@ (use-package markdown-mode - :mode ("\\.markdown\\'" "\\.md\\'") - :config (setq markdown-command "/usr/bin/pandoc")) + :mode + ("\\.markdown\\'" "\\.md\\'") + :config + (setq markdown-command "/usr/bin/pandoc")) diff --git a/home/.emacs.d/config/navigation.el b/home/.emacs.d/config/navigation.el index 6b93410..7c9291a 100644 --- a/home/.emacs.d/config/navigation.el +++ b/home/.emacs.d/config/navigation.el @@ -1,39 +1,27 @@ (use-package helm - :init (progn - (require 'helm-config) - (helm-mode t) - - (use-package helm-ag - :ensure helm-ag - :bind ("C-c a" . helm-ag)) - - (use-package helm-descbinds - :ensure helm-descbinds - :bind ("C-h b" . helm-descbinds)) - - (use-package helm-projectile - :ensure helm-projectile - :bind ("C-c h" . helm-projectile)) - - (use-package helm-swoop - :ensure helm-swoop - :bind (("C-c o" . helm-swoop) - ("C-c M-o" . helm-multi-swoop))) - - (bind-key "C-c C-SPC" 'helm-ff-run-toggle-auto-update helm-find-files-map)) - - :config (setq helm-candidate-number-limit 100 - helm-idle-delay 0.0 ; update fast sources immediately (doesn't). - helm-input-idle-delay 0.01 ; this actually updates things reeeelatively quickly. - helm-yas-display-key-on-candidate t - helm-quick-update t - helm-M-x-requires-pattern nil - helm-ff-skip-boring-files t - helm-split-window-in-side-p t ; open helm buffer inside current window - helm-M-x-fuzzy-match t - helm-buffers-fuzzy-matching t - helm-recentf-fuzzy-match t - helm-ff-file-name-history-use-recentf t) + :config + (use-package helm-descbinds + :bind ("C-h b" . helm-descbinds)) + + (use-package helm-projectile + :bind ("C-c h" . helm-projectile)) + + (use-package helm-swoop + :bind (("C-c o" . helm-swoop) + ("C-c M-o" . helm-multi-swoop))) + + (setq helm-candidate-number-limit 100 + helm-idle-delay 0.0 ; update fast sources immediately (doesn't). + helm-input-idle-delay 0.01 ; this actually updates things reeeelatively quickly. + helm-yas-display-key-on-candidate t + helm-quick-update t + helm-M-x-requires-pattern nil + helm-ff-skip-boring-files t + helm-split-window-in-side-p t ; open helm buffer inside current window + helm-M-x-fuzzy-match t + helm-buffers-fuzzy-matching t + helm-recentf-fuzzy-match t + helm-ff-file-name-history-use-recentf t) :bind (("C-c h" . helm-mini) ("C-h a" . helm-apropos) @@ -55,11 +43,11 @@ (use-package projectile :diminish projectile-mode - :config (progn - (setq projectile-keymap-prefix (kbd "C-c p")) - (setq projectile-completion-system 'default) - (setq projectile-enable-caching t) - (setq projectile-indexing-method 'alien) - (add-to-list 'projectile-globally-ignored-files "node-modules") - (projectile-global-mode) - (helm-projectile-on))) + :config + (setq projectile-keymap-prefix (kbd "C-c p")) + (setq projectile-completion-system 'default) + (setq projectile-enable-caching t) + (setq projectile-indexing-method 'alien) + (add-to-list 'projectile-globally-ignored-files "node-modules") + (projectile-global-mode) + (helm-projectile-on)) diff --git a/home/.emacs.d/config/spotify.el b/home/.emacs.d/config/spotify.el index 4233cf8..8a8b7ff 100644 --- a/home/.emacs.d/config/spotify.el +++ b/home/.emacs.d/config/spotify.el @@ -1,3 +1,4 @@ (use-package spotify - :bind (("M-s p" . spotify-playpause) - ("M-s n" . spotify-next))) + :bind + (("M-s p" . spotify-playpause) + ("M-s n" . spotify-next))) diff --git a/home/.emacs.d/init.el b/home/.emacs.d/init.el index 4a75f97..b57ab22 100644 --- a/home/.emacs.d/init.el +++ b/home/.emacs.d/init.el @@ -10,7 +10,7 @@ (setq initial-scratch-message "") (setq ring-bell-function 'ignore) -;; disable backups, autosave and lockfiles (use scm instead) +;; disable backups, autosave and lockfiles (setq make-backup-files nil) (setq backup-inhibited t) (setq auto-save-default nil) @@ -27,7 +27,8 @@ (when window-system (set-frame-size (selected-frame) 160 60)) ;; set title of frame to current buffer -(setq frame-title-format "%b") +;;(setq frame-title-format "%b") +(setq frame-title-format '(buffer-file-name "%f" "%b")) ;; Highlight corresponding parentheses when cursor is on one (show-paren-mode t) -- cgit v1.2.3