Browse Source

Updated dotfiles to ORG init

master
Josh Wolfe 4 years ago
parent
commit
bb976ccb69
5 changed files with 374 additions and 260 deletions
  1. 364
    2
      .emacs.d/README.org
  2. 8
    253
      .emacs.d/init.el
  3. 0
    1
      .emacs.d/lisp/move-lines
  4. 2
    1
      .gitignore
  5. 0
    3
      .gitmodules

+ 364
- 2
.emacs.d/README.org View File

@@ -1,3 +1,365 @@
* Emacs Configuration
* Puremacs

Dotfiles for learning emacs without evil mode.

[[http://i.imgur.com/97Ax7Vv.jpg][file:http://i.imgur.com/97Ax7Vv.jpg]]

** Package management

Here I set up basic package control. I add melpa, melpa-stable and org to my sources
and then initialize the package.

#+begin_src emacs-lisp :tangle yes
(require 'package)
(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/"))
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
(add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/"))
(setq package-enable-at-startup nil)
(package-initialize)
#+end_src

I use [[https://github.com/jwiegley/use-package][use-package]] for my package management. It makes it very simple to automatically
install packages on a new system. It also allows packages to fail while still loading
the remainder of your config file.

#+begin_src emacs-lisp :tangle yes
(unless (package-installed-p 'use-package)
(package-refresh-contents)
(package-install 'use-package))
(require 'use-package)
(setq use-package-always-ensure t)
#+end_src

** Essential Settings

Essential settings contains mostly quality of life changes. I disable the welcome
screen as well as the welcome message in the minibuffer. I also disable the tool bar,
scroll bar and menu bar. Matching parens are shown when highlighted. The scratch
buffer is blank by default. I also set =yes-or-no-p= so that I only have to press =y=
stead of typing =yes<RET>= when prompted. Use spaces instead of tabs. If I try and
input text with a visual selection it replaces the visual selection. Personally I'm
partial to Inconsolata (I like Fira as well) here I check if the font group is
installed before setting the font to stop any errors.

#+begin_src emacs-lisp :tangle yes
(setq inhibit-splash-screen t
inhibit-startup-message t
inhibit-startup-echo-area-message "wolfe")
(tool-bar-mode -1)
(scroll-bar-mode -1)
(menu-bar-mode -1)
(show-paren-mode t)
(setq initial-scratch-message "")
(fset 'yes-or-no-p 'y-or-n-p)
(setq-default indent-tabs-mode nil)
(delete-selection-mode 1)
(when (member "Inconsolata" (font-family-list))
(add-to-list 'default-frame-alist '(font . "Inconsolata-13" ))
(set-face-attribute 'default t :font "Inconsolata-13"))
#+end_src

Currently I'm using [[https://github.com/hlissner/emacs-doom-theme][doom themes]] (I usually swap between doom-one and doom-molokai
depending on how I'm feeling that day). I'm also a fan of [[https://github.com/owainlewis/emacs-color-themes][sublime themes]]'s Spolsky.
If you're planning to swap this theme out for your own make sure to remove the
accompanying neotree theme enabled lower down in [[Neotree]].

#+begin_src emacs-lisp :tangle yes
;; Theme
(use-package doom-themes
:config
(load-theme 'doom-one t))
#+end_src

** Org Settings

I'm still getting into org mode so my settings are very basic. I enable entities so
I can type =\= followed by something like =alpha= and get the UTF-8 char \alpha. I also
set src font natively so that I can have syntax highlighting in source blocks. I
also do some fontify stuff to make my theme look better (as suggested on the doom
theme's github).

#+begin_src emacs-lisp :tangle yes
(setq org-pretty-entities t
org-src-fontify-natively t
org-fontify-whole-heading-line t
org-fontify-done-headline t
org-fontify-quote-and-verse-blocks t)
#+end_src

*** Org Bullets

[[org-bullets][file:http://i.imgur.com/8w3Qwgd.jpg]]


Org bullets allows for nicely formatted bullets instead of asteriks' in org mode.

#+begin_src emacs-lisp :tangle yes
;; Better looking org headers
(use-package org-bullets
:config
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
#+end_src

** Packages
*** Evil

#+begin_src emacs-lisp :tangle yes
;; Base evil package
(use-package evil
:init
;; Unbind <C-u> for evil mode's use
(setq evil-want-C-u-scroll t)
:config
(evil-mode t)
;; Move up and down through wrapped lines
(define-key evil-normal-state-map (kbd "j") 'evil-next-visual-line)
(define-key evil-normal-state-map (kbd "k") 'evil-previous-visual-line)
(define-key evil-normal-state-map "\M-l" 'swap-next-char)
(define-key evil-normal-state-map "\M-h" 'swap-prev-char)
(setq evil-split-window-below t)
(setq evil-vsplit-window-right t)
(define-key evil-ex-map "e " 'ido-find-file))

;; evil leader key
(use-package evil-leader
:config
(evil-leader/set-leader "<SPC>")
(setq evil-leader/in-all-states 1)
(global-evil-leader-mode)
(evil-leader/set-key
"w" 'save-buffer ; w(rite)
"S" 'eval-buffer ; S(ource)
"s" 'eval-defun ; s(ource)
"b" 'mode-line-other-buffer ; b(ack) b(buffer)
"db" 'kill-buffer ; b(uffer) d(elete)
"m" 'ido-switch-buffer ; m(ini)
"init" (lambda() (interactive) (evil-buffer-new nil "~/.emacs.d/init.el"))))

;; Tpope's surround
(use-package evil-surround
:config
(global-evil-surround-mode 1))

;; Vim bindings for magit
(use-package evil-magit)

;; Vim bindings for org mode
(use-package evil-org)
#+end_src

*** Ido

[[ido][file:http://i.imgur.com/VBHYTj8.jpg]]

[[https://www.gnu.org/software/emacs/manual/ido.html][ido]] is my go-to minibuffer completion. It makes it super easy to navigate around the
minibuffer. I bind tab to cycle through the matches and I have fuzzy matching on as
well. I use [[https://github.com/DarwinAwardWinner/ido-ubiquitous][ido-ubiquitous]] so that I can use ido everywhere possible. Finally I have
[[https://github.com/doitian/ido-complete-space-or-hyphen][ido-complete-space-or-hyphen]] which intelligently inserts a space or hyphen based on
completion candidates.

#+begin_src emacs-lisp :tangle yes
(use-package ido
:init
(defun my-ido-keys ()
"Add keybindings for ido"
(define-key ido-completion-map [tab] 'ido-next-match))
(add-hook 'ido-setup-hook #'my-ido-keys)
:config
(setq ido-enable-flex-matching t)
(setq ido-everywhere t)
(ido-mode 1))

(use-package ido-ubiquitous
:config
(ido-ubiquitous-mode 1))

(use-package ido-complete-space-or-hyphen)
#+end_src

*** Smex

[[smex][file:http://i.imgur.com/iw3gUPU.jpg]]


[[https://github.com/nonsequitur/smex][Smex]] uses ido for =M-x=. I like this for all the same reasons I like ido. Easy command
completion.

#+begin_src emacs-lisp :tangle yes
(use-package smex
:config
(global-set-key (kbd "M-x") 'smex)
(global-set-key (kbd "M-X") 'smex-major-mode-commands)
(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command))
#+end_src

*** nLinum Relative

#+begin_src emacs-lisp :tangle yes
(use-package nlinum-relative
:config
(setq nlinum-relative-redisplay-delay 0)
(nlinum-relative-setup-evil)
(add-hook 'prog-mode-hook 'nlinum-relative-mode))
#+end_src

*** Expand Region

[[expandregion][file:http://i.imgur.com/ieX2sDR.jpg]]

[[https://github.com/magnars/expand-region.el][Expand reigon]] allows selection by syntastic region. So if I had an expression like this:
=(setq some-var "a string o|f chars")= with mu cusor where the =|= is. Pressing =C-==
enables the mode and selects the word =of=. Then if I press =+= it would select the
contents in the quotes. Pressing =+= again would then select everything inside the
quotes and the quotes themselves and so on. Pressing =-= at will do the opposite and
shrink the select region.

#+begin_src emacs-lisp :tangle yes
(use-package expand-region
:config
(global-set-key (kbd "C-=") 'er/expand-region))
#+end_src

*** Magit

[[magit][file:http://i.imgur.com/LPCrkE6.jpg]]

[[https://magit.vc/][Magit]] is a fantastic git porcelen inside of emacs. It allows you to do all of the things
you could do from the git command line from within emacs. It has mneumonic keybindings and
displays all the information very nicely.

#+begin_src emacs-lisp :tangle yes
(use-package magit
:config
(global-set-key "\C-x\g" 'magit-status))
#+end_src

*** Ace Jump Mode

[[ace-jump-1][file:http://i.imgur.com/WjvrLff.jpg]][[ace-jump-2][file:https://s15.postimg.org/uh7612v97/acejump2.jpg]]

[[https://github.com/winterTTr/ace-jump-mode][Ace jump mode]] allows for easy movement around the buffer. It allows you to specify a character
or the first word of a character. It then dims the buffer and replaces the specified chars
with a red letter. You can then press one of the letters to jump to the corresponding
character.

#+begin_src emacs-lisp :tangle yes
(use-package ace-jump-mode
:config
(define-key global-map (kbd "C-c C-SPC") 'ace-jump-mode))
#+end_src

*** Spaceline

[[spaceline][file:http://i.imgur.com/uMooKJj.jpg]]

[[https://github.com/TheBB/spaceline][Spaceline]] is a modeline replacement that makes the modeline slightly more appealing to
the eye. It also has built in compatability with a large range of additional packages.

#+begin_src emacs-lisp :tangle yes
(use-package spaceline-config
:ensure spaceline
:pin melpa-stable
:config
(spaceline-emacs-theme))
#+end_src

*** Neotree

[[neotree][file:http://i.imgur.com/Tcw6QpF.jpg]]

[[https://www.emacswiki.org/emacs/NeoTree][Neotree]] is a file tree display which is similar to the ones found in other popular text
editors and IDEs (such as Sublime, Atom, Eclipse or nerdTREE if you use vim). It allows
you to neatly view your file structure at the side of your screen.

#+begin_src emacs-lisp :tangle yes
(use-package neotree
:config
(global-set-key [f8] 'neotree-toggle)
(add-hook 'neotree-mode-hook
(lambda ()
(define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
(define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter)
(define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
(define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter))))
#+end_src

This comes with my colorscheme so I set =ensure= to =nil= so it doesn't go looking on
melpa. The file icons all come from the [[https://github.com/domtronn/all-the-icons.el][all the icons]] fonts (it doesn't actually use all
the icons itself.

#+begin_src emacs-lisp :tangle yes
(use-package doom-neotree
:ensure nil
:config
(setq doom-neotree-enable-file-icons t))
#+end_src

** Company Mode

[[company][file:http://i.imgur.com/VHZzzXI.jpg]]

[[http://company-mode.github.io/][Company]] is an autocompletion framwork that supports user written backends. This means
that the number of languages company (and supporting packages) encompass is very
impressive.

I have set the delay that company waits before completing to 0 and I also have it
configured so that company begins completing after you type a single character. I also
set the completion list to wrap around so you can cycle through all of the completion
candidates. I've bound tab to move to the next completion candidate.

The custom faces inherit the colors from your loaded theme and match the company drop
down. This allows me to change themes without worrying that company will look terrible.

#+begin_src emacs-lisp :tangle yes
(use-package company
:init
(global-company-mode)
:config
(setq company-idle-delay 0)
(setq company-minimum-prefix-length 1)
(setq company-selection-wrap-around t)
(define-key company-active-map [tab] 'company-select-next)

(require 'color)
(let ((bg (face-attribute 'default :background)))
(custom-set-faces
`(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 2)))))
`(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 10)))))
`(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5)))))
`(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
`(company-tooltip-common ((t (:inherit font-lock-constant-face)))))))
#+end_src

*** Company Quickhelp

[[quickhelp][file:http://i.imgur.com/7mvXbqe.jpg]]

[[https://github.com/expez/company-quickhelp][Company quickhelp]] mimics the functionality of autocomplete and displays the documentation
of the currently highlighted completion (after a brief delay). This is quite handy as it
makes it easy to check the arguments or return type of the function.

#+begin_src emacs-lisp :tangle yes
(use-package company-quickhelp
:config
(company-quickhelp-mode 1))
#+end_src

** Backup Options

The default options for filebackups and autosave are terrible and leave files scattered
all across your file system. First I make all backups copy the files which stops any
shinanigans with links. I also set the backup directory. Then I check if =~/.bak.emacs/=
and =~/.bak.emacs/backup/= exit if they don't I create them. Then I set my auto save
location to =~/.bak.emacs/auto/= and set it so that the files are are all saved in auto
with a flat structure rather rather than folder trees.

#+begin_src emacs-lisp :tangle yes
(setq backup-by-copying t)
(setq backup-directory-alist '((".*" . "~/.bak.emacs/backup/")))
(if (eq nil (file-exists-p "~/.bak.emacs/"))
(make-directory "~/.bak.emacs/"))
(if (eq nil (file-exists-p "~/.bak.emacs/auto"))
(make-directory "~/.bak.emacs/auto"))
(setq auto-save-file-name-transforms '((".*" "~/.bak.emacs/auto/" t)))
#+end_src

Here are all of the files that make up my emacs config.

+ 8
- 253
.emacs.d/init.el View File

@@ -1,253 +1,6 @@
;; __ __ _ __ _ _ _ _ _
;; \ \ / /__ | |/ _| ___( )___ (_)_ __ (_) |_ ___| |
;; \ \ /\ / / _ \| | |_ / _ \// __| | | '_ \| | __| / _ \ |
;; \ V V / (_) | | _| __/ \__ \ | | | | | | |_ | __/ |
;; \_/\_/ \___/|_|_| \___| |___/ |_|_| |_|_|\__(_)___|_|

;; Temporarily set garbage collect threshold high to improve start time
(setq gc-cons-threshold most-positive-fixnum)
(add-hook 'after-init-hook (lambda () (setq gc-cons-threshold 800000)))

;; Setup package control
(require 'package)
(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/"))
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
(add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/"))
(setq package-enable-at-startup nil)
(package-initialize)

;; Specifies local directory to load packages from
(let ((default-directory "~/.emacs.d/lisp/"))
(normal-top-level-add-to-load-path '("."))
(normal-top-level-add-subdirs-to-load-path))
(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")

;; Autodownload and enable use-package
(unless (package-installed-p 'use-package)
(package-refresh-contents)
(package-install 'use-package))
(require 'use-package)
(setq use-package-always-ensure t) ; Always ensure package is downloaded

;; Essential settings.
(setq inhibit-splash-screen t
inhibit-startup-message t
inhibit-startup-echo-area-message t)
(tool-bar-mode -1) ; No toolbar
(scroll-bar-mode -1) ; Hide scrollbars
(menu-bar-mode -1) ; Hide menu bar
(show-paren-mode t) ; Highlights matching parenthesis
(electric-pair-mode t) ; Add closing pairs automatically
(setq initial-scratch-message "") ; No scratch text
(setq tab-width 4) ; Default tab width
(fset 'yes-or-no-p 'y-or-n-p) ; y/n instead of yes/no
(setq-default indent-tabs-mode nil)
(setq-default show-trailing-whitespace t) ; Shows all trailing whitespace
(custom-set-faces ;; Sets the color of the trailing-whitespace face
'(trailing-whitespace ((t (:background "disabledControlTextColor")))))
(when (member "Inconsolata" (font-family-list)) ;; Make sure font is installed before changing it
(add-to-list 'default-frame-alist '(font . "Inconsolata-13" ))
(set-face-attribute 'default t :font "Inconsolata-13"))
(use-package sublime-themes
:config
(load-theme 'spolsky t)) ; Color theme

;; Base evil package
(use-package evil
:init
;; Unbind <C-u> for evil mode's use
(setq evil-want-C-u-scroll t)
:config
(evil-mode t)
;; Move up and down through wrapped lines
(define-key evil-normal-state-map (kbd "j") 'evil-next-visual-line)
(define-key evil-normal-state-map (kbd "k") 'evil-previous-visual-line)
(define-key evil-normal-state-map "\M-l" 'swap-next-char)
(define-key evil-normal-state-map "\M-h" 'swap-prev-char)
(setq evil-split-window-below t)
(setq evil-vsplit-window-right t)
(define-key evil-ex-map "e " 'ido-find-file))

;; evil leader key
(use-package evil-leader
:config
(evil-leader/set-leader "<SPC>")
(setq evil-leader/in-all-states 1)
(global-evil-leader-mode)
(evil-leader/set-key
"w" 'save-buffer ; w(rite)
"S" 'eval-buffer ; S(ource)
"s" 'eval-defun ; s(ource)
"b" 'mode-line-other-buffer ; b(ack) b(buffer)
"db" 'kill-buffer ; b(uffer) d(elete)
"m" 'ido-switch-buffer ; m(ini)
"init" (lambda() (interactive) (evil-buffer-new nil "~/.emacs.d/init.el"))))

;; Tpope's surround
(use-package evil-surround
:config
(global-evil-surround-mode 1))

(use-package ido
:init
(defun my-ido-keys ()
"Add keybindings for ido"
(define-key ido-completion-map [tab] 'ido-next-match)
(define-key ido-completion-map (kbd "C-c C-k") 'ido-kill-buffer-at-head))

(add-hook 'ido-setup-hook #'my-ido-keys)
:config
(setq ido-enable-flex-matching t)
(setq ido-everywhere t)
(ido-mode 1))

(use-package smex
:config
(defadvice smex (around space-inserts-hyphen activate compile)
(let ((ido-cannot-complete-command
`(lambda ()
(interactive)
(if (string= " " (this-command-keys))
(insert ?-)
(funcall ,ido-cannot-complete-command)))))
ad-do-it))
(global-set-key (kbd "M-x") 'smex)
(global-set-key (kbd "M-X") 'smex-major-mode-commands)
(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)) ;; This is your old M-x.


(use-package nlinum-relative
:config
(setq nlinum-relative-redisplay-delay 0)
(nlinum-relative-setup-evil)
(add-hook 'prog-mode-hook 'nlinum-relative-mode))

(use-package exec-path-from-shell
:config
(when (memq window-system '(mac ns))
(exec-path-from-shell-initialize)))

;; External configuration for powerline and evil powerline (~/.emacs.d/lisp/init-powerline.el)
(require 'init-powerline)

;; Git porcelen
(use-package magit)

;; Vim bindings for magit
(use-package evil-magit)

;; Web major mode
(use-package web-mode)

;; Autocompletion backend
(use-package company
:init
(global-company-mode)
:config
(setq company-idle-delay 0) ; Delay to complete
(setq company-minimum-prefix-length 1)
(setq company-selection-wrap-around t) ; Loops around suggestions
(define-key company-active-map [tab] 'company-select-next) ; Tab to cycle forward
(define-key company-active-map (kbd "C-n") 'company-select-next) ; Ctrl-N to cycle forward (vim-ish)
(define-key company-active-map (kbd "C-p") 'company-select-previous) ; Ctrl-P to cycle back (vim-ish)

;; Inherits colors from theme to style autocomplete menu correctly
(require 'color)
(let ((bg (face-attribute 'default :background)))
(custom-set-faces
`(company-tooltip ((t (:inherit default :background ,(color-lighten-name bg 2)))))
`(company-scrollbar-bg ((t (:background ,(color-lighten-name bg 10)))))
`(company-scrollbar-fg ((t (:background ,(color-lighten-name bg 5)))))
`(company-tooltip-selection ((t (:inherit font-lock-function-name-face))))
`(company-tooltip-common ((t (:inherit font-lock-constant-face)))))))

;; Uses jedi server and company mode frameword for Python completion
(use-package company-jedi
:config
(defun my/python-mode-hook ()
(add-to-list 'company-backends 'company-jedi))
(add-hook 'python-mode-hook 'my/python-mode-hook))

;; Web company backend
(use-package company-web
:config
(add-to-list 'company-backends 'company-web-html))

;; On the fly syntax checking
(use-package flycheck
:config
(global-flycheck-mode)
(with-eval-after-load 'flycheck
(setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc)))
(setq-default flycheck-emacs-lisp-load-path 'inherit))

;; Markdown formatting and preview
(use-package markdown-mode
:commands (markdown-mode gfm-mode)
:mode (("README\\.md\\'" . gfm-mode)
("\\.md\\'" . markdown-mode)
("\\.markdown\\'" . markdown-mode))
:init (setq markdown-command "multimarkdown")
:config
(setq markdown-live-preview-delete-export 'delete-on-export))

;; Text manipulation
(use-package expand-region
:config
(global-set-key (kbd "C-=") 'er/expand-region))

;;(use-package move-lines
;; :config
;; (define-key evil-normal-state-map "\M-k" 'move-lines-up)
;; (define-key evil-normal-state-map "\M-j" 'move-lines-down))

;; NERDtree replacement
(use-package neotree
:config
(global-set-key [f8] 'neotree-toggle)
(add-hook 'neotree-mode-hook
(lambda ()
(define-key evil-normal-state-local-map (kbd "TAB") 'neotree-enter)
(define-key evil-normal-state-local-map (kbd "SPC") 'neotree-enter)
(define-key evil-normal-state-local-map (kbd "q") 'neotree-hide)
(define-key evil-normal-state-local-map (kbd "RET") 'neotree-enter))))

;; Better looking org headers
(use-package org-bullets
:config
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))

;; Vim bindings for org mode
(use-package evil-org)

(use-package haskell-mode)

;; Backup options
(setq backup-by-copying t) ; Stop shinanigans with links
(setq backup-directory-alist '((".*" . "~/.bak.emacs/backup/")))
(if (eq nil (file-exists-p "~/.bak.emacs/")) ; Creates auto directory if it doesn't already exist
(make-directory "~/.bak.emacs/"))
(if (eq nil (file-exists-p "~/.bak.emacs/auto")) ; Creates auto directory if it doesn't already exist
(make-directory "~/.bak.emacs/auto"))
(setq auto-save-file-name-transforms '((".*" "~/.bak.emacs/auto/" t))) ; backup in one place. flat, no tree structure

;; esc quits
(defun minibuffer-keyboard-quit ()
"Abort recursive edit.
In Delete Selection mode, if the mark is active, just deactivate it;
then it takes a second \\[keyboard-quit] to abort the minibuffer."
(interactive)
(if (and delete-selection-mode transient-mark-mode mark-active)
(setq deactivate-mark t)
(when (get-buffer "*Completions*") (delete-windows-on "*Completions*"))
(abort-recursive-edit)))
(define-key evil-normal-state-map [escape] 'keyboard-quit)
(define-key evil-visual-state-map [escape] 'keyboard-quit)
(define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
(org-babel-load-file "~/.emacs.d/README.org")

(custom-set-variables
;; custom-set-variables was added by Custom.
@@ -256,15 +9,17 @@
;; If there is more than one, they won't work right.
'(custom-safe-themes
(quote
("913b84f0b08939412114f7c5b5a1c581e3ac841615a67d81dda28d2b7c4b7892" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "0c29db826418061b40564e3351194a3d4a125d182c6ee5178c237a7364f0ff12" default)))
'(vc-follow-symlinks t))
("398f0209bfd642cf7a5e3e03bdc20db2822fd6746225a4bd99ccf9b26d3059d0" "9f3181dc1fabe5d58bbbda8c48ef7ece59b01bed606cfb868dd147e8b36af97c" "06dbcfac3705aaaa79e1a3264c6fd44ef0cf86ef5ed67930e4007e63a8c1e8ee" default)))
'(package-selected-packages
(quote
(ox-twbs company neotree spaceline web-mode use-package tablist smex s powerline php+-mode org-bullets magit let-alist ido-ubiquitous ido-complete-space-or-hyphen haskell-mode expand-region doom-themes ace-jump-mode))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(company-scrollbar-bg ((t (:background "#2b333c"))))
'(company-scrollbar-fg ((t (:background "#20262d"))))
'(company-tooltip ((t (:inherit default :background "#1a1f24"))))
'(company-scrollbar-bg ((t (:background "#383d48"))))
'(company-scrollbar-fg ((t (:background "#2d313a"))))
'(company-tooltip ((t (:inherit default :background "#262931"))))
'(company-tooltip-common ((t (:inherit font-lock-constant-face))))
'(company-tooltip-selection ((t (:inherit font-lock-function-name-face)))))

+ 0
- 1
.emacs.d/lisp/move-lines

@@ -1 +0,0 @@
Subproject commit d105278507542f6b367d46a5723fcab454627ed7

+ 2
- 1
.gitignore View File

@@ -1,3 +1,4 @@
.emacs.d/README.el
.emacs.d/auto-save-list/
.emacs.d/elpa/
.emacs.d/eshell/
@@ -8,4 +9,4 @@
.vim/plugged/
.emacs.d/ido.last
.emacs.d/ido.last~
.emacs.d/#init.el#
.emacs.d/#init.el#

+ 0
- 3
.gitmodules View File

@@ -1,6 +1,3 @@
[submodule ".emacs.d/lisp/move-lines"]
path = .emacs.d/lisp/move-lines
url = https://github.com/targzeta/move-lines.git
[submodule ".vim/autoload"]
path = .vim/autoload
url = https://github.com/junegunn/vim-plug.git

Loading…
Cancel
Save