From da8074a012a989cf6f13e462c1b9de3f427b954e Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Mon, 24 Oct 2016 15:24:39 -0700 Subject: [PATCH] update gopath, emacs --- .compton.conf | 2 -- .emacs.d/init.el | 2 +- .i3/config | 2 +- .muttrc | 48 ++++++++++++++++++++++++++++++++++++++++-------- .spacemacs | 40 +++++++++++++++++++++++++++++++++++++++- .xinitrc | 9 +++++++++ bin/mkgoenv | 5 +++-- 7 files changed, 93 insertions(+), 15 deletions(-) diff --git a/.compton.conf b/.compton.conf index 1cfe30c..d96022a 100644 --- a/.compton.conf +++ b/.compton.conf @@ -63,8 +63,6 @@ refresh-rate = 0; vsync = "none"; dbe = false; paint-on-overlay = true; -# sw-opti = true; -# unredir-if-possible = true; # unredir-if-possible-delay = 5000; # unredir-if-possible-exclude = [ ]; focus-exclude = [ "class_g = 'Cairo-clock'" ]; diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 780e7e3..47e66f2 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -14,7 +14,7 @@ (setq gc-cons-threshold 100000000) -(defconst spacemacs-version "0.105.21" "Spacemacs version.") +(defconst spacemacs-version "0.105.22" "Spacemacs version.") (defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.") (if (not (version<= spacemacs-emacs-min-version emacs-version)) diff --git a/.i3/config b/.i3/config index d5c831e..83d8d54 100644 --- a/.i3/config +++ b/.i3/config @@ -108,7 +108,7 @@ bindsym $mod+space focus mode_toggle bindsym $mod+a focus parent # focus the child container -#bindsym $mod+d focus child +bindsym $mod+z focus child # switch to workspace bindsym $mod+1 workspace 1 diff --git a/.muttrc b/.muttrc index 2b00349..72afb94 100644 --- a/.muttrc +++ b/.muttrc @@ -1,21 +1,37 @@ set alias_file=~/.mutt_alias #set folder=~/Maildir/ #set spoolfile="~/Maildir" -set folder=imaps://mail.barakmich.com/ -set spoolfile=imaps://mail.barakmich.com/INBOX +#set folder=imaps://mail.barakmich.com/ +#set spoolfile=imaps://mail.barakmich.com/INBOX +set mbox_type=Maildir +set folder=~/.mail/barak +set spoolfile=+INBOX set move=no set mark_old=no set pager_stop=yes set postponed=+postponed set signature=~/.sig -set mbox_type=Maildir -set mbox="~/Maildir" -set record="+.Sent" -set postponed="+.Drafts" -set imap_user="barak" -mailboxes `echo -n "+ "; find ~/Maildir -maxdepth 1 -type d -name ".*" -printf "+'%f' "` +#set mbox="~/Maildir" +set record="+Sent" +set postponed="+Drafts" +#set imap_user="barak" +mailboxes `echo -n "+ "; find ~/.mail/barak -mindepth 1 -maxdepth 1 -type d -printf "+'%f' "` set sort=reverse-date-received + +# Better defaults +set wait_key=no +#set timeout=3 +set mail_check=0 +set markers=no +unset move +set delete +unset confirmappend +set quit +unset mark_old +set beep_new + + #set spoolfile=+michener.com # colors color normal white default @@ -61,3 +77,19 @@ macro compose A "?" "attach message(s) to this macro index J "" "next unread" macro index,pager "\Cf" "" "page down" macro index,pager "\Cb" "" "page down" + +bind index gg first-entry +bind index G last-entry + +# Neomutt +#set sidebar_delim = " │" +set sidebar_visible = no +set sidebar_width = 30 +macro index,pager "" "previous folder in sidebar" +macro index,pager "" "next folder in sidebar" +macro index,pager "" "open folder in sidebar" +macro index gb 'toggle sidebar_visible' +macro pager gb 'toggle sidebar_visible' +#color sidebar_new color221 color233 +set status_chars = " *%A" +set status_format = "───────────────────[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───" diff --git a/.spacemacs b/.spacemacs index a0d757b..de11a70 100644 --- a/.spacemacs +++ b/.spacemacs @@ -26,9 +26,11 @@ values." auto-completion-enable-snippets-in-popup t) ;; better-defaults emacs-lisp + mu4e git go themes-megapack + latex markdown (org :variables org-enable-github-support t) @@ -226,6 +228,7 @@ user code." "Configuration function for user code. This function is called at the very end of Spacemacs initialization after layers configuration. You are free to put any user code." + (fset 'xterm-color-unfontify-region 'font-lock-default-unfontify-region) (setq dotspacemacs-additional-packages '(barak-theme)) (defun kill-buffer-and-its-windows (buffer) "Kill BUFFER and delete its windows. Default is `current-buffer'. @@ -324,6 +327,34 @@ BUFFER may be either a buffer or its name (a string)." (lambda() (add-hook 'after-save-hook 'cleanup-org-tables nil 'make-it-local))) + (setq mu4e-maildir "~/.mail/barak" + mu4e-trash-folder "/Trash" + mu4e-refile-folder "/Archive" + mu4e-sent-folder "/Sent" + mu4e-drafts-folder "/Drafts" + mu4e-get-mail-command "mbsync -a" + mu4e-update-interval nil + mu4e-compose-signature-auto-include nil + mu4e-view-show-images nil + mu4e-confirm-quit nil + mu4e-view-show-addresses t) + + (setq mu4e-maildir-shortcuts + '(("/INBOX" . ?i))) + + (setq mu4e-bookmarks + `(("flag:unread AND NOT flag:trashed" "Unread messages" ?u) + ;("date:today..now" "Today's messages" ?t) + ("date:today..now AND NOT flag:trashed AND NOT maildir:/Haskell" "Today's messages" ?t) + ("date:7d..now" "Last 7 days" ?w) + ("mime:image/*" "Messages with images" ?p) + (,(mapconcat 'identity + (mapcar + (lambda (maildir) + (concat "maildir:" (car maildir))) + mu4e-maildir-shortcuts) " OR ") + "All inboxes" ?i))) + ) ;; ;; Do not write anything past this comment. This is where Emacs will @@ -375,9 +406,16 @@ BUFFER may be either a buffer or its name (a string)." ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(org-support-shift-select (quote always)) + '(package-selected-packages + (quote + (company-auctex auctex-latexmk auctex zonokai-theme zenburn-theme zen-and-art-theme yaml-mode xterm-color ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe use-package underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme systemd sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle shell-pop seti-theme reverse-theme restart-emacs railscasts-theme quelpa pyvenv pytest pyenv-mode py-yapf purple-haze-theme protobuf-mode professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pastels-on-dark-theme paradox page-break-lines orgit organic-green-theme org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc majapahit-theme magit-gitflow macrostep lush-theme lorem-ipsum linum-relative light-soap-theme leuven-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio go-eldoc gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-gutter-fringe git-gutter-fringe+ gh-md gandalf-theme flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator farmhouse-theme fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help elisp-slime-nav dracula-theme django-theme diff-hl define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-statistics company-quickhelp company-go company-anaconda colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme bracketed-paste birds-of-paradise-plus-theme badwolf-theme auto-yasnippet auto-highlight-symbol auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell))) + '(paradox-github-token t) '(safe-local-variable-values (quote - ((eval setenv "GOPATH" "/home/barak/src/torus") + ((eval setenv "GOPATH" "/home/barak/src/roba") + (eval setenv "GOPATH" "/home/barak/src/bb4") + (eval setenv "GOPATH" "/home/barak/src/bbot") + (eval setenv "GOPATH" "/home/barak/src/torus") (eval setenv "GOPATH" "/home/barak/src/cayley") (eval setenv "GOPATH" "/home/barak/src/livemd") (eval setenv "GOPATH" "/home/barak/src/agro"))))) diff --git a/.xinitrc b/.xinitrc index a21d7f9..eb85b2c 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,6 +1,15 @@ #!/bin/bash export PATH=$HOME/bin:$PATH +systemctl --user import-environment DISPLAY XAUTHORITY + +if which dbus-update-activation-environment >/dev/null 2>&1; then + dbus-update-activation-environment DISPLAY XAUTHORITY +fi + +eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh) +export SSH_AUTH_SOCK + xfsettingsd & xrdb -merge .Xdefaults & diff --git a/bin/mkgoenv b/bin/mkgoenv index c6db49b..49fac1c 100755 --- a/bin/mkgoenv +++ b/bin/mkgoenv @@ -21,8 +21,9 @@ gocode set lib-path \$SCRIPTPATH cd src/$1 EOF -cat < $2/.dir-locals.el. -((nil . ((eval . (setenv "GOPATH" "\`pwd\`"))))) +export ppwd=`readlink -f $2` +cat < $2/.dir-locals.el +((nil . ((eval . (setenv "GOPATH" "$ppwd"))))) EOF git clone https://$1 $2/src/$1