jowj/chd
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of github.com:jowj/agares

Browse Source
This commit is contained in:
jowj 2019-06-05 15:26:44 -05:00
commit 0e0dbfd32a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applicationConfiguration/.emacs/init.el
View File

@ -38,6 +38,7 @@
racer
helm
eyebrowse
emojify
;;company-mode
org2blog
pylint
@ -90,7 +91,11 @@ jlj-Packages)
(org-bbdb org-bibtex org-docview org-gnus org-habit org-info org-irc org-mhe org-rmail org-w3m)))
'(package-selected-packages
(quote
<<<<<<< HEAD
(ace-window which-key try use-package dockerfile-mode ansible yaml-mode smex twittering-mode znc eyebrowse helm racer flycheck-rust rust-mode color-theme-sanityinc-tomorrow org2blog multiple-cursors flymake-python-pyflakes pdf-tools weechat jedi python-mode pylint py-autopep8 powershell outline-magic markdown-mode magit flycheck exec-path-from-shell elpygen elpy ein doom-themes csharp-mode)))
=======
(emojify dockerfile-mode docker yaml-mode ansible smex twittering-mode znc eyebrowse helm racer flycheck-rust rust-mode color-theme-sanityinc-tomorrow org2blog multiple-cursors flymake-python-pyflakes pdf-tools weechat jedi python-mode pylint py-autopep8 powershell outline-magic markdown-mode magit flycheck exec-path-from-shell elpygen elpy ein doom-themes csharp-mode)))
>>>>>>> 062ecaf2c8b8ed10fb8a015d83cfbd710440d260
'(znc-servers
(\`
(("bouncer.awful.club" 5000 t

5
applicationConfiguration/.emacs/jlj-misc.el
View File

@ -83,3 +83,8 @@
(require 'smex)
;; emojify-mode
(setq emojify-company-tooltips-p t)
(require emojify)