Use use-package's :custom and :custom-face options everywhere

This commit is contained in:
2019-06-10 19:29:58 +01:00
parent cf30454641
commit 57f670088d
53 changed files with 453 additions and 396 deletions

View File

@@ -15,14 +15,16 @@
("C-s" . ac-isearch)
("C-n" . ac-next)
("C-p" . ac-previous))
:custom
(ac-auto-show-menu 0.2)
(ac-auto-start 3)
(ac-delay 0.05)
(ac-menu-height 15)
:config
(ac-flyspell-workaround)
(setq ac-auto-show-menu 0.2
ac-auto-start 3
ac-delay 0.05
ac-menu-height 15)
;; Auto-complete when indenting.
(defadvice indent-for-tab-command (around ac-before-indent activate)
"Call `auto-complete' if text was recently entered."

View File

@@ -14,6 +14,25 @@
(company-completion-finished . siren-company--maybe-turn-on-fci)
(company-completion-cancelled . siren-company--maybe-turn-on-fci)
:bind
;; Enable indent and complete at point functionality by pressing tab.
("TAB" . company-indent-or-complete-common)
;; Scroll through company suggestions with C-n and C-p.
(:map company-active-map
("C-n" . company-select-next)
("C-p" . company-select-previous))
:custom
(company-begin-commands '(self-insert-command))
(company-dabbrev-downcase nil)
(company-echo-delay 0)
(company-idle-delay 0.3)
(company-minimum-prefix-length 2)
(company-tooltip-limit 20)
;; invert the navigation direction if the the completion popup-isearch-match
;; is displayed on top (happens near the bottom of windows)
(company-tooltip-flip-when-above t)
:init
(defun siren-company--turn-off-fci (&rest ignore)
(when (boundp 'fci-mode)
@@ -28,25 +47,7 @@
:config
(defvar-local siren-company--fci-mode-on-p nil)
(setq company-begin-commands '(self-insert-command)
company-dabbrev-downcase nil
company-echo-delay 0
company-idle-delay 0.3
company-minimum-prefix-length 2
company-tooltip-limit 20
;; invert the navigation direction if the the completion popup-isearch-match
;; is displayed on top (happens near the bottom of windows)
company-tooltip-flip-when-above t)
(global-company-mode 1)
;; Customize keybindings for navigating up/down the completion popup list.
(define-key company-active-map (kbd "C-n") #'company-select-next)
(define-key company-active-map (kbd "C-p") #'company-select-previous)
;; Enable indent and complete at point functionality by pressing tab.
(global-set-key (kbd "TAB") #'company-indent-or-complete-common))
(global-company-mode 1))
(provide 'siren-company)
;;; siren-company.el ends here

View File

@@ -10,14 +10,14 @@
:if window-system
:hook (after-init . edit-server-start)
:init
(setq edit-server-default-major-mode 'markdown-mode
edit-server-new-frame-alist
'((name . "Edit with Emacs FRAME")
(width . 90)
(height . 45)
(minibuffer . t)
(menu-bar-lines . t))))
:custom
(edit-server-default-major-mode 'markdown-mode)
(edit-server-new-frame-alist
'((name . "Edit with Emacs FRAME")
(width . 90)
(height . 45)
(minibuffer . t)
(menu-bar-lines . t))))
(provide 'siren-edit-server)
;;; siren-edit-server.el ends here

View File

@@ -7,11 +7,13 @@
;;; Code:
(use-package fill-column-indicator
:hook (prog-mode . fci-mode)
:config
(setq fci-handle-line-move-visual nil
fci-handle-truncate-lines nil
fci-rule-width 1))
:hook
(prog-mode . fci-mode)
:custom
(fci-handle-line-move-visual nil)
(fci-handle-truncate-lines nil)
(fci-rule-width 1))
(provide 'siren-fci)
;;; siren-fci.el ends here

View File

@@ -11,12 +11,13 @@
(use-package helm-command
:ensure helm
:defer t
:bind
("M-x" . helm-M-x)
:config
(setq helm-M-x-always-save-history t
helm-M-x-fuzzy-match t))
:custom
(helm-M-x-always-save-history t)
(helm-M-x-fuzzy-match t))
(provide 'siren-helm-command)
;;; siren-helm-command.el ends here

View File

@@ -6,28 +6,33 @@
;;; Code:
(require 'ido)
(use-package ido
:ensure nil ;; loaded from emacs built-ins
(setq ido-auto-merge-work-directories-length -1
ido-case-fold t
ido-create-new-buffer 'always
ido-default-file-method 'selected-window
ido-enable-flex-matching t
ido-enable-prefix nil
ido-max-prospects 10
ido-save-directory-list-file (expand-file-name "ido.hist" siren-cache-dir)
ido-use-faces nil
ido-use-filename-at-point nil)
:custom
(ido-auto-merge-work-directories-length -1)
(ido-case-fold t)
(ido-create-new-buffer 'always)
(ido-default-file-method 'selected-window)
(ido-enable-flex-matching t)
(ido-enable-prefix nil)
(ido-max-prospects 10)
(ido-save-directory-list-file (expand-file-name "ido.hist" siren-cache-dir))
(ido-use-faces nil)
(ido-use-filename-at-point nil)
(ido-mode 1)
:init
(ido-mode 1))
(use-package ido-completing-read+
:config
(ido-ubiquitous-mode 1))
(use-package ido-vertical-mode
:custom
(ido-vertical-define-keys "C-n-C-p-up-down-left-right")
:config
(setq ido-vertical-define-keys "C-n-C-p-up-down-left-right")
(ido-vertical-mode 1))
(provide 'siren-ido)

View File

@@ -8,16 +8,18 @@
(use-package linum
:ensure nil ;; loaded from emacs built-ins
:hook (prog-mode . linum-mode))
:hook
(prog-mode . linum-mode))
(use-package linum+
:ensure nil ;; loaded from vendor
:after linum
:init
:custom
;; Customize line numbers - In GUI mode the fringe is the spacer between line
;; numbers and code, while in console mode we add an extra space for it.
(if window-system (setq linum+-dynamic-format " %%%dd")
(setq linum+-dynamic-format " %%%dd "))
(linum+-dynamic-format (if window-system " %%%dd" " %%%dd "))
:config
(setq linum-format 'dynamic))

View File

@@ -13,8 +13,10 @@
("M-X" . smex-major-mode-commands)
("C-c C-c M-x" . execute-extended-command)
:custom
(smex-save-file (expand-file-name "smex-items" siren-cache-dir))
:config
(setq smex-save-file (expand-file-name "smex-items" siren-cache-dir))
(smex-initialize))
(provide 'siren-smex)

View File

@@ -18,12 +18,14 @@
:diminish
undo-tree-mode
:config
(global-undo-tree-mode)
:custom
;; autosave the undo-tree history
(setq undo-tree-history-directory-alist
`((".*" . ,(expand-file-name "undo-tree-history" siren-cache-dir)))
undo-tree-auto-save-history t))
(undo-tree-history-directory-alist
`((".*" . ,(expand-file-name "undo-tree-history" siren-cache-dir))))
(undo-tree-auto-save-history t)
:config
(global-undo-tree-mode))
(provide 'siren-undo-tree)
;;; siren-undo-tree.el ends here

View File

@@ -9,7 +9,12 @@
(use-package coffee-mode
:mode "\\.coffee\\'"
:interpreter "coffee"
:hook (coffee-mode . siren-coffee-mode-setup)
:hook
(coffee-mode . siren-coffee-mode-setup)
:custom
(coffee-tab-width 2)
:init
(defun siren-coffee-mode-setup ()
@@ -24,10 +29,7 @@
(setq tab-width 2)
(highlight-indentation-current-column-mode)
(subword-mode +1))
:config
(setq coffee-tab-width 2))
(subword-mode +1)))
(provide 'siren-coffee)
;;; siren-coffee.el ends here

View File

@@ -10,10 +10,12 @@
(use-package css-mode
:mode "\\.css\\'"
:hook (css-mode . siren-css-mode-setup)
:config
(setq css-indent-offset 2)
:hook
(css-mode . siren-css-mode-setup)
:custom
(css-indent-offset 2)
:init
(defun siren-css-mode-setup ()

View File

@@ -73,8 +73,8 @@
("C-c , B" . go-test-current-project-benchmarks)
("C-c , r" . go-run))
:config
(setq go-test-verbose t))
:custom
(go-test-verbose t))
(use-package go-projectile
:after go-mode

View File

@@ -44,9 +44,11 @@
(smartparens-mode +1)
(subword-mode))
:config
(setq markdown-command "redcarpet")
(custom-set-faces '(markdown-code-face ((t nil)))))
:custom-face
(markdown-code-face ((t nil)))
:custom
(markdown-command "redcarpet"))
(provide 'siren-markdown)
;;; siren-markdown.el ends here

View File

@@ -147,8 +147,8 @@
:hook
(ruby-mode . rubocopfmt-mode)
:config
(setq rubocopfmt-show-errors 'echo))
:custom
(rubocopfmt-show-errors 'echo))
(use-package ruby-compilation
:defer t)
@@ -162,9 +162,9 @@
:hook
(ruby-mode . ruby-refactor-mode)
:config
(setq ruby-refactor-keymap-prefix (kbd "C-c C-=")
ruby-refactor-add-parens t))
:custom
(ruby-refactor-keymap-prefix (kbd "C-c C-="))
(ruby-refactor-add-parens t))
(use-package ruby-tools
:defer t

View File

@@ -10,15 +10,17 @@
(use-package sass-mode
:mode "\\.sass\\'"
:hook (sass-mode . siren-sass-mode-setup)
:hook
(sass-mode . siren-sass-mode-setup)
:custom
;; Turn off annoying auto-compile on save.
(sass-compile-at-save nil)
:init
(defun siren-sass-mode-setup ()
(siren-css-mode-css))
:config
;; turn off annoying auto-compile on save
(setq sass-compile-at-save nil))
(siren-css-mode-css)))
(provide 'siren-sass)
;;; siren-sass.el ends here

View File

@@ -10,15 +10,17 @@
(use-package scss-mode
:mode "\\.scss\\'"
:hook (scss-mode . siren-scss-mode-setup)
:hook
(scss-mode . siren-scss-mode-setup)
:custom
;; Turn off annoying auto-compile on save.
(scss-compile-at-save nil)
:init
(defun siren-scss-mode-setup ()
(siren-css-mode-setup))
:config
;; turn off annoying auto-compile on save
(setq scss-compile-at-save nil))
(siren-css-mode-setup)))
(provide 'siren-scss)
;;; siren-scss.el ends here

View File

@@ -24,8 +24,8 @@
:hook
(sql-mode . sqlformat-mode)
:config
(setq sqlformat-command 'pgformatter))
:custom
(sqlformat-command 'pgformatter))
(provide 'siren-sql)
;;; siren-sql.el ends here

View File

@@ -23,6 +23,12 @@
:hook
(web-mode . siren-web-mode-setup)
:custom
(web-mode-code-indent-offset 2)
(web-mode-css-indent-offset 2)
(web-mode-markup-indent-offset 2)
(web-mode-sql-indent-offset 2)
:init
(defun siren-web-mode-setup ()
"Default tweaks for `web-mode'."
@@ -34,13 +40,7 @@
(hs-minor-mode +1)
(highlight-indentation-current-column-mode)
(highlight-indentation-set-offset 2)
(subword-mode +1))
:config
(setq web-mode-code-indent-offset 2
web-mode-css-indent-offset 2
web-mode-markup-indent-offset 2
web-mode-sql-indent-offset 2))
(subword-mode +1)))
(provide 'siren-web-mode)
;;; siren-web-mode.el ends here

View File

@@ -7,13 +7,15 @@
;;; Code:
(use-package flycheck
:hook (prog-mode . flycheck-mode)
:config
(setq flycheck-completion-system 'ido
flycheck-idle-change-delay 1.0
flycheck-indication-mode 'right-fringe
flycheck-ruby-rubocop-executable "rubocop-bundle-safe"
flycheck-javascript-standard-executable "semistandard"))
:hook
(prog-mode . flycheck-mode)
:custom
(flycheck-completion-system 'ido)
(flycheck-idle-change-delay 1.0)
(flycheck-indication-mode 'right-fringe)
(flycheck-ruby-rubocop-executable "rubocop-bundle-safe")
(flycheck-javascript-standard-executable "semistandard"))
(provide 'siren-flycheck)
;;; siren-flycheck.el ends here

View File

@@ -10,10 +10,13 @@
(use-package lsp-ui
:commands lsp-ui-mode
:hook (lsp-mode . lsp-ui-mode)
:config
(setq lsp-ui-doc-enable nil
lsp-ui-sideline-enable nil))
:hook
(lsp-mode . lsp-ui-mode)
:custom
(lsp-ui-doc-enable nil)
(lsp-ui-sideline-enable nil))
(provide 'siren-lsp-ui)
;;; siren-lsp-ui.el ends here

View File

@@ -8,9 +8,9 @@
(use-package lsp-mode
:commands lsp
:config
(require 'lsp-clients)
(setq lsp-eldoc-render-all nil))
:custom
(lsp-eldoc-render-all nil))
(provide 'siren-lsp)
;;; siren-lsp.el ends here

View File

@@ -7,16 +7,17 @@
;;; Code:
(use-package anzu
:custom
(anzu-mode-lighter "")
(anzu-deactivate-region t)
(anzu-search-threshold 1000)
(anzu-replace-threshold 50)
(anzu-replace-to-string-separator " => ")
:config
(set-face-attribute 'anzu-mode-line nil
:foreground "yellow" :weight 'bold)
(setq anzu-mode-lighter ""
anzu-deactivate-region t
anzu-search-threshold 1000
anzu-replace-threshold 50
anzu-replace-to-string-separator " => ")
(global-set-key [remap query-replace] 'anzu-query-replace)
(global-set-key (kbd "C-c C-r") 'anzu-query-replace)
(global-set-key [remap query-replace-regexp] 'anzu-query-replace-regexp)

View File

@@ -12,9 +12,9 @@
("C-c j" . avy-goto-word-or-subword-1)
("C-c SPC" . avy-goto-char)
:config
(setq avy-background t
avy-style 'at-full))
:custom
(avy-background t)
(avy-style 'at-full))
(use-package ace-window
:bind

View File

@@ -8,13 +8,15 @@
(use-package direx
:bind ("C-x j" . direx-project:jump-to-project-root)
:hook (direx-mode . siren-direx-mode-setup)
:hook
(direx-mode . siren-direx-mode-setup)
:config
(setq direx:closed-icon " + "
direx:open-icon " - "))
:custom
(direx:closed-icon " + ")
(direx:open-icon " - ")
(defun siren-direx-mode-setup ())
:init
(defun siren-direx-mode-setup ()))
(provide 'siren-direx)
;;; siren-direx.el ends here

View File

@@ -17,8 +17,8 @@
("M-g x" . dumb-jump-go-prefer-external)
("M-g z" . dumb-jump-go-prefer-external-other-window)
:config
(setq dumb-jump-selector 'ivy))
:custom
(dumb-jump-selector 'ivy))
(provide 'siren-dumb-jump)
;;; siren-dumb-jump.el ends here

View File

@@ -10,34 +10,34 @@
:bind
("C-c C-a" . ack)
:config
(setq ack-arguments '("--sort-files"
"--ignore-dir=vendor/ruby"
"--ignore-dir=vendor/bundle"
"--ignore-dir=coverage"
"--ignore-dir=savefile"
"--ignore-dir=Godeps"
"--ignore-dir=elpa"
"--ignore-dir=docs"
"--ignore-dir=doc"
"--type-add=js=.js,.js.erb"
"--type-add=ruby=.jbuilder,.rabl"
"--type-add=html=.haml,.hamlc,.jade"
"--type-add=css=.sass,.scss,.styl"
"--type-set=coffee=.coffee"
"--type-set=cucumber=.feature")
ack-project-root-file-patterns '(".project\\'"
".xcodeproj\\'"
".sln\\'"
"\\`Project.ede\\'"
"\\`.git\\'"
"\\`.bzr\\'"
"\\`_darcs\\'"
"\\`.hg\\'"
"\\`Gemfile\\'"
"\\`Rakefile\\'"
"\\`Makefile\\'")
ack-prompt-for-directory 'unless-guessed))
:custom
(ack-arguments '("--sort-files"
"--ignore-dir=vendor/ruby"
"--ignore-dir=vendor/bundle"
"--ignore-dir=coverage"
"--ignore-dir=savefile"
"--ignore-dir=Godeps"
"--ignore-dir=elpa"
"--ignore-dir=docs"
"--ignore-dir=doc"
"--type-add=js=.js,.js.erb"
"--type-add=ruby=.jbuilder,.rabl"
"--type-add=html=.haml,.hamlc,.jade"
"--type-add=css=.sass,.scss,.styl"
"--type-set=coffee=.coffee"
"--type-set=cucumber=.feature"))
(ack-project-root-file-patterns '(".project\\'"
".xcodeproj\\'"
".sln\\'"
"\\`Project.ede\\'"
"\\`.git\\'"
"\\`.bzr\\'"
"\\`_darcs\\'"
"\\`.hg\\'"
"\\`Gemfile\\'"
"\\`Rakefile\\'"
"\\`Makefile\\'"))
(ack-prompt-for-directory 'unless-guessed))
(provide 'siren-full-ack)
;;; siren-full-ack.el ends here

View File

@@ -10,35 +10,39 @@
:bind
("C-c g" . git-link)
:config
(setq git-link-open-in-browser t)
:custom
(git-link-open-in-browser t)
:config
;; Add custom handlers relevant only for machine with hostname "UAC00013".
(when (string-prefix-p "UAC00013" (system-name))
(defun git-link-uac00013-bitbucket (hostname dirname filename branch commit start end)
(format "https://%s/projects/%srepos/%s/browse/%s"
"bitbucket.il2management.local"
(upcase (file-name-directory dirname))
(file-name-nondirectory dirname)
(concat filename
(unless (string= (or branch commit) "master")
(format "?at=%s" (or branch commit)))
(when start
(concat "#"
(if end (format "%s-%s" start end)
(format "%s" start)))))))
(defun git-link-uac00013-bitbucket (hostname
dirname filename
branch commit
start end)
(format "https://%s/projects/%srepos/%s/browse/%s"
"bitbucket.il2management.local"
(upcase (file-name-directory dirname))
(file-name-nondirectory dirname)
(concat filename
(unless (string= (or branch commit) "master")
(format "?at=%s" (or branch commit)))
(when start
(concat "#"
(if end (format "%s-%s" start end)
(format "%s" start)))))))
(defun git-link-commit-uac00013-bitbucket (hostname dirname commit)
(format "https://%s/projects/%srepos/%s/commits/%s"
"bitbucket.il2management.local"
(upcase (file-name-directory dirname))
(file-name-nondirectory dirname)
commit))
(defun git-link-commit-uac00013-bitbucket (hostname dirname commit)
(format "https://%s/projects/%srepos/%s/commits/%s"
"bitbucket.il2management.local"
(upcase (file-name-directory dirname))
(file-name-nondirectory dirname)
commit))
(add-to-list 'git-link-remote-alist
'("git" git-link-uac00013-bitbucket) t)
(add-to-list 'git-link-commit-remote-alist
'("git" git-link-commit-uac00013-bitbucket) t)))
(add-to-list 'git-link-remote-alist
'("git" git-link-uac00013-bitbucket) t)
(add-to-list 'git-link-commit-remote-alist
'("git" git-link-commit-uac00013-bitbucket) t)))
(provide 'siren-git-link)
;;; siren-git-link.el ends here

View File

@@ -13,18 +13,18 @@
("C-c C-s" . helm-do-ag)
("C-x C-'" . helm-do-ag-project-root)
:config
(setq helm-ag-ignore-patterns '("*.sql"
"*.test"
"*.min.css"
"*.min-latest.css"
"*.min.js"
"*.min-latest.js"
"archive-contents"
"cache"
"elpa"
"node_modules"
"vendor/assets")))
:custom
(helm-ag-ignore-patterns '("*.sql"
"*.test"
"*.min.css"
"*.min-latest.css"
"*.min.js"
"*.min-latest.js"
"archive-contents"
"cache"
"elpa"
"node_modules"
"vendor/assets")))
(provide 'siren-helm-ag)
;;; siren-helm-ag.el ends here

View File

@@ -16,9 +16,9 @@
("C-c f f" . helm-for-files)
("C-c f r" . helm-recentf)
:config
(setq helm-ff-file-name-history-use-recentf t
helm-ff-search-library-in-sexp t))
:custom
(helm-ff-file-name-history-use-recentf t)
(helm-ff-search-library-in-sexp t))
(provide 'siren-helm-files)
;;; siren-helm-files.el ends here

View File

@@ -10,11 +10,12 @@
(use-package helm-gtags
:defer t
:config
(setq helm-gtags-auto-update t
helm-gtags-direct-helm-completing t
helm-gtags-fuzzy-match t
helm-gtags-ignore-case t))
:custom
(helm-gtags-auto-update t)
(helm-gtags-direct-helm-completing t)
(helm-gtags-fuzzy-match t)
(helm-gtags-ignore-case t))
(provide 'siren-helm-gtags)
;;; siren-helm-gtags.el ends here

View File

@@ -15,8 +15,8 @@
("C-c o i" . helm-open-github-from-issues)
("C-c o p" . helm-open-github-from-pull-requests)
:config
(setq helm-open-github-commit-limit 10000))
:custom
(helm-open-github-commit-limit 10000))
(provide 'siren-helm-open-github)
;;; siren-helm-open-github.el ends here

View File

@@ -14,6 +14,17 @@
(helm-cleanup . siren-helm--popwin-help-mode-on)
(helm-cleanup . siren-helm--show-neotree-maybe))
:custom
(helm-autoresize-max-height 30)
(helm-autoresize-min-height 30)
(helm-autoresize-mode t)
(helm-buffer-max-length 64)
(helm-case-fold-search 'smart)
(helm-echo-input-in-header-line t)
(helm-file-name-case-fold-search 'smart)
(helm-split-window-default-side 'below)
(siren-helm--did-hide-neotree nil)
:init
;; From: https://www.reddit.com/r/emacs/comments/3asbyn/new_and_very_useful_helm_feature_enter_search/
(defun siren-helm--hide-minibuffer-maybe ()
@@ -58,22 +69,13 @@
(run-with-timer 0.01 nil #'neotree-show)))
:config
(setq helm-autoresize-max-height 30
helm-autoresize-min-height 30
helm-autoresize-mode t
helm-buffer-max-length 64
helm-case-fold-search 'smart
helm-echo-input-in-header-line t
helm-file-name-case-fold-search 'smart
helm-split-window-default-side 'below
siren-helm--did-hide-neotree nil)
(advice-add 'helm :before 'siren-helm--hide-neotree))
(use-package helm-config
:ensure helm
:init
(setq helm-command-prefix-key "C-c h"))
:custom
(helm-command-prefix-key "C-c h"))
(use-package helm-descbinds
:defer t)

View File

@@ -15,9 +15,9 @@
:hook
(prog-mode . highlight-symbol-mode)
:config
(setq highlight-symbol-highlight-single-occurrence 'nil
highlight-symbol-idle-delay 0.5))
:custom
(highlight-symbol-highlight-single-occurrence 'nil)
(highlight-symbol-idle-delay 0.5))
(provide 'siren-highlight-symbol)
;;; siren-highlight-symbol.el ends here

View File

@@ -11,13 +11,15 @@
("C-s" . swiper)
("C-c C-r" . ivy-resume)
:config
(ivy-mode 1)
(setq ivy-use-virtual-buffers t)
:custom-faces
(ivy-current-match ((t (:background "#7e9fc9" :foreground "black"))))
(swiper-line-face ((t (:background "#313c4d"))))
(custom-set-faces
'(ivy-current-match ((t (:background "#7e9fc9" :foreground "black"))))
'(swiper-line-face ((t (:background "#313c4d"))))))
:custom
(ivy-use-virtual-buffers t)
:config
(ivy-mode 1))
(provide 'siren-swiper)
;;; siren-swiper.el ends here

View File

@@ -7,37 +7,37 @@
;;; Code:
(use-package ecb
:config
(setq ecb-layout-name "left13"
ecb-primary-secondary-mouse-buttons 'mouse-1--mouse-2
ecb-tree-make-parent-node-sticky nil
ecb-prescan-directories-for-emptyness nil
ecb-tip-of-the-day nil
ecb-tree-indent 3
ecb-windows-width 0.24
ecb-source-path '(("~/Projects" "Projects")
("/media/projects" "devbox/projects")
("~/.emacs.d" ".emacs.d")
("~/.dotfiles" ".dotfiles")
("~/Notes" "Notes")
("~/Projects/which" "which")
("~/Projects/fitzdares" "fitzdares")
("~/Projects/Go" "Go")
("~/src" "src")
("~/Sites" "Sites")
("~" "~")
("/" "/"))
:custom
(ecb-layout-name "left13")
(ecb-primary-secondary-mouse-buttons 'mouse-1--mouse-2)
(ecb-tree-make-parent-node-sticky nil)
(ecb-prescan-directories-for-emptyness nil)
(ecb-tip-of-the-day nil)
(ecb-tree-indent 3)
(ecb-windows-width 0.24)
(ecb-source-path '(("~/Projects" "Projects")
("/media/projects" "devbox/projects")
("~/.emacs.d" ".emacs.d")
("~/.dotfiles" ".dotfiles")
("~/Notes" "Notes")
("~/Projects/which" "which")
("~/Projects/fitzdares" "fitzdares")
("~/Projects/Go" "Go")
("~/src" "src")
("~/Sites" "Sites")
("~" "~")
("/" "/")))
;; Add "^Icon$" as a exclude to the default sources. Dropbox uses "Icon"
;; files with some weird unprintable character at the end of the
;; filename to customize the folder icon. ECB however errors out when
;; trying to render this file, hence we're no longer displaying it at
;; all.
ecb-source-file-regexps
(quote
((".*"
("\\(^\\(#\\)\\|\\(~$\\|\\.\\(elc\\|obj\\|o\\|class\\|lib\\|dll\\|a\\|so\\|cache\\)$\\)\\)" "^Icon$")
("^\\.\\(emacs\\|gnus\\)$")))))
;; Add "^Icon$" as a exclude to the default sources. Dropbox uses "Icon"
;; files with some weird unprintable character at the end of the
;; filename to customize the folder icon. ECB however errors out when
;; trying to render this file, hence we're no longer displaying it at
;; all.
(ecb-source-file-regexps
(quote
((".*"
("\\(^\\(#\\)\\|\\(~$\\|\\.\\(elc\\|obj\\|o\\|class\\|lib\\|dll\\|a\\|so\\|cache\\)$\\)\\)" "^Icon$")
("^\\.\\(emacs\\|gnus\\)$")))))
(if window-system (ecb-activate))
(global-set-key (kbd "C-x C-p") 'ecb-toggle-ecb-windows))

View File

@@ -14,6 +14,18 @@
("C-x C-p" . neotree-toggle)
("C-x p" . neotree-project-dir)
:custom
(neo-autorefresh t)
(neo-force-change-root t)
(neo-mode-line-type 'default)
(neo-show-hidden-files t)
(neo-show-updir-line nil)
(neo-smart-open nil)
(neo-theme (if window-system 'icons 'ascii))
(neo-toggle-window-keep-p t)
(neo-vc-integration '(face char))
(neo-window-width 54)
:init
(defun neotree-project-dir ()
"Open NeoTree using the project root, using find-file-in-project,
@@ -33,22 +45,7 @@ or the current buffer directory."
(if (and (fboundp 'neo-global--window-exists-p)
(neo-global--window-exists-p))
(neotree-hide)
(neotree-project-dir)))
:config
(if window-system
(setq neo-theme 'icons)
(setq neo-theme 'ascii))
(setq neo-autorefresh t
neo-force-change-root t
neo-mode-line-type 'default
neo-show-hidden-files t
neo-show-updir-line nil
neo-smart-open nil
neo-toggle-window-keep-p t
;; neo-vc-integration '(face char)
neo-window-width 54))
(neotree-project-dir))))
(provide 'siren-neotree)
;;; siren-neotree.el ends here

View File

@@ -10,11 +10,10 @@
:bind
("C-x C-p" . project-explorer-toggle)
:init
(setq pe/follow-current t
pe/width 54
pe/cache-directory (expand-file-name
"project-explorer" siren-cache-dir))
:custom
(pe/follow-current t)
(pe/width 54)
(pe/cache-directory (expand-file-name "project-explorer" siren-cache-dir))
:config
;; Make Project Explorer open selected file in last used buffer

View File

@@ -17,34 +17,33 @@
(:map projectile-mode-map
("C-c p" . projectile-command-map))
:init
(setq projectile-cache-file (expand-file-name "projectile" siren-cache-dir))
(setq projectile-completion-system 'ido
projectile-enable-caching nil
projectile-globally-ignored-directories '(".bzr"
".eunit"
".fslckout"
".git"
".hg"
".idea"
".svn"
".vagrant"
"_darcs"
"archive-contents"
"cache"
"coverage"
"doc"
"docs"
"elpa"
"node_modules"
"log"
"logs"
"tmp"
"vendor/assets")
projectile-globally-ignored-files '("TAGS" "*.log")
projectile-indexing-method 'hybrid
projectile-sort-order 'recently-active)
:custom
(projectile-cache-file (expand-file-name "projectile" siren-cache-dir))
(projectile-completion-system 'ido)
(projectile-enable-caching nil)
(projectile-globally-ignored-directories '(".bzr"
".eunit"
".fslckout"
".git"
".hg"
".idea"
".svn"
".vagrant"
"_darcs"
"archive-contents"
"cache"
"coverage"
"doc"
"docs"
"elpa"
"node_modules"
"log"
"logs"
"tmp"
"vendor/assets"))
(projectile-globally-ignored-files '("TAGS" "*.log"))
(projectile-indexing-method 'hybrid)
(projectile-sort-order 'recently-active)
:config
;; Treat separate directories with Gemfiles within a single git repo as separate

View File

@@ -46,8 +46,8 @@
("C-x C-p" . treemacs-projectile)
("C-x C-p" . treemacs-projectile-toggle)
:config
(setq treemacs-header-function #'treemacs-projectile-create-header))
:custom
(treemacs-header-function #'treemacs-projectile-create-header))
(provide 'siren-treemacs)
;;; siren-treemacs.el ends here

View File

@@ -16,15 +16,16 @@
:hook
(prog-mode . flyspell-prog-mode)
:custom
(ispell-program-name "aspell") ;; use aspell instead of ispell
(ispell-extra-args '("--lang=en" "--sug-mode=ultra"))
:config
;; Unbind keys used by siren-goto-chg module.
(unbind-key "C-." flyspell-mode-map)
(unbind-key "C-," flyspell-mode-map)
;; Unbind keys used by siren-resize-window module.
(unbind-key "C-;" flyspell-mode-map)
(setq ispell-program-name "aspell" ; use aspell instead of ispell
ispell-extra-args '("--lang=en" "--sug-mode=ultra")))
(unbind-key "C-;" flyspell-mode-map))
(provide 'siren-flyspell)
;;; siren-flyspell.el ends here

View File

@@ -14,17 +14,18 @@
("C-c M-/" . mc/mark-all-like-this)
("M-RET" . set-rectangular-region-anchor)
:config
(setq mc/edit-lines-empty-lines 'ignore)
:custom
(mc/edit-lines-empty-lines 'ignore)
:config
;; Make alt-<click> add additional cursors
(global-unset-key (kbd "M-<down-mouse-1>")) ;; must unset key first
(global-set-key (kbd "M-<mouse-1>") 'mc/add-cursor-on-click))
;; Allows searching forward/back (C-s/C-r) searching with multiple cursors.
(use-package phi-search
:config
(setq phi-search-limit 3000))
:custom
(phi-search-limit 3000))
(provide 'siren-multiple-cursors)
;;; siren-multiple-cursors.el ends here

View File

@@ -30,6 +30,14 @@
:hook
(prog-mode . smartparens-mode)
:custom-face
(sp-pair-overlay-face ((t (:inherit nil))))
:custom
(sp-base-key-bindings 'paredit)
(sp-autoskip-closing-pair 'always)
(sp-hybrid-kill-entire-symbol nil)
:config
;; smart pairing for all
(require 'smartparens-config)
@@ -41,13 +49,6 @@
(defalias 'rw 'sp-rewrap-sexp)
(show-smartparens-global-mode +1)
(setq sp-base-key-bindings 'paredit
sp-autoskip-closing-pair 'always
sp-hybrid-kill-entire-symbol nil)
(custom-set-faces
'(sp-pair-overlay-face ((t (:inherit nil)))))
(sp-pair "{" nil :post-handlers
'(((lambda (&rest _ignored)
(siren-smart-open-line-above)) "RET"))))

View File

@@ -17,6 +17,23 @@
(siren-magit-mode . siren-magit-mode-setup)
(git-commit-setup . siren-git-commit-mode-setup)
:custom
(magit-bury-buffer-function 'magit-mode-quit-window)
(magit-commit-arguments '("-S"))
(magit-completing-read-function 'magit-ido-completing-read)
(magit-default-tracking-name-function
'magit-default-tracking-name-branch-only)
(magit-diff-refine-hunk t)
(magit-display-buffer-function
'magit-display-buffer-same-window-except-diff-v1)
(magit-repository-directories '(("~/Projects" . 2)
("~/src" . 1)
("~/.emacs.d" . 0)
("~/.dotfiles" . 2)))
(magit-restore-window-configuration nil)
(magit-revert-buffers 'silent)
(magit-status-buffer-switch-function 'switch-to-buffer)
:init
(defalias 'bl 'magit-blame)
@@ -33,28 +50,17 @@
(auto-fill-mode))
:config
(require 'magit)
(setq magit-bury-buffer-function 'magit-mode-quit-window
magit-completing-read-function 'magit-ido-completing-read
magit-commit-arguments '("-S")
magit-default-tracking-name-function 'magit-default-tracking-name-branch-only
magit-diff-refine-hunk t
magit-display-buffer-function 'magit-display-buffer-same-window-except-diff-v1
magit-restore-window-configuration nil
magit-revert-buffers 'silent
magit-repository-directories '(("~/Projects" . 2)
("~/src" . 1)
("~/.emacs.d" . 0)
("~/.dotfiles" . 2))
magit-status-buffer-switch-function 'switch-to-buffer))
(require 'magit))
(use-package transient
:defer t
:config
(setq transient-history-file (expand-file-name "transient/history.el" siren-cache-dir)
transient-levels-file (expand-file-name "transient/levels.el" siren-cache-dir)
transient-values-file (expand-file-name "transient/values.el" siren-cache-dir)))
:custom
(transient-history-file
(expand-file-name "transient/history.el" siren-cache-dir))
(transient-levels-file
(expand-file-name "transient/levels.el" siren-cache-dir))
(transient-values-file
(expand-file-name "transient/values.el" siren-cache-dir)))
(provide 'siren-magit)
;;; siren-magit.el ends here

View File

@@ -10,9 +10,12 @@
(use-package magithub
:after magit
:custom
(magithub-clone-default-directory "~/Projects")
:config
(magithub-feature-autoinject t)
(setq magithub-clone-default-directory "~/Projects"))
(magithub-feature-autoinject t))
(provide 'siren-magithub)
;;; siren-magithub.el ends here

View File

@@ -10,8 +10,8 @@
:bind
("C-x C-<return>" . zoom-window-zoom)
:config
(setq zoom-window-mode-line-color "#2a1f1f"))
:custom
(zoom-window-mode-line-color "#2a1f1f"))
(provide 'siren-zoom-window)
;;; siren-zoom-window.el ends here

View File

@@ -12,13 +12,14 @@
(add-to-list 'window-persistent-parameters '(window-side . writable))
(add-to-list 'window-persistent-parameters '(window-slot . writable))
:config
(setq eyebrowse-default-workspace-slot 0
eyebrowse-keymap-prefix ""
eyebrowse-mode-line-style 'always
eyebrowse-new-workspace t
eyebrowse-wrap-around t)
:custom
(eyebrowse-default-workspace-slot 0)
(eyebrowse-keymap-prefix "")
(eyebrowse-mode-line-style 'always)
(eyebrowse-new-workspace t)
(eyebrowse-wrap-around t)
:config
(let ((map (make-sparse-keymap)))
(define-key map (kbd "c") 'eyebrowse-create-window-config)
(define-key map (kbd "C-c") 'eyebrowse-create-window-config)

View File

@@ -33,16 +33,17 @@
("C-z C-n" . persp-next)
("C-z p" . persp-prev)
("C-z C-p" . persp-prev))
:custom-face
;; (persp-selected-face ((t (:foreground "#d97a35" :weight bold))))
:custom
(persp-mode-prefix-key "")
(persp-initial-frame-name "0:main")
:config
(setq persp-mode-prefix-key ""
persp-initial-frame-name "0:main")
(define-key persp-mode-map (kbd "C-z") perspective-map)
(persp-mode)
;; (custom-set-faces
;; '(persp-selected-face ((t (:foreground "#d97a35" :weight bold)))))
)
(persp-mode))
(provide 'siren-perspective)
;;; siren-perspective.el ends here

View File

@@ -7,8 +7,8 @@
;;; Code:
(use-package workgroups2
:config
(setq wg-prefix-key (kbd "C-z")))
:custom
(wg-prefix-key (kbd "C-z")))
(provide 'siren-workgroups2)
;;; siren-workgroups2.el ends here

View File

@@ -17,10 +17,10 @@
("C-M->" . writeroom-increase-width)
("C-M-=" . writeroom-adjust-width))
:config
(setq writeroom-global-effects nil
writeroom-restore-window-config t
writeroom-width 82))
:custom
(writeroom-global-effects nil)
(writeroom-restore-window-config t)
(writeroom-width 82))
(provide 'siren-writeroom)
;;; siren-writeroom.el ends here

View File

@@ -10,17 +10,18 @@
(use-package doom-themes
:ensure t
:config
:custom
;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t ; if nil, italics is universally disabled
doom-nord-light-brighter-comments nil
doom-nord-light-brighter-modeline nil
doom-nord-light-comment-bg t
doom-nord-light-padded-modeline nil
nlinum-highlight-current-line t)
(doom-themes-enable-bold t) ; if nil, bold is universally disabled
(doom-themes-enable-italic t) ; if nil, italics is universally disabled
(doom-nord-light-brighter-comments nil)
(doom-nord-light-brighter-modeline nil)
(doom-nord-light-comment-bg t)
(doom-nord-light-padded-modeline nil)
(nlinum-highlight-current-line t)
:config
;; Load the theme (doom-nord-light, doom-molokai, etc); keep in mind that each
;; theme may have their own settings.
(load-theme 'doom-nord-light t)

View File

@@ -10,17 +10,18 @@
(use-package doom-themes
:ensure t
:config
:custom
;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t ; if nil, italics is universally disabled
doom-nord-brighter-comments nil
doom-nord-brighter-modeline nil
doom-nord-comment-bg t
doom-nord-padded-modeline nil
nlinum-highlight-current-line t)
(doom-themes-enable-bold t) ; if nil, bold is universally disabled
(doom-themes-enable-italic t) ; if nil, italics is universally disabled
(doom-nord-brighter-comments nil)
(doom-nord-brighter-modeline nil)
(doom-nord-comment-bg t)
(doom-nord-padded-modeline nil)
(nlinum-highlight-current-line t)
:config
;; Load the theme (doom-nord, doom-molokai, etc); keep in mind that each
;; theme may have their own settings.
(load-theme 'doom-nord t)

View File

@@ -10,16 +10,17 @@
(use-package doom-themes
:ensure t
:config
:custom
;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t ; if nil, italics is universally disabled
doom-one-brighter-comments nil
doom-one-brighter-modeline nil
doom-one-comment-bg t
doom-one-padded-modeline nil)
(doom-themes-enable-bold t) ; if nil, bold is universally disabled
(doom-themes-enable-italic t) ; if nil, italics is universally disabled
(doom-one-brighter-comments nil)
(doom-one-brighter-modeline nil)
(doom-one-comment-bg t)
(doom-one-padded-modeline nil)
:config
;; Load the theme (doom-one, doom-molokai, etc); keep in mind that each
;; theme may have their own settings.
(load-theme 'doom-one t)

View File

@@ -10,16 +10,17 @@
(use-package doom-themes
:ensure t
:config
:custom
;; Global settings (defaults)
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
doom-themes-enable-italic t ; if nil, italics is universally disabled
doom-vibrant-brighter-comments nil
doom-vibrant-brighter-modeline nil
doom-vibrant-comment-bg t
doom-vibrant-padded-modeline nil)
(doom-themes-enable-bold t) ; if nil, bold is universally disabled
(doom-themes-enable-italic t) ; if nil, italics is universally disabled
(doom-vibrant-brighter-comments nil)
(doom-vibrant-brighter-modeline nil)
(doom-vibrant-comment-bg t)
(doom-vibrant-padded-modeline nil)
:config
;; Load the theme (doom-vibrant, doom-molokai, etc); keep in mind that each
;; theme may have their own settings.
(load-theme 'doom-vibrant t)