diff options
| -rw-r--r-- | Brewfile | 9 | ||||
| -rw-r--r-- | emacs/init.el | 35 | ||||
| -rw-r--r-- | gitconfig | 2 | ||||
| -rw-r--r-- | global.gitignore | 2 | ||||
| -rwxr-xr-x | install | 2 | ||||
| -rwxr-xr-x | zsh/environment.zsh | 2 |
6 files changed, 16 insertions, 36 deletions
diff --git a/Brewfile b/Brewfile new file mode 100644 index 0000000..ae3e09d --- /dev/null +++ b/Brewfile @@ -0,0 +1,9 @@ +install direnv +install emacs --cocoa --srgb --with-gnutls +install fasd +install git +install htop +install hub +install mobile-shell +install ssh-copy-id +install zsh \ No newline at end of file diff --git a/emacs/init.el b/emacs/init.el index 6b1f80f..0ac222b 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -115,7 +115,6 @@ Values: `desktop', `server', `laptop'") jit-lock-defer-time 0.01) (use-package solarized-theme - :ensure t :config (load-theme 'solarized-light t)) (when (or (display-graphic-p) @@ -312,14 +311,12 @@ Values: `desktop', `server', `laptop'") completion-ignore-case t) (use-package smart-tab - :ensure t :init (global-smart-tab-mode) :config (progn (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function))) (diminish 'smart-tab-mode ""))) (use-package company - :ensure t :commands (company-mode) :bind (("C-<tab>" . company-complete)) :init (progn @@ -358,7 +355,6 @@ Values: `desktop', `server', `laptop'") (put 'dired-find-alternate-file 'disabled nil))) (use-package dired+ - :ensure t :config (progn (diredp-toggle-find-file-reuse-dir 1) (dired-omit-mode 1) @@ -463,7 +459,6 @@ Values: `desktop', `server', `laptop'") tab-always-indent 'complete) (use-package auto-indent-mode - :ensure t :commands (auto-indent-minor-mode auto-indent-mode) :config (progn @@ -480,7 +475,6 @@ Values: `desktop', `server', `laptop'") (add-hook 'lisp-common-mode-hook #'lisp-auto-indent-mode))) (use-package smart-tabs-mode - :ensure t :commands (smart-tabs-mode smart-tabs-mode-enable smart-tabs-advice) @@ -548,7 +542,6 @@ Values: `desktop', `server', `laptop'") :bind (("M-`" . lacarte-execute-menu-command))) (use-package helm-config - :ensure helm :bind (("C-x i" . helm-imenu)) :config (setq helm-idle-delay .1 helm-input-idle-delay .1)) @@ -570,16 +563,13 @@ Values: `desktop', `server', `laptop'") (bind-key "C-c C-s" #'ido-manual-merge ido-file-dir-completion-map))) (use-package ido-vertical-mode - :ensure t :config (ido-vertical-mode 1)) (use-package flx-ido - :ensure t :init (progn (flx-ido-mode 1))) (use-package smex - :ensure t :bind (("M-x" . smex) ("<apps>" . smex) ("<menu>" . smex) @@ -615,16 +605,13 @@ Values: `desktop', `server', `laptop'") ("\\.Xresources\\'" . xrdb-mode))) (use-package haskell-mode - :ensure t :mode (("\\.hs\\'" . haskell-mode) ("xmobarrc\\'" . haskell-mode))) (use-package nginx-mode - :ensure t :mode (("nginx.conf" . nginx-mode))) (use-package lua-mode - :ensure t :mode (("\\.lua\\'" . lua-mode))) (use-package puppet-mode @@ -645,7 +632,6 @@ Values: `desktop', `server', `laptop'") ;;;; Planning (use-package org - :ensure org-plus-contrib :bind (("C-c C-a" . org-agenda-list) ("C-c a" . org-agenda) ("C-c l" . org-store-link) @@ -701,7 +687,6 @@ Values: `desktop', `server', `laptop'") (org-todo "STARTED"))))))) (use-package org-journal - :ensure t :config (progn (setq org-journal-date-format "%A, %d %B %Y"))) @@ -719,13 +704,11 @@ Values: `desktop', `server', `laptop'") ;;;; Projects (use-package projectile - :ensure t :bind (("C-c C-f" . projectile-find-file) ("s-x s-f" . projectile-find-file)) :commands (projectile-global-mode)) (use-package project-persist - :ensure t :commands (project-persist-mode) :bind (("C-c P d" . project-persist-delete) ("C-c P f" . project-persist-find) @@ -796,7 +779,6 @@ Also returns nil if pid is nil." (setq vc-follow-symlinks t))) (use-package diff-hl - :ensure t :init (progn (global-diff-hl-mode) (add-hook 'magit-refresh-file-buffer-hook #'diff-hl-update))) @@ -856,7 +838,6 @@ Also returns nil if pid is nil." (kbd "C-d") 'comint-delchar-or-eof-or-kill-buffer)) (use-package multi-term - :ensure t :if (not (eq system-type 'windows-nt)) :bind ("C-`" . multi-term-dedicated-toggle)) @@ -901,7 +882,6 @@ Also returns nil if pid is nil." (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING))) (use-package ace-jump-mode - :ensure t :bind (("C-c SPC" . ace-jump-mode)) :config (progn (ace-jump-mode-enable-mark-sync) @@ -909,7 +889,6 @@ Also returns nil if pid is nil." ace-jump-mode-scope 'window))) (use-package autopair - :ensure t :commands (autopair-mode autopair-on) :init (progn @@ -921,14 +900,12 @@ Also returns nil if pid is nil." autopair-skip-whitespace nil))) (use-package expand-region - :ensure t :bind ("C-M-SPC" . er/expand-region)) (use-package goto-chg :bind ("C-x SPC" . goto-last-change)) (use-package multiple-cursors - :ensure t :config (progn (bind-key "C-." #'mc/mark-next-like-this) (bind-key "C-," #'mc/mark-previous-like-this) @@ -941,7 +918,6 @@ Also returns nil if pid is nil." (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))) (use-package paredit - :ensure t :commands (paredit-mode) :init (progn (add-hook 'lisp-common-mode-hook #'enable-paredit-mode) @@ -964,7 +940,6 @@ Also returns nil if pid is nil." ("C-M-n" . smart-forward))) (use-package undo-tree - :ensure t :config (progn (global-undo-tree-mode) ;; Keep region when undoing in region @@ -1010,7 +985,6 @@ Also returns nil if pid is nil." :config (use-package quack)) (use-package redshank - :ensure t :init (progn (add-hook 'lisp-common-mode-hook #'turn-on-redshank-mode))) @@ -1064,7 +1038,6 @@ Also returns nil if pid is nil." ;;;; Programming (use-package auto-compile - :ensure t :init (add-hook 'emacs-lisp-mode-hook #'auto-compile-on-save-mode)) (use-package cc-mode @@ -1077,20 +1050,17 @@ Also returns nil if pid is nil." c-basic-offset 4) (c-set-offset 'case-label '+))) -(use-package quickrun - :ensure t) +(use-package quickrun) ;;;; Web Development (use-package skewer-mode - :ensure t :init (progn (add-hook 'js2-mode-hook #'skewer-mode) (add-hook 'html-mode-hook #'skewer-html-mode) (add-hook 'css-mode-hook #'skewer-css-mode))) (use-package js2-mode - :ensure t :mode ("\\.js\\'" . js2-mode) :config (progn (defun ap/javascript-setup () @@ -1101,13 +1071,11 @@ Also returns nil if pid is nil." js2-global-externs '("$")))) (use-package mustache-mode - :ensure t :mode (("\\.mustache" . mustache-mode) ("\\.mt\\'" . mustache-mode) ("\\.template\\'" . mustache-mode))) (use-package jinja2-mode - :ensure t :mode (("\\.j2\\'" . jinja2-mode))) (use-package php-mode @@ -1128,7 +1096,6 @@ Also returns nil if pid is nil." :config (setq sgml-basic-offset 4)) (use-package emmet-mode - :ensure t :config (progn (if (functionp 'web-mode) (add-hook 'web-mode-hook #'emmet-mode)))) diff --git a/gitconfig b/gitconfig index 38dc9a3..0915a23 100644 --- a/gitconfig +++ b/gitconfig @@ -7,7 +7,7 @@ status = auto ui = true [push] - default = tracking + default = current [alias] st = status -sb ci = commit diff --git a/global.gitignore b/global.gitignore index 78d8d16..7e23dca 100644 --- a/global.gitignore +++ b/global.gitignore @@ -18,6 +18,8 @@ auto-save-list tramp .\#* +.envrc + # Org-mode .org-id-locations *_archive diff --git a/install b/install index a433631..32a4f26 100755 --- a/install +++ b/install @@ -21,7 +21,7 @@ then fi install-dot () { - if [[ ! -d $1 ]] + if [[ "$1" != . && ! -d $1 ]] then mkdir $1 fi diff --git a/zsh/environment.zsh b/zsh/environment.zsh index 65000fb..02cdb17 100755 --- a/zsh/environment.zsh +++ b/zsh/environment.zsh @@ -46,3 +46,5 @@ case $OSTYPE in esac export os + +eval "$(direnv hook zsh)" |