diff options
14 files changed, 16 insertions, 136 deletions
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org index 194aced..4893871 100644 --- a/emacs/.emacs.d/init.org +++ b/emacs/.emacs.d/init.org @@ -171,6 +171,16 @@ To start off, first I need to enable lexical binding. (setq-default tab-width 4) #+END_SRC +* Inhibit startup screen + + I've been using Emacs long enough not to need the startup screen + anymore. I don't see it on my PC where I start Emacs in daemon mode, + but on my laptop I always start it normally, so it gets in the way. + + #+BEGIN_SRC emacs-lisp + (setq inhibit-startup-screen t) + #+END_SRC + * Font Set the default font to a more pleasing one, in my opinion, with a @@ -905,13 +915,6 @@ To start off, first I need to enable lexical binding. Cider is like Slime for Common Lisp. This configuration is copied from the one provided by Clojure for the Brave and True. - Provides minibuffer documentation for the code you're typing into - the repl. - - #+BEGIN_SRC emacs-lisp - (add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode) - #+END_SRC - Go right to the REPL buffer when it's finished connecting #+BEGIN_SRC emacs-lisp diff --git a/emacs/.emacs.d/init/oni-company-init.org b/emacs/.emacs.d/init/oni-company-init.org index d552d57..6524d5f 100644 --- a/emacs/.emacs.d/init/oni-company-init.org +++ b/emacs/.emacs.d/init/oni-company-init.org @@ -1,5 +1,10 @@ #+TITLE: Company mode configuration +#+BEGIN_SRC emacs-lisp + (require 'company) + (require 'diminish) +#+END_SRC + Don't show that company mode is enabled in the minibuffer. #+BEGIN_SRC emacs-lisp diff --git a/emacs/.emacs.d/snippets/.gitignore b/emacs/.emacs.d/snippets/.gitignore new file mode 100644 index 0000000..28bb317 --- /dev/null +++ b/emacs/.emacs.d/snippets/.gitignore @@ -0,0 +1 @@ +.yas-compiled-snippets.el
\ No newline at end of file diff --git a/emacs/.emacs.d/snippets/conf-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/conf-mode/.yas-compiled-snippets.el deleted file mode 100644 index c0664cc..0000000 --- a/emacs/.emacs.d/snippets/conf-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,8 +0,0 @@ -;;; Compiled snippets and support files for `conf-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'conf-mode - '(("Section" "Section \"$1\"\n Identifier \"$2\"\n $0\nEndSection\n" "Xorg Section" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/conf-mode/section" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/css-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/css-mode/.yas-compiled-snippets.el deleted file mode 100644 index 16e5bf0..0000000 --- a/emacs/.emacs.d/snippets/css-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,8 +0,0 @@ -;;; Compiled snippets and support files for `css-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'css-mode - '(("boxshadow" "box-shadow: ${1:offset-x} ${2:offset-y}${3: [blur-radius]}${4: [spread-radius]}${5: [color]};" "box-shadow" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/css-mode/box-shadow" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/emacs-lisp-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/emacs-lisp-mode/.yas-compiled-snippets.el deleted file mode 100644 index 2eef2b1..0000000 --- a/emacs/.emacs.d/snippets/emacs-lisp-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,9 +0,0 @@ -;;; Compiled snippets and support files for `emacs-lisp-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'emacs-lisp-mode - '(("face" " `($1 ((t (${2::foreground} $0))))" "face" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/emacs-lisp-mode/face" nil nil) - ("do" "(depends-on \"$1\")$0" "depends-on" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/emacs-lisp-mode/depends-on" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/haml-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/haml-mode/.yas-compiled-snippets.el deleted file mode 100644 index 121aadb..0000000 --- a/emacs/.emacs.d/snippets/haml-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,10 +0,0 @@ -;;; Compiled snippets and support files for `haml-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'haml-mode - '(("faq" "%dt\n = link_to '#' do\n .expand_icon\n $1\n%dd\n %p\n $0" "FAQ Question & Answer" nil nil - ((yas-indent-line 'fixed)) - "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/haml-mode/faq" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/html-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/html-mode/.yas-compiled-snippets.el deleted file mode 100644 index bd1aba1..0000000 --- a/emacs/.emacs.d/snippets/html-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,12 +0,0 @@ -;;; Compiled snippets and support files for `html-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'html-mode - '(("trans" "{% trans \"$1\"|capfirst %}" "trans with cap" pony-tpl-minor-mode nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/html-mode/trans-with-cap" nil nil) - ("script" "<script src=\"$1\" type=\"${2:text/javascript}\" language=\"${3:javascript}\"></script>" "script" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/html-mode/script" nil nil) - ("%" "{% $1 %}\n $0\n{% end$1 %}" "Template Block" pony-tpl-minor-mode nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/html-mode/generic-block" nil nil) - ("for" "{% for $1 in $2 %}\n $0\n{% endfor %}" "for" pony-tpl-minor-mode nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/html-mode/for" nil nil) - ("block" "{% block $1 %}\n $0\n{% endblock %}" "block" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/html-mode/block" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/nxml-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/nxml-mode/.yas-compiled-snippets.el deleted file mode 100644 index edc7fe1..0000000 --- a/emacs/.emacs.d/snippets/nxml-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,10 +0,0 @@ -;;; Compiled snippets and support files for `nxml-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'nxml-mode - '(("s" "<Shortcut displayName=\"$1\"\n icon=\"$2\"\n to=\"$3\">\n $0\n</Shortcut>" "Shortcut" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/nxml-mode/pencil-shortcut" nil nil) - ("pv" "<PropertyValue name=\"$1\">$2</PropertyValue>" "PropertyValue" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/nxml-mode/pencil-property-value" nil nil) - ("p" "<Property name=\"$1\"\n displayName=\"$2\"\n type=\"$3\">$4</Property>" "PencilProperty" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/nxml-mode/pencil-property" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/org-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/org-mode/.yas-compiled-snippets.el deleted file mode 100644 index cefc1eb..0000000 --- a/emacs/.emacs.d/snippets/org-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,11 +0,0 @@ -;;; Compiled snippets and support files for `org-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'org-mode - '(("snippet" "#+TITLE: ${1:snippet-name}\n#+OPTIONS: toc:nil\n\n* $1\n\n ${2:A short description abount $1}\n\n #+BEGIN_SRC $3 :tangle yes\n$0\n #+END_SRC" "snippet" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/org-mode/snippet" nil nil) - ("project" "#+TITLE: ${1:project_name}\n#+LINK: src ${2:http://code.ryuslash.org/cgit.cgi/$3$1/}\n#+LINK: tar_gz $2${4:snapshot/$1-master}.tar.gz\n#+LINK: zip $2$4.zip\n#+STARTUP: showall\n\n#+begin_html\n <script src=\"/keyjs.js\" type=\"text/javascript\"></script>\n <script type=\"text/javascript\">\n keyjs_initialize({ \"u\": [ \"keyjs_goto\", \"../index.html\" ],\n \"h\": [ \"keyjs_goto\", \"http://ryuslash.org\" ] });\n </script>\n#+end_html\n\n#+INCLUDE: \"dlmenu.inc\"\n\n* About\n\n ${5:A short description about $1}\n\n | $0Status | $6 |\n | Language | $7 |\n | License | ${8:GPLv3} |\n\n* Why?\n\n ${9:Why did you even think of writing $1?}\n\n* Features\n\n ${10:$1 does...}\n\n* Dependencies\n\n ${11:$1 needs to have...}\n\n* Download\n\n ${12:To download $1...}\n\n* Install\n\n ${13:To install $1...}\n\n* Usage\n\n ${14:Using $1...}" "project" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/org-mode/project" nil nil) - ("*" "${1:*} ${2:TODO} $3\n${1:$(make-string (length text) ?\\ )} :PROPERTIES:\n${1:$(make-string (length text) ?\\ )} :CATEGORY: $4\n${1:$(make-string (length text) ?\\ )} :END:\n${1:$(make-string (length text) ?\\ )} $0" "Heading" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/org-mode/heading" nil nil) - ("code" "#+begin_src $1\n $0\n#+end_src" "codeblock" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/org-mode/codeblock" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/php-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/php-mode/.yas-compiled-snippets.el deleted file mode 100644 index ba80240..0000000 --- a/emacs/.emacs.d/snippets/php-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,10 +0,0 @@ -;;; Compiled snippets and support files for `php-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'php-mode - '(("header" "/*\n * Plugin Name: $1\n * Plugin URI: $2\n * Description: $3\n * Version: ${4:1.0}\n * Author: ${5:Tom Willemse}\n * Author URI: ${6:https://ryuslash.org}\n * License: ${7:GPLv2}\n */" "WP Plugin Header" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/php-mode/wpheader.php" nil nil) - ("(" "( $0 " "opening-brace" electric-pair-mode nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/php-mode/opening-brace" nil nil) - ("function" "function $1($2)\n{\n $0\n}" "function" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/php-mode/function" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/python-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/python-mode/.yas-compiled-snippets.el deleted file mode 100644 index fee2e88..0000000 --- a/emacs/.emacs.d/snippets/python-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,15 +0,0 @@ -;;; Compiled snippets and support files for `python-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'python-mode - '(("url" "url(r'^$1', $2, name='$3')," "url" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/url" nil nil) - ("defm" "@method_decorator(permission_required('$1',\n raise_exception=True))\ndef dispatch(self, *args, **kwargs):\n '''Make sure the user has the $1 permission.'''\n return super(${3:`(progn (re-search-backward \"^[ \\t]*class \\\\(.+\\\\)(\") (match-string 1)))`}, self).dispatch(*args, **kwargs)" "Permission guard" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/permission_guard" nil nil) - ("defm" "def $1(self$2):\n '''$3'''\n $0" "method" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/method" nil nil) - ("from" "from ${1:module} import ${2:class_or_module}\n" "from ... import ..." nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/import_from" nil nil) - ("formvalid" "def form_valid(self, form):\n rv = super(`(let ((name (python-info-current-defun))) (substring name 0 (cl-position ?. name)))`, self).form_valid(form)\n $0\n return rv" "form_valid with return" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/form_valid_with_return" nil nil) - ("defm" "@record_activity(model=${1:`(progn (re-search-backward \"^[ \\t]*model = \\\\([a-zA-Z_].*\\\\)$\") (match-string 1))`})\ndef form_valid(self, form):\n '''Make sure any changes to the $1 model get logged.'''\n return super(${2:`(progn (re-search-backward \"^[ \\t]*class \\\\(.+\\\\)(\") (match-string 1)))`}, self).form_valid(form)" "Record form" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/form_valid" nil nil) - ("form" "class ${1:Model}Form(forms.ModelForm):\n '''Form for the $1 model.'''\n\n class Meta:\n model = $1" "Model Form" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/form" nil nil) - ("defm" "def ${1:name}(self, *args, **kwargs):\n '''$2'''\n return super(${3:`(progn (re-search-backward \"^[ \\t]*class \\\\(.+\\\\)(\") (match-string 1)))`}, self).$1(*args, **kwargs)" "Empty Defmethod" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/python-mode/defm_empty" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/ruby-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/ruby-mode/.yas-compiled-snippets.el deleted file mode 100644 index 76a2f42..0000000 --- a/emacs/.emacs.d/snippets/ruby-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,18 +0,0 @@ -;;; Compiled snippets and support files for `ruby-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'ruby-mode - '(("reduce" "reduce { |a, e| $0 }" "reduce" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/reduce" nil nil) - ("mod" "module ${1:`(let ((fn (capitalize (file-name-nondirectory\n (directory-file-name\n default-directory)))))\n (replace-regexp-in-string \"_\" \"\" fn t t))`}\n $0\nend" "module ... end" nil - ("definitions") - nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/mod" nil nil) - ("fin" "fill_in '$1', with: $2" "fill_in" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/fill_in" nil nil) - ("factory" "FactoryGirl.define do\n factory :${1:`(file-name-sans-extension (file-name-nondirectory buffer-file-name))`} do\n $0\n end\nend" "factory" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/factory" nil nil) - ("do" "do$0\nend" "do" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/do" nil nil) - ("desc" "describe '$1' do\n $0\nend" "describe" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/describe" nil nil) - ("pseed" "Product.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Small', price: '20.00', width_in_cm: '25.00', height_in_cm: '21.00', width_in_mm: '250', height_in_mm: '210')\nProduct.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Medium', price: '20.00', width_in_cm: '30.00', height_in_cm: '25.80', width_in_mm: '300', height_in_mm: '258')\nProduct.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Large', price: '20.00', width_in_cm: '35.00', height_in_cm: '30.00', width_in_mm: '350', height_in_mm: '300')\nProduct.find_or_create_by_name(parent_id: $1, name: '$2', description: 'Extra large', price: '20.00', width_in_cm: '40.00', height_in_cm: '34.00', width_in_mm: '400', height_in_mm: '340')\n" "ProductSeedWithHWGroup" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHWGroup" nil nil) - ("pseed" "Product.find_or_create_by_name(parent_id: $1, name: '$2', description: '$3', price: '$4', width_in_cm: '$5', height_in_cm: '$6', width_in_mm: '${5:$(round (* 10 (string-to-int yas-text)))}', height_in_mm: '${6:$(round (* 10 (string-to-int yas-text)))}')" "ProductSeedWithHW" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/ProductSeedHW" nil nil) - ("pseed" "Product.find_or_create_by_name(parent_id: $1, name: '$2', description: '$3', price: '$4')" "ProductSeed" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/ruby-mode/ProductSeed" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 diff --git a/emacs/.emacs.d/snippets/twig-mode/.yas-compiled-snippets.el b/emacs/.emacs.d/snippets/twig-mode/.yas-compiled-snippets.el deleted file mode 100644 index 43d1519..0000000 --- a/emacs/.emacs.d/snippets/twig-mode/.yas-compiled-snippets.el +++ /dev/null @@ -1,18 +0,0 @@ -;;; Compiled snippets and support files for `twig-mode' -;;; Snippet definitions: -;;; -(yas-define-snippets 'twig-mode - '(("set" "{% set $1 = $2 %}" "set" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/set" nil nil) - ("mac" "{% macro ${1:name}(${2:args}) %}\n $0\n{% endmacro %}" "macro" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/mac" nil nil) - ("imp" "{% import \"${1:module}\" as ${1:$(if (string-match \"/\\\\\\\\([^/]*\\\\\\\\)$\" yas-text)\n (match-string 1 yas-text)\n yas-text)} %}" "import" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/imp" nil nil) - ("iif" "{% if $1 %}$0{% endif %}" "Inline if" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/iif" nil nil) - ("ife" "{% if $1 %}\n $0\n{% else %}\n\n{% endif %}" "if...else" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/ife" nil nil) - ("if" "{% if $1 %}\n $0\n{% endif %}" "if" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/if" nil nil) - ("for" "{% for $1 in $2 %}\n `yas-selected-text`$0\n{% endfor %}" "for" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/for" nil nil) - ("ext" "{% extends \"$1\" %}" "extends" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/ext" nil nil) - ("def" "{% if $1 is not defined %}\n {% set $1 = $2 %}\n{% endif %}" "default value" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/def" nil nil) - ("blk" "{% block $1 %}\n $0\n{% endblock %}" "block" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/blk" nil nil) - ("_self" "{% import _self as ${1:`(file-name-nondirectory (file-name-sans-extension buffer-file-name))`} %}" "_self" nil nil nil "/home/chelys/projects/dotfiles/emacs/.emacs.d/snippets/twig-mode/_self" nil nil))) - - -;;; Do not edit! File generated at Tue Nov 22 15:37:52 2016 |