From 3915c019287290cb686e47bc562a60906b6bdf51 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 21:53:06 -0500 Subject: [PATCH 1/7] Update tmux configuration for 2.2 --- tmux.org | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tmux.org b/tmux.org index 43edb19..d71ecb2 100644 --- a/tmux.org +++ b/tmux.org @@ -8,8 +8,7 @@ Tmux configuration. Pretty boring in most ways. #+BEGIN_SRC conf :tangle (tangle/file tmux-p ".tmux.conf") - # Setup utf8 by default and vi mode - set-window-option -g utf8 on + # Setup vi mode by default set-window-option -g mode-keys vi set-window-option -g aggressive-resize on @@ -30,7 +29,6 @@ Tmux configuration. Pretty boring in most ways. set-option -g status-right-length 13 set-option -g status-right "%a %H:%M:%S" set-option -g status-interval 7 - set-option -g status-utf8 on # Pane border options, mimics the status line coloring set-option -g pane-border-bg colour15 From d42b3e8519f613b0a26c2797d7d8d4b4a9104e30 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 21:53:18 -0500 Subject: [PATCH 2/7] Update nix packages that work on osx --- nix.org | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nix.org b/nix.org index 9d06bd7..6b7f7a5 100644 --- a/nix.org +++ b/nix.org @@ -46,6 +46,8 @@ Nix user config.nix setup. curl clang clang-analyzer + cscope + ctags diffutils patchutils gitAndTools.gitFull @@ -69,7 +71,7 @@ Nix user config.nix setup. gdbm mosh htop -# imagemagick also busted on osx now + imagemagick keychain silver-searcher aspell @@ -94,22 +96,21 @@ Nix user config.nix setup. multimarkdown jq # rtags broken again on osx, fix it -# p7zip broken again on osx, god nix is terribad at keeping things working + p7zip unrar watch nox mutt duply - zsh pylint +# xhyve compiles normally, figure out hypervisor framework issue + lastpass-cli python27Packages.howdoi python27Packages.youtube-dl python27Packages.pyflakes python27Packages.flake8 python27Packages.virtualenv python27Packages.pip -# xhyve compiles normally, figure out hypervisor framework issue - lastpass-cli haskellPackages.alex haskellPackages.happy haskellPackages.bake From d059fc0f161c790c85ad38688654f33973c0b389 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 21:53:33 -0500 Subject: [PATCH 3/7] Add a git alias aliases to print git aliases meta... --- git.org | 1 + 1 file changed, 1 insertion(+) diff --git a/git.org b/git.org index a859ef0..367caf6 100644 --- a/git.org +++ b/git.org @@ -72,6 +72,7 @@ General git configuration split out into sections mostly. churn = !git log --all -M -C --name-only --format='format:' "$@" | sort | grep -v '^$' | uniq -c | sort | awk 'BEGIN {print "count,file"} {print $1 "," $2}' # help the gc a bit and get a bit more space back for a local clone trim = !git reflog expire --expire=now --all && git gc --prune=now + aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort #+END_SRC ** github #+BEGIN_SRC conf :tangle (when (eq git-p t) "tmp/.gitconfig") From 08c8113e4f2a3e9e5457820f58de5c8e650efcbf Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 23:18:14 -0500 Subject: [PATCH 4/7] Switch from helm to ivy/swiper --- emacs.org | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/emacs.org b/emacs.org index f2cb116..fe6330a 100644 --- a/emacs.org +++ b/emacs.org @@ -516,33 +516,37 @@ Turns out that someone wrote this exact thing already. Yay get to drop my own cr (use-package expand-region :ensure t :bind ("C-]" . er/expand-region)) #+END_SRC -*** helm +*** ivy/swiper -By Helms Deep use Helm to do ALL THE THINGS. IDO is ass in comparison. +Switching to ivy mode+swiper #+BEGIN_SRC emacs-lisp - (use-package helm + (use-package counsel :ensure t - :diminish helm-mode - :bind (("M-x" . helm-M-x) - ("M-y" . helm-show-kill-ring) - ("C-x b" . helm-mini) - ("C-x C-b" . helm-buffers-list) - ("C-x C-f" . helm-find-files) - ("C-x C-r" . helm-recentf) - ("C-x c o" . helm-occur)) - :init (progn - (require 'helm-config) - (helm-mode 1) - (use-package helm-descbinds - :ensure t - :bind (("C-h b" . helm-descbinds) - ("C-h w" . helm-descbinds)) - ) - (use-package helm-ag :ensure t) - (use-package helm-projectile :ensure t) - ) - ) + :bind (("C-x C-f" . counsel-find-file) + ("C-c g" . counsel-git) + ("C-c j" . counsel-git-grep) + ("C-c k" . counsel-ag) + ("C-x l" . counsel-locate) + ("C-S-o" . counsel-rhythmbox) + ("C-c C-r" . ivy-resume)) + :config (custom-set-variables '(counsel-find-file-at-point t))) + (use-package swiper + :ensure t + :diminish ivy-mode + :bind (("C-s" . swiper) + ("M-x" . counsel-M-x)) + :config (progn + (custom-set-variables + '(projectile-completion-system 'ivy) + '(magit-completing-read-function 'ivy-completing-read) + '(ivy-use-virtual-buffers t) + '(ivy-height 10) + '(ivy-count-format "(%d/%d) ") + ) + (ivy-mode 1) + ) + ) #+END_SRC *** magit From f3380a97e4816c6bcdfccbc290aff1652c28dd4a Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 23:18:43 -0500 Subject: [PATCH 5/7] These helm things are not needed now. --- emacs.org | 9 --------- 1 file changed, 9 deletions(-) diff --git a/emacs.org b/emacs.org index fe6330a..2cdc426 100644 --- a/emacs.org +++ b/emacs.org @@ -789,9 +789,6 @@ Highlight TODO/FIXME type messages in comments. (use-package projectile :ensure t :init (projectile-global-mode) - :config - (progn (require 'helm-projectile) - (helm-projectile-on)) ) #+END_SRC @@ -857,12 +854,6 @@ So I write gooder. Me fail English? Thats unpossible. (use-package writegood-mode :ensure t) #+END_SRC -*** helm-gtags - -#+BEGIN_SRC emacs-lisp - (use-package helm-gtags :ensure t) -#+END_SRC - *** python-mode Compress down python configuration a bit. From cac64ff9ae6bb71e96a0ea41c10fdd12a486849a Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 23:19:02 -0500 Subject: [PATCH 6/7] Update org mode configuration to be pretty --- emacs.org | 104 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/emacs.org b/emacs.org index 2cdc426..ed4773b 100644 --- a/emacs.org +++ b/emacs.org @@ -612,54 +612,70 @@ Highlight matching ()'s []'s etc... *** org-mode -- foo -- bar - Org-mode keybindings and settings, pretty sparse really. #+BEGIN_SRC emacs-lisp (use-package org - :ensure org-plus-contrib - :bind (("C-c a" . org-agenda) - ("C-c b" . org-iswitchb) - ("C-c c" . org-capture) - ("C-c l" . org-store-link) - ("C-c p" . org-latex-export-to-pdf)) - :init (use-package org-bullets - :config - (progn - (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))) - :config - (progn - (custom-set-variables - '(org-log-done t) - '(org-hide-leading-stars t) - '(org-hide-emphasis-markers t) - ) - (font-lock-add-keywords 'org-mode - '(("^ +\\([-*]\\) " - (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))))) - (let* ((variable-tuple (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro")) - ((x-list-fonts "Lucida Grande") '(:font "Lucida Grande")) - ((x-list-fonts "Verdana") '(:font "Verdana")) - ((x-family-fonts "Sans Serif") '(:family "Sans Serif")) - (nil (warn "Cannot find a Sans Serif Font. Install Source Sans Pro.")))) - (base-font-color (face-foreground 'default nil 'default)) - (headline `(:inherit default :weight bold :foreground ,base-font-color))) - - (custom-theme-set-faces 'user - `(org-level-8 ((t (,@headline ,@variable-tuple)))) - `(org-level-7 ((t (,@headline ,@variable-tuple)))) - `(org-level-6 ((t (,@headline ,@variable-tuple)))) - `(org-level-5 ((t (,@headline ,@variable-tuple)))) - `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1)))) - `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25)))) - `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5)))) - `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75)))) - `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil)))))) - (org-reload) - ) - ) + :ensure org-plus-contrib + :bind (("C-c a" . org-agenda) + ("C-c b" . org-iswitchb) + ("C-c c" . org-capture) + ("C-c l" . org-store-link) + ("C-c p" . org-latex-export-to-pdf)) + :config + (progn + (custom-set-variables + '(org-log-done t) + '(org-hide-leading-stars t) + '(org-hide-emphasis-markers t) + '(org-confirm-babel-evaluate nil) + ) + (org-babel-do-load-languages + 'org-babel-load-languages + '( + (emacs-lisp . t) + (sh . t) + (haskell . t) + (ditaa . t) + (perl . t) + (python . t) + (C . t) + ) + ) + (add-hook 'after-init-hook (lambda () (org-reload))) + ) + ) + (use-package org-bullets + :ensure t + :init + (custom-set-variables '(org-bullets-bullet-list '("・" "◦" "•" "◉"))) + :config + (progn + (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) + (let* ((variable-tuple (cond ((x-list-fonts "Source Sans Pro") '(:font "Source Sans Pro")) + ((x-list-fonts "Lucida Grande") '(:font "Lucida Grande")) + ((x-list-fonts "Verdana") '(:font "Verdana")) + ((x-family-fonts "Sans Serif") '(:family "Sans Serif")) + (nil (warn "Cannot find a Sans Serif Font.")))) + (base-font-color (face-foreground 'default nil 'default)) + (headline `(:inherit default :weight bold :foreground ,base-font-color))) + (custom-theme-set-faces 'user + `(org-level-8 ((t (,@headline ,@variable-tuple)))) + `(org-level-7 ((t (,@headline ,@variable-tuple)))) + `(org-level-6 ((t (,@headline ,@variable-tuple)))) + `(org-level-5 ((t (,@headline ,@variable-tuple)))) + `(org-level-4 ((t (,@headline ,@variable-tuple :height 1.1)))) + `(org-level-3 ((t (,@headline ,@variable-tuple :height 1.25)))) + `(org-level-2 ((t (,@headline ,@variable-tuple :height 1.5)))) + `(org-level-1 ((t (,@headline ,@variable-tuple :height 1.75)))) + `(org-document-title ((t (,@headline ,@variable-tuple :height 1.5 :underline nil)))))) + (font-lock-add-keywords 'org-mode + '(("^ +\\([-*]\\) " + (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))))) + ) + ) + + #+END_SRC *** flycheck From 6e83da4b8d3c48fc6a782efd4c614df946608ac2 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Sun, 1 May 2016 23:19:13 -0500 Subject: [PATCH 7/7] Space ocd. --- emacs.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.org b/emacs.org index ed4773b..6cf89ca 100644 --- a/emacs.org +++ b/emacs.org @@ -506,7 +506,7 @@ Turns out that someone wrote this exact thing already. Yay get to drop my own cr '(global-semantic-stickyfunc-mode f) ) ) - :init(semantic-mode t) + :init (semantic-mode t) ) #+END_SRC