From f945d4cb62c4b726f4ef7fe6547cfc2719e82fd1 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 2 Jul 2015 22:29:00 -0400 Subject: [PATCH 01/16] use mbsync for syncing mail instead of offlineimap --- isync/.mbsyncrc | 44 +++++++++++++++++++++ spacemacs/.emacs.d/private/mu4e/packages.el | 14 ++++--- 2 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 isync/.mbsyncrc diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc new file mode 100644 index 0000000..9d0cdec --- /dev/null +++ b/isync/.mbsyncrc @@ -0,0 +1,44 @@ +# Global defaults +CopyArrivalDate yes + +###### +IMAPAccount aminb +Host mail.aminb.org +User REDACTED +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.passwd/aminb.gpg" +SSLType IMAPS + +IMAPStore aminb-remote +Account aminb + +MaildirStore aminb-local +Path ~/.mail/aminb/ +Inbox ~/.mail/aminb/Inbox + +Channel aminb +Master :aminb-remote: +Slave :aminb-local: +Patterns * !dovecot* +Create Slave +SyncState * + +###### +IMAPAccount gmail +Host imap.gmail.com +User REDACTED +PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.passwd/gmail.gpg" +SSLType IMAPS + +IMAPStore gmail-remote +Account gmail + +MaildirStore gmail-local +Path ~/.mail/gmail/ +Inbox ~/.mail/gmail/Inbox + +Channel gmail +Master :gmail-remote: +Slave :gmail-local: +Patterns * ![Gmail]* "[Gmail]/Sent Mail" +Create Slave +SyncState * diff --git a/spacemacs/.emacs.d/private/mu4e/packages.el b/spacemacs/.emacs.d/private/mu4e/packages.el index 7231d7c..c01640e 100644 --- a/spacemacs/.emacs.d/private/mu4e/packages.el +++ b/spacemacs/.emacs.d/private/mu4e/packages.el @@ -38,8 +38,12 @@ which require an initialization must be listed explicitly in the list.") (require 'mu4e) (require 'smtpmail) + +;; path to our Maildir directory +(setq mu4e-maildir "/home/amin/.mail") + (setq - mu4e-get-mail-command "offlineimap" ;; or fetchmail, or ... + mu4e-get-mail-command "mbsync -aq" ;; or fetchmail, or ... mu4e-update-interval 300 ;; update every 5 minutes mu4e-sent-folder "/aminb/Sent" mu4e-drafts-folder "/aminb/Drafts" @@ -68,11 +72,11 @@ which require an initialization must be listed explicitly in the list.") (smtpmail-smtp-server "mail.aminb.org") (smtpmail-stream-type ssl) (smtpmail-smtp-service 465)) - ("Gmail" - (mu4e-sent-folder "/Gmail/[Gmail].Sent Mail") - (mu4e-drafts-folder "/Gmail/[Gmail].Drafts") - (mu4e-trash-folder "/Gmail/[Gmail].Trash") (user-mail-address (get-passwd-file "gmail-mail")) + ("gmail" + (mu4e-sent-folder "/gmail/[Gmail].Sent Mail") + (mu4e-drafts-folder "/gmail/Drafts") + (mu4e-trash-folder "/gmail/Trash") (user-full-name "Amin Bandali") (smtpmail-default-smtp-server "smtp.gmail.com") (smtpmail-local-domain "gmail.com") -- 2.20.1 From 532dea9c3fb756ce6bf6d10f469fdf010341b6f0 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 2 Jul 2015 22:30:53 -0400 Subject: [PATCH 02/16] [bspwm] automatically move chromium to desktop 3 --- bspwm/.config/bspwm/bspwmrc | 1 + 1 file changed, 1 insertion(+) diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 3ea3ad9..b3c295d 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -17,6 +17,7 @@ bspc config focused_border_color '#093748' bspc rule -a Firefox desktop=^1 focus=on bspc rule -a emacs desktop=^2 focus=on +bspc rule -a Chromium desktop=^3 focus=on bspc rule -a zathura desktop=^5 focus=on bspc rule -a xfce4-appfinder floating=on -- 2.20.1 From 5fc3f610feca52035bbf4d13625f846c14ab40b4 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 3 Jul 2015 23:28:13 -0400 Subject: [PATCH 03/16] [spacemacs] remove the "advice" for git verbose new version of magit opens up another buffer that does this also, use smtpmail-send-it for send-mail-function --- spacemacs/.spacemacs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 0db4318..81e1837 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -192,9 +192,6 @@ layers configuration." (mode-io-correlate "%n:1:%t ") "%o")))) - (advice-add #'magit-key-mode-popup-committing :after - (lambda () - (magit-key-mode-toggle-option (quote committing) "--verbose"))) ;; Suppress ad-handle-definition warnings ;; (annoying "`tramp-read-passwd' got redefined" warning on startup) @@ -260,7 +257,8 @@ layers configuration." (company-auctex auctex company-c-headers cmake-mode clang-format toc-org smeargle shell-pop org-repo-todo org-present org-pomodoro org-bullets multi-term mmm-mode markdown-toc magit-svn magit-gitflow htmlize helm-gitignore helm-flyspell helm-c-yasnippet gitconfig-mode gitattributes-mode git-timemachine git-messenger flycheck-pos-tip evil-org company-statistics company-quickhelp auto-yasnippet ac-ispell auto-complete company flycheck yasnippet request gitignore-mode magit git-rebase-mode git-commit-mode markdown-mode alert log4e gntp zenburn-theme monokai-theme macrostep elisp-slime-nav diff-hl window-numbering volatile-highlights vi-tilde-fringe use-package smooth-scrolling rfringe rainbow-delimiters powerline popup pcre2el paradox page-break-lines open-junk-file neotree move-text linum-relative leuven-theme info+ indent-guide ido-vertical-mode hungry-delete hl-anything highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-descbinds helm-ag guide-key-tip google-translate golden-ratio gh-md fringe-helper flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-terminal-cursor-changer evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-matchit evil-lisp-state evil-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu clean-aindent-mode buffer-move auto-highlight-symbol auto-dictionary aggressive-indent adaptive-wrap ace-window ace-link ace-jump-mode))) '(pos-tip-background-color "#073642") '(pos-tip-foreground-color "#93a1a1") - '(ring-bell-function (quote ignore)) + '(ring-bell-function (quote ignore) t) + '(send-mail-function (quote smtpmail-send-it)) '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2)) '(term-default-bg-color "#002b36") '(term-default-fg-color "#839496") -- 2.20.1 From 21fe6b4772a490d1250588d3515f241e1e9019fa Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Fri, 3 Jul 2015 23:32:44 -0400 Subject: [PATCH 04/16] [spacemacs] use ZNC.el for irc (wraps around erc) kudos to Vincent Bernat for ssl-connector that reads creds from authinfo --- .gitmodules | 3 + spacemacs/.emacs.d/private/ZNC.el | 1 + spacemacs/.emacs.d/private/irc/extensions.el | 82 ++++++++++++++++++++ spacemacs/.emacs.d/private/irc/packages.el | 31 ++++++++ spacemacs/.spacemacs | 1 + 5 files changed, 118 insertions(+) create mode 160000 spacemacs/.emacs.d/private/ZNC.el create mode 100644 spacemacs/.emacs.d/private/irc/extensions.el create mode 100644 spacemacs/.emacs.d/private/irc/packages.el diff --git a/.gitmodules b/.gitmodules index 6baf177..17bfaab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "pentadactyl/.pentadactyl/colors/pentadactyl-solarized"] path = pentadactyl/.pentadactyl/colors/pentadactyl-solarized url = https://github.com/claytron/pentadactyl-solarized +[submodule "spacemacs/.emacs.d/private/ZNC.el"] + path = spacemacs/.emacs.d/private/ZNC.el + url = https://github.com/sshirokov/ZNC.el diff --git a/spacemacs/.emacs.d/private/ZNC.el b/spacemacs/.emacs.d/private/ZNC.el new file mode 160000 index 0000000..94c8e4c --- /dev/null +++ b/spacemacs/.emacs.d/private/ZNC.el @@ -0,0 +1 @@ +Subproject commit 94c8e4cdcfb51b75d5f95cb51ce21c6274325e19 diff --git a/spacemacs/.emacs.d/private/irc/extensions.el b/spacemacs/.emacs.d/private/irc/extensions.el new file mode 100644 index 0000000..47b48b1 --- /dev/null +++ b/spacemacs/.emacs.d/private/irc/extensions.el @@ -0,0 +1,82 @@ +;;; extensions.el --- irc Layer extensions File for Spacemacs +;; +;; Copyright (c) 2012-2014 Sylvain Benner +;; Copyright (c) 2014-2015 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;; vbe* functions for reading passwords from authinfo by Vincent Bernat +;; +;;; License: GPLv3 + +(setq irc-pre-extensions + '( + ;; pre extension names go here + )) + +(setq irc-post-extensions + '( + ;; post extension names go here + znc + )) + +;; For each extension, define a function irc/init- +;; +(defun irc/init-znc () + "Initialize znc" + (use-package znc + :load-path "private/ZNC.el" + :commands (znc-erc znc-all) + :defer t + :init (evil-leader/set-key + "aize" 'znc-erc + "aiza" 'znc-all) + :config + (progn + (defun vbe:znc-add-server (server port user networks) + "Add a server to the list of ZNC servers. +We use SSL inconditionaly. Moreover, we don't store the password +but put nil instead. At least, we tweak the username to contain +the network name later, this will be separated again." + (add-to-list 'znc-servers + (list server + port + t ; SSL enabled + (mapcar (function (lambda (slug) (list slug + (format "%s/%s" user slug) + nil))) + networks)))) + + (defun vbe:znc-erc-ssl-connector (&rest R) + "Connect to ERC using SSL and retrieve password with `auth-source-search'. +Moreover, handle multiple networks by sending the password with +the appropriate network slug that we extract from the nick." + (let* ((user (nth 0 (split-string (plist-get R :nick) "/"))) + (slug (nth 1 (split-string (plist-get R :nick) "/"))) + (found (nth 0 (auth-source-search :host (plist-get R :server) + :user user + :require '(:user :secret) + :max 1)))) + (if found + (let ((password (let ((secret (plist-get found :secret))) + (if (functionp secret) + (funcall secret) + secret)))) + (plist-put R :password (format "%s/%s:%s" user slug password)) + (plist-put R :nick user) + (apply 'erc-tls R))))) + (setq znc-erc-ssl-connector 'vbe:znc-erc-ssl-connector) + + ;; Define networks + (vbe:znc-add-server "aminb.org" 6697 "aminb" + '(freenode mozilla)) + ) + ) + ) +;; +;; Often the body of an initialize function uses `use-package' +;; For more info on `use-package', see readme: +;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.emacs.d/private/irc/packages.el b/spacemacs/.emacs.d/private/irc/packages.el new file mode 100644 index 0000000..d8cba40 --- /dev/null +++ b/spacemacs/.emacs.d/private/irc/packages.el @@ -0,0 +1,31 @@ +;;; packages.el --- irc Layer packages File for Spacemacs +;; +;; Copyright (c) 2012-2014 Sylvain Benner +;; Copyright (c) 2014-2015 Sylvain Benner & Contributors +;; +;; Author: Sylvain Benner +;; URL: https://github.com/syl20bnr/spacemacs +;; +;; This file is not part of GNU Emacs. +;; +;;; License: GPLv3 + +;; List of all packages to install and/or initialize. Built-in packages +;; which require an initialization must be listed explicitly in the list. +(setq irc-packages + '( + ;; package names go here + )) + +;; List of packages to exclude. +(setq irc-excluded-packages '()) + +;; For each package, define a function irc/init- +;; +;; (defun irc/init-my-package () +;; "Initialize my package" +;; ) +;; +;; Often the body of an initialize function uses `use-package' +;; For more info on `use-package', see readme: +;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 81e1837..447a59f 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -33,6 +33,7 @@ ;; (haskell :variables '(haskell-enable-hindent-style "chris-done" ;; haskell-enable-shm-support t)) erc + irc version-control ) ;; List of additional packages that will be installed wihout being -- 2.20.1 From 2128124801c6e64dfdc71e540c25593a7574b18a Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 4 Jul 2015 00:16:13 -0400 Subject: [PATCH 05/16] [spacemacs] (setq erc-pcomplete-nick-postfix ": ") set erc nick completion postfix to ": " (the empty space after the colon was missing) --- spacemacs/.spacemacs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 447a59f..d092b4a 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -193,6 +193,8 @@ layers configuration." (mode-io-correlate "%n:1:%t ") "%o")))) + ;; set the erc nick completion postfix to ": " + (setq erc-pcomplete-nick-postfix ": ") ;; Suppress ad-handle-definition warnings ;; (annoying "`tramp-read-passwd' got redefined" warning on startup) -- 2.20.1 From bf59a78ea13a26395288c9b4321b8e2a1232f02b Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sun, 5 Jul 2015 22:21:30 -0400 Subject: [PATCH 06/16] [spacemacs] font size 14 --- spacemacs/.spacemacs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index d092b4a..6045f4f 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -86,7 +86,7 @@ before layers configuration." ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. dotspacemacs-default-font '("Source Code Pro" - :size 13 + :size 14 :weight normal :width normal :powerline-scale 1.1) -- 2.20.1 From 14e49b68dbf2e7d8b1f65ce390cecd885f23a30d Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:07:28 -0500 Subject: [PATCH 07/16] [bspwm] comment out the auto workspace rules --- bspwm/.config/bspwm/bspwmrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index b3c295d..5c3081b 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -15,10 +15,10 @@ bspc monitor -d web code term iv v vi vii viii ix x bspc config normal_border_color '#1d1f21' bspc config focused_border_color '#093748' -bspc rule -a Firefox desktop=^1 focus=on -bspc rule -a emacs desktop=^2 focus=on -bspc rule -a Chromium desktop=^3 focus=on -bspc rule -a zathura desktop=^5 focus=on +# bspc rule -a Firefox desktop=^1 focus=on +# bspc rule -a emacs desktop=^2 focus=on +# bspc rule -a Chromium desktop=^3 focus=on +# bspc rule -a zathura desktop=^5 focus=on bspc rule -a xfce4-appfinder floating=on # panel & -- 2.20.1 From 91018a34e3089a48e503938d60a8274fc854a713 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:08:28 -0500 Subject: [PATCH 08/16] [ncmpcpp] use dash instead of underscore in defkey --- ncmpcpp/.ncmpcpp/bindings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncmpcpp/.ncmpcpp/bindings b/ncmpcpp/.ncmpcpp/bindings index 6c21219..c41b932 100644 --- a/ncmpcpp/.ncmpcpp/bindings +++ b/ncmpcpp/.ncmpcpp/bindings @@ -403,7 +403,7 @@ def_key ";" #def_key "g" # jump_to_position_in_song # -def_key "ctrl_l" +def_key "ctrl-l" show_lyrics # #def_key "v" -- 2.20.1 From 271181b4f8d4711bb1f53246c8ccddff4b80f6b7 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:11:07 -0500 Subject: [PATCH 09/16] [spacemacs] update dot file w latest dev template --- spacemacs/.spacemacs | 272 ++++++++++++++++++++++++------------------- 1 file changed, 149 insertions(+), 123 deletions(-) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 6045f4f..00a603a 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -3,10 +3,16 @@ ;; It must be stored in your home directory. (defun dotspacemacs/layers () - "Configuration Layers declaration." + "Configuration Layers declaration. +You should not put any user code in this function besides modifying the variable +values." (setq-default + ;; Base distribution to use. This is a layer contained in the directory + ;; `+distribution'. For now available distributions are `spacemacs-base' + ;; or `spacemacs'. (default 'spacemacs) + dotspacemacs-distribution 'spacemacs ;; List of additional paths where to look for configuration layers. - ;; Paths must have a trailing slash (ie. `~/.mycontribs/') + ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') dotspacemacs-configuration-layer-path '() ;; List of configuration layers to load. If it is the symbol `all' instead ;; of a list then all discovered layers will be installed. @@ -26,151 +32,230 @@ (shell :variables shell-default-height 30 shell-default-position 'bottom) + spell-checking syntax-checking - mu4e + ;; mu4e c-c++ + java latex + ;; erc + ;; irc + ;; themes-megapack + ;; music + ;; (ranger :variables + ;; ranger-show-preview t) + xkcd ;; (haskell :variables '(haskell-enable-hindent-style "chris-done" ;; haskell-enable-shm-support t)) - erc - irc - version-control + ;; version-control ) - ;; List of additional packages that will be installed wihout being + ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these ;; packages then consider to create a layer, you can also put the - ;; configuration in `dotspacemacs/config'. + ;; configuration in `dotspacemacs/user-config'. dotspacemacs-additional-packages '() ;; A list of packages and/or extensions that will not be install and loaded. dotspacemacs-excluded-packages '() ;; If non-nil spacemacs will delete any orphan packages, i.e. packages that ;; are declared in a layer which is not a member of - ;; the list `dotspacemacs-configuration-layers' + ;; the list `dotspacemacs-configuration-layers'. (default t) dotspacemacs-delete-orphan-packages t)) (defun dotspacemacs/init () "Initialization function. This function is called at the very startup of Spacemacs initialization -before layers configuration." +before layers configuration. +You should not put any user code in there besides modifying the variable +values." ;; This setq-default sexp is an exhaustive list of all the supported ;; spacemacs settings. (setq-default - ;; Either `vim' or `emacs'. Evil is always enabled but if the variable - ;; is `emacs' then the `holy-mode' is enabled at startup. + ;; If non nil ELPA repositories are contacted via HTTPS whenever it's + ;; possible. Set it to nil if you have no way to use HTTPS in your + ;; environment, otherwise it is strongly recommended to let it set to t. + ;; This variable has no effect if Emacs is launched with the parameter + ;; `--insecure' which forces the value of this variable to nil. + ;; (default t) + dotspacemacs-elpa-https t + ;; Maximum allowed time in seconds to contact an ELPA repository. + dotspacemacs-elpa-timeout 5 + ;; If non nil then spacemacs will check for updates at startup + ;; when the current branch is not `develop'. (default t) + dotspacemacs-check-for-update t + ;; One of `vim', `emacs' or `hybrid'. Evil is always enabled but if the + ;; variable is `emacs' then the `holy-mode' is enabled at startup. `hybrid' + ;; uses emacs key bindings for vim's insert mode, but otherwise leaves evil + ;; unchanged. (default 'vim) dotspacemacs-editing-style 'vim - ;; If non nil output loading progress in `*Messages*' buffer. + ;; If non nil output loading progress in `*Messages*' buffer. (default nil) dotspacemacs-verbose-loading nil ;; Specify the startup banner. Default value is `official', it displays ;; the official spacemacs logo. An integer value is the index of text ;; banner, `random' chooses a random text banner in `core/banners' ;; directory. A string value must be a path to an image format supported ;; by your Emacs build. - ;; If the value is nil then no banner is displayed. + ;; If the value is nil then no banner is displayed. (default 'official) dotspacemacs-startup-banner 'official ;; List of items to show in the startup buffer. If nil it is disabled. - ;; Possible values are: `recents' `bookmarks' `projects'." + ;; Possible values are: `recents' `bookmarks' `projects'. + ;; (default '(recents projects)) dotspacemacs-startup-lists '(recents projects) + ;; Number of recent files to show in the startup buffer. Ignored if + ;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5) + dotspacemacs-startup-recent-list-size 5 ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press T n to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) - dotspacemacs-themes '(solarized-light - gotham - leuven - solarized-dark + dotspacemacs-themes '(spacemacs-dark spacemacs-light - spacemacs-dark + solarized-light + solarized-dark + leuven monokai zenburn) - ;; If non nil the cursor color matches the state color. + ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. dotspacemacs-default-font '("Source Code Pro" - :size 14 + :size 13 :weight normal :width normal :powerline-scale 1.1) ;; The leader key dotspacemacs-leader-key "SPC" ;; The leader key accessible in `emacs state' and `insert state' + ;; (default "M-m") dotspacemacs-emacs-leader-key "M-m" ;; Major mode leader key is a shortcut key which is the equivalent of - ;; pressing ` m`. Set it to `nil` to disable it. + ;; pressing ` m`. Set it to `nil` to disable it. (default ",") dotspacemacs-major-mode-leader-key "," - ;; Major mode leader key accessible in `emacs state' and `insert state' + ;; Major mode leader key accessible in `emacs state' and `insert state'. + ;; (default "C-M-m) dotspacemacs-major-mode-emacs-leader-key "C-M-m" + ;; These variables control whether separate commands are bound in the GUI to + ;; the key pairs C-i, TAB and C-m, RET. + ;; Setting it to a non-nil value, allows for separate commands under + ;; and TAB or and RET. + ;; In the terminal, these pairs are generally indistinguishable, so this only + ;; works in the GUI. (default nil) + dotspacemacs-distinguish-gui-tab nil + ;; (Not implemented) dotspacemacs-distinguish-gui-ret nil ;; The command key used for Evil commands (ex-commands) and ;; Emacs commands (M-x). ;; By default the command key is `:' so ex-commands are executed like in Vim ;; with `:' and Emacs commands are executed with ` :'. dotspacemacs-command-key ":" + ;; If non nil `Y' is remapped to `y$'. (default t) + dotspacemacs-remap-Y-to-y$ t + ;; Name of the default layout (default "Default") + dotspacemacs-default-layout-name "Default" + ;; If non nil the default layout name is displayed in the mode-line. + ;; (default nil) + dotspacemacs-display-default-layout nil + ;; If non nil then the last auto saved layouts are resume automatically upon + ;; start. (default nil) + dotspacemacs-auto-resume-layouts nil ;; Location where to auto-save files. Possible values are `original' to ;; auto-save the file in-place, `cache' to auto-save the file to another ;; file stored in the cache directory and `nil' to disable auto-saving. - ;; Default value is `cache'. + ;; (default 'cache) dotspacemacs-auto-save-file-location 'cache + ;; Maximum number of rollback slots to keep in the cache. (default 5) + dotspacemacs-max-rollback-slots 5 ;; If non nil then `ido' replaces `helm' for some commands. For now only - ;; `find-files' (SPC f f) is replaced. - dotspacemacs-use-ido t + ;; `find-files' (SPC f f), `find-spacemacs-file' (SPC f e s), and + ;; `find-contrib-file' (SPC f e c) are replaced. (default nil) + dotspacemacs-use-ido nil + ;; If non nil, `helm' will try to minimize the space it uses. (default nil) + dotspacemacs-helm-resize nil + ;; if non nil, the helm header is hidden when there is only one source. + ;; (default nil) + dotspacemacs-helm-no-header nil + ;; define the position to display `helm', options are `bottom', `top', + ;; `left', or `right'. (default 'bottom) + dotspacemacs-helm-position 'bottom ;; If non nil the paste micro-state is enabled. When enabled pressing `p` - ;; several times cycle between the kill ring content. + ;; several times cycle between the kill ring content. (default nil) dotspacemacs-enable-paste-micro-state nil - ;; Guide-key delay in seconds. The Guide-key is the popup buffer listing - ;; the commands bound to the current keystrokes. - dotspacemacs-guide-key-delay 0.4 + ;; Which-key delay in seconds. The which-key buffer is the popup listing + ;; the commands bound to the current keystroke sequence. (default 0.4) + dotspacemacs-which-key-delay 0.4 + ;; Which-key frame position. Possible values are `right', `bottom' and + ;; `right-then-bottom'. right-then-bottom tries to display the frame to the + ;; right; if there is insufficient space it displays it at the bottom. + ;; (default 'bottom) + dotspacemacs-which-key-position 'bottom ;; If non nil a progress bar is displayed when spacemacs is loading. This ;; may increase the boot time on some systems and emacs builds, set it to - ;; nil ;; to boost the loading time. + ;; nil to boost the loading time. (default t) dotspacemacs-loading-progress-bar t - ;; If non nil the frame is fullscreen when Emacs starts up. + ;; If non nil the frame is fullscreen when Emacs starts up. (default nil) ;; (Emacs 24.4+ only) dotspacemacs-fullscreen-at-startup nil ;; If non nil `spacemacs/toggle-fullscreen' will not use native fullscreen. - ;; Use to disable fullscreen animations in OSX." + ;; Use to disable fullscreen animations in OSX. (default nil) dotspacemacs-fullscreen-use-non-native nil ;; If non nil the frame is maximized when Emacs starts up. ;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil. - ;; (Emacs 24.4+ only) + ;; (default nil) (Emacs 24.4+ only) dotspacemacs-maximized-at-startup nil ;; A value from the range (0..100), in increasing opacity, which describes ;; the transparency level of a frame when it's active or selected. - ;; Transparency can be toggled through `toggle-transparency'. + ;; Transparency can be toggled through `toggle-transparency'. (default 90) dotspacemacs-active-transparency 90 ;; A value from the range (0..100), in increasing opacity, which describes ;; the transparency level of a frame when it's inactive or deselected. - ;; Transparency can be toggled through `toggle-transparency'. + ;; Transparency can be toggled through `toggle-transparency'. (default 90) dotspacemacs-inactive-transparency 90 - ;; If non nil unicode symbols are displayed in the mode line. + ;; If non nil unicode symbols are displayed in the mode line. (default t) dotspacemacs-mode-line-unicode-symbols t ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth ;; scrolling overrides the default behavior of Emacs which recenters the - ;; point when it reaches the top or bottom of the screen. + ;; point when it reaches the top or bottom of the screen. (default t) dotspacemacs-smooth-scrolling t + ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' + ;; derivatives. If set to `relative', also turns on relative line numbers. + ;; (default nil) + dotspacemacs-line-numbers nil ;; If non-nil smartparens-strict-mode will be enabled in programming modes. + ;; (default nil) dotspacemacs-smartparens-strict-mode nil - ;; Select a scope to highlight delimiters. Possible value is `all', - ;; `current' or `nil'. Default is `all' + ;; Select a scope to highlight delimiters. Possible values are `any', + ;; `current', `all' or `nil'. Default is `all' (highlight any scope and + ;; emphasis the current one). (default 'all) dotspacemacs-highlight-delimiters 'all ;; If non nil advises quit functions to keep server open when quitting. + ;; (default nil) dotspacemacs-persistent-server nil ;; List of search tool executable names. Spacemacs uses the first installed ;; tool of the list. Supported tools are `ag', `pt', `ack' and `grep'. + ;; (default '("ag" "pt" "ack" "grep")) dotspacemacs-search-tools '("ag" "pt" "ack" "grep") ;; The default package repository used if no explicit repository has been ;; specified with an installed package. - ;; Not used for now. + ;; Not used for now. (default nil) dotspacemacs-default-package-repository nil + ;; Delete whitespace while saving buffer. Possible values are `all', + ;; `trailing', `changed' or `nil'. Default is `changed' (cleanup whitespace + ;; on changed lines) (default 'changed) + dotspacemacs-whitespace-cleanup 'changed ;; Disable setting the cursor color according to states - dotspacemacs-colorize-cursor-according-to-state nil - ) - ;; User initialization goes here + ;; dotspacemacs-colorize-cursor-according-to-state nil + )) + +(defun dotspacemacs/user-init () + "Initialization function for user code. +It is called immediately after `dotspacemacs/init'. You are free to put almost any +user code here. The exception is org related code, which should be placed in +`dotspacemacs/user-config'." ) -(defun dotspacemacs/config () - "Configuration function. - This function is called at the very end of Spacemacs initialization after -layers configuration." - (setq powerline-default-separator nil) +(defun dotspacemacs/user-config () + "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." + ;; (setq powerline-default-separator nil) (setq TeX-PDF-mode t Tex-command-default 'TeX) (setq undo-tree-auto-save-history t @@ -194,11 +279,11 @@ layers configuration." "%o")))) ;; set the erc nick completion postfix to ": " - (setq erc-pcomplete-nick-postfix ": ") + ;; (setq erc-pcomplete-nick-postfix ", ") ;; Suppress ad-handle-definition warnings ;; (annoying "`tramp-read-passwd' got redefined" warning on startup) - (setq ad-redefinition-action 'accept) + ;; (setq ad-redefinition-action 'accept) (define-key evil-motion-state-map ";" 'evil-ex) @@ -207,6 +292,17 @@ layers configuration." ;; enable when using zenburn ;; (custom-set-faces '(evil-search-highlight-persist-highlight-face ((t (:background "#5F5F5F"))))) + + ;; set Eclipse and Eclim paths + ;; (setq eclim-eclipse-dirs "/usr/lib/eclipse" + ;; eclim-executable "/usr/lib/eclipse/eclim") + + ;; required for having working previews when using ranger + ;; (add-hook 'dired-mode-hook 'evil-emacs-state) + + ;; (add-hook 'mpc-mode-hook 'evil-emacs-state) + ;; (add-hook 'simple-mpc-mode-hook 'evil-emacs-state) + ;; (add-hook 'simple-mpc-current-playlist-mode-hook 'evil-emacs-state) ) ;; Do not write anything past this comment. This is where Emacs will @@ -216,79 +312,9 @@ layers configuration." ;; 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. - '(ahs-case-fold-search nil) - '(ahs-default-range (quote ahs-range-whole-buffer)) - '(ahs-idle-interval 0.25) - '(ahs-idle-timer 0 t) - '(ahs-inhibit-face-list nil) - '(ansi-color-faces-vector - [default default default italic underline success warning error]) - '(ansi-color-names-vector - ["#272822" "#F92672" "#A6E22E" "#E6DB74" "#66D9EF" "#FD5FF0" "#A1EFE4" "#F8F8F2"]) - '(compilation-message-face (quote default)) - '(cua-global-mark-cursor-color "#2aa198") - '(cua-normal-cursor-color "#839496") - '(cua-overwrite-cursor-color "#b58900") - '(cua-read-only-cursor-color "#859900") - '(highlight-changes-colors ("#FD5FF0" "#AE81FF")) - '(highlight-symbol-colors - (--map - (solarized-color-blend it "#002b36" 0.25) - (quote - ("#b58900" "#2aa198" "#dc322f" "#6c71c4" "#859900" "#cb4b16" "#268bd2")))) - '(highlight-symbol-foreground-color "#93a1a1") - '(highlight-tail-colors - (quote - (("#49483E" . 0) - ("#67930F" . 20) - ("#349B8D" . 30) - ("#21889B" . 50) - ("#968B26" . 60) - ("#A45E0A" . 70) - ("#A41F99" . 85) - ("#49483E" . 100)))) - '(hl-bg-colors - (quote - ("#7B6000" "#8B2C02" "#990A1B" "#93115C" "#3F4D91" "#00629D" "#00736F" "#546E00"))) - '(hl-fg-colors - (quote - ("#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36"))) - '(magit-diff-use-overlays nil) - '(magit-use-overlays nil) '(package-selected-packages (quote - (company-auctex auctex company-c-headers cmake-mode clang-format toc-org smeargle shell-pop org-repo-todo org-present org-pomodoro org-bullets multi-term mmm-mode markdown-toc magit-svn magit-gitflow htmlize helm-gitignore helm-flyspell helm-c-yasnippet gitconfig-mode gitattributes-mode git-timemachine git-messenger flycheck-pos-tip evil-org company-statistics company-quickhelp auto-yasnippet ac-ispell auto-complete company flycheck yasnippet request gitignore-mode magit git-rebase-mode git-commit-mode markdown-mode alert log4e gntp zenburn-theme monokai-theme macrostep elisp-slime-nav diff-hl window-numbering volatile-highlights vi-tilde-fringe use-package smooth-scrolling rfringe rainbow-delimiters powerline popup pcre2el paradox page-break-lines open-junk-file neotree move-text linum-relative leuven-theme info+ indent-guide ido-vertical-mode hungry-delete hl-anything highlight-parentheses highlight-numbers highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-descbinds helm-ag guide-key-tip google-translate golden-ratio gh-md fringe-helper flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-terminal-cursor-changer evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-matchit evil-lisp-state evil-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu clean-aindent-mode buffer-move auto-highlight-symbol auto-dictionary aggressive-indent adaptive-wrap ace-window ace-link ace-jump-mode))) - '(pos-tip-background-color "#073642") - '(pos-tip-foreground-color "#93a1a1") - '(ring-bell-function (quote ignore) t) - '(send-mail-function (quote smtpmail-send-it)) - '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2)) - '(term-default-bg-color "#002b36") - '(term-default-fg-color "#839496") - '(vc-annotate-background nil) - '(vc-annotate-color-map - (quote - ((20 . "#F92672") - (40 . "#CF4F1F") - (60 . "#C26C0F") - (80 . "#E6DB74") - (100 . "#AB8C00") - (120 . "#A18F00") - (140 . "#989200") - (160 . "#8E9500") - (180 . "#A6E22E") - (200 . "#729A1E") - (220 . "#609C3C") - (240 . "#4E9D5B") - (260 . "#3C9F79") - (280 . "#A1EFE4") - (300 . "#299BA6") - (320 . "#2896B5") - (340 . "#2790C3") - (360 . "#66D9EF")))) - '(vc-annotate-very-old-color nil) - '(weechat-color-list - (unspecified "#272822" "#49483E" "#A20C41" "#F92672" "#67930F" "#A6E22E" "#968B26" "#E6DB74" "#21889B" "#66D9EF" "#A41F99" "#FD5FF0" "#349B8D" "#A1EFE4" "#F8F8F2" "#F8F8F0"))) + (orgit markdown-mode gitignore-mode flycheck farmhouse-theme company badwolf-theme auctex-latexmk auctex popup avy highlight helm helm-core package-build bind-key evil ws-butler persp-mode lorem-ipsum hl-todo help-fns+ evil-indent-plus ace-jump-helm-line bind-map zonokai-theme zenburn-theme zen-and-art-theme xkcd 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 sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spray spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle simple-mpc shell-pop seti-theme reverse-theme restart-emacs ranger rainbow-delimiters quelpa pyvenv pytest pyenv-mode purple-haze-theme professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme pcre2el pastels-on-dark-theme paradox page-break-lines organic-green-theme org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets open-junk-file oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc magit-gitflow macrostep lush-theme 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 highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gitignore helm-flyspell 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 gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md gandalf-theme flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator 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-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help erc-yt erc-view-log erc-social-graph erc-image erc-hl-nicks emacs-eclim elisp-slime-nav django-theme disaster define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-statistics company-quickhelp company-c-headers company-auctex company-anaconda colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized cmake-mode clues-theme clean-aindent-mode clang-format circe cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme birds-of-paradise-plus-theme auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. -- 2.20.1 From 9d273a6b304cfd4478395f92b2afbfb452482ad3 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:13:48 -0500 Subject: [PATCH 10/16] [sxhkd] add new definitions for super {p,s,f} bspc window -t doesn't toggle anymore, but only sets --- sxhkd/.config/sxhkd/sxhkdrc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 646653f..0669cfa 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -14,8 +14,10 @@ super + t super + b bspc desktop -B -super + {s,f} - bspc window -t {floating,fullscreen} +super + {p,s,f} + state={pseudo_tiled,floating,fullscreen}; \ + bspc query -W -w "focused.$\{state\}" && state=tiled; \ + bspc window -t "$state" super + {grave,Tab} bspc {window,desktop} -f last -- 2.20.1 From ee3e7188ded9c424e22c15bbf970cd9ac09ff70c Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:15:42 -0500 Subject: [PATCH 11/16] [sxhkd] launch chromium in incognito mode --- sxhkd/.config/sxhkd/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 0669cfa..53ce423 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -101,7 +101,7 @@ super + r firefox super + c - chromium + chromium -incognito # make sxhkd reload its configuration files: super + Escape -- 2.20.1 From 359468168e32456e7eee31687963a91dc540c103 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:16:03 -0500 Subject: [PATCH 12/16] [sxhkd] reapply .Xmodmap when changing lang to ENG --- sxhkd/.local/bin/toggle-layout | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sxhkd/.local/bin/toggle-layout b/sxhkd/.local/bin/toggle-layout index fcae134..cb259b4 100755 --- a/sxhkd/.local/bin/toggle-layout +++ b/sxhkd/.local/bin/toggle-layout @@ -6,4 +6,5 @@ if [ "$lang" = "us" ]; then setxkbmap ir else setxkbmap us -fi \ No newline at end of file + xmodmap $HOME/.Xmodmap +fi -- 2.20.1 From 97923e8fc0a53daa6f55b6cfa61930434dee6e25 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 23 Dec 2015 22:17:28 -0500 Subject: [PATCH 13/16] [X] no 2,3 finger tap / no emacs daemon on startup --- x/.xprofile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x/.xprofile b/x/.xprofile index cbaeed0..83428bd 100755 --- a/x/.xprofile +++ b/x/.xprofile @@ -40,8 +40,11 @@ xrdb -merge ~/.gotham.xresources # xbacklight -set 50 # synaptics (touchpad) configs -synclient TapButton2=3 -synclient TapButton3=2 +#synclient TapButton2=3 +#synclient TapButton3=2 +synclient TapButton1=1 +synclient TapButton2=0 +synclient TapButton3=0 synclient HorizTwoFingerScroll=1 synclient VertScrollDelta=-237 synclient HorizScrollDelta=-237 @@ -72,7 +75,7 @@ xfdesktop --disable-wm-check & xfce4-panel --disable-wm-check & bspwm & sxhkd & -emacs --daemon & +#emacs --daemon & sleep 2 && pnmixer & # panel & -- 2.20.1 From 899452ca17d9e85c0f6dd416b6bb81678bef18d2 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 13 Feb 2016 18:41:57 -0500 Subject: [PATCH 14/16] [spacemacs] start from scratch with .spacemacs of develop branch at a111f48 --- spacemacs/.emacs.d/private/ZNC.el | 1 - spacemacs/.emacs.d/private/irc/extensions.el | 82 ---------- spacemacs/.emacs.d/private/irc/packages.el | 31 ---- spacemacs/.emacs.d/private/mu4e/extensions.el | 33 ---- spacemacs/.emacs.d/private/mu4e/packages.el | 147 ----------------- spacemacs/.lein/profiles.clj | 4 - spacemacs/.spacemacs | 152 +++++------------- 7 files changed, 43 insertions(+), 407 deletions(-) delete mode 160000 spacemacs/.emacs.d/private/ZNC.el delete mode 100644 spacemacs/.emacs.d/private/irc/extensions.el delete mode 100644 spacemacs/.emacs.d/private/irc/packages.el delete mode 100644 spacemacs/.emacs.d/private/mu4e/extensions.el delete mode 100644 spacemacs/.emacs.d/private/mu4e/packages.el delete mode 100644 spacemacs/.lein/profiles.clj diff --git a/spacemacs/.emacs.d/private/ZNC.el b/spacemacs/.emacs.d/private/ZNC.el deleted file mode 160000 index 94c8e4c..0000000 --- a/spacemacs/.emacs.d/private/ZNC.el +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 94c8e4cdcfb51b75d5f95cb51ce21c6274325e19 diff --git a/spacemacs/.emacs.d/private/irc/extensions.el b/spacemacs/.emacs.d/private/irc/extensions.el deleted file mode 100644 index 47b48b1..0000000 --- a/spacemacs/.emacs.d/private/irc/extensions.el +++ /dev/null @@ -1,82 +0,0 @@ -;;; extensions.el --- irc Layer extensions File for Spacemacs -;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2015 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;; vbe* functions for reading passwords from authinfo by Vincent Bernat -;; -;;; License: GPLv3 - -(setq irc-pre-extensions - '( - ;; pre extension names go here - )) - -(setq irc-post-extensions - '( - ;; post extension names go here - znc - )) - -;; For each extension, define a function irc/init- -;; -(defun irc/init-znc () - "Initialize znc" - (use-package znc - :load-path "private/ZNC.el" - :commands (znc-erc znc-all) - :defer t - :init (evil-leader/set-key - "aize" 'znc-erc - "aiza" 'znc-all) - :config - (progn - (defun vbe:znc-add-server (server port user networks) - "Add a server to the list of ZNC servers. -We use SSL inconditionaly. Moreover, we don't store the password -but put nil instead. At least, we tweak the username to contain -the network name later, this will be separated again." - (add-to-list 'znc-servers - (list server - port - t ; SSL enabled - (mapcar (function (lambda (slug) (list slug - (format "%s/%s" user slug) - nil))) - networks)))) - - (defun vbe:znc-erc-ssl-connector (&rest R) - "Connect to ERC using SSL and retrieve password with `auth-source-search'. -Moreover, handle multiple networks by sending the password with -the appropriate network slug that we extract from the nick." - (let* ((user (nth 0 (split-string (plist-get R :nick) "/"))) - (slug (nth 1 (split-string (plist-get R :nick) "/"))) - (found (nth 0 (auth-source-search :host (plist-get R :server) - :user user - :require '(:user :secret) - :max 1)))) - (if found - (let ((password (let ((secret (plist-get found :secret))) - (if (functionp secret) - (funcall secret) - secret)))) - (plist-put R :password (format "%s/%s:%s" user slug password)) - (plist-put R :nick user) - (apply 'erc-tls R))))) - (setq znc-erc-ssl-connector 'vbe:znc-erc-ssl-connector) - - ;; Define networks - (vbe:znc-add-server "aminb.org" 6697 "aminb" - '(freenode mozilla)) - ) - ) - ) -;; -;; Often the body of an initialize function uses `use-package' -;; For more info on `use-package', see readme: -;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.emacs.d/private/irc/packages.el b/spacemacs/.emacs.d/private/irc/packages.el deleted file mode 100644 index d8cba40..0000000 --- a/spacemacs/.emacs.d/private/irc/packages.el +++ /dev/null @@ -1,31 +0,0 @@ -;;; packages.el --- irc Layer packages File for Spacemacs -;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2015 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;;; License: GPLv3 - -;; List of all packages to install and/or initialize. Built-in packages -;; which require an initialization must be listed explicitly in the list. -(setq irc-packages - '( - ;; package names go here - )) - -;; List of packages to exclude. -(setq irc-excluded-packages '()) - -;; For each package, define a function irc/init- -;; -;; (defun irc/init-my-package () -;; "Initialize my package" -;; ) -;; -;; Often the body of an initialize function uses `use-package' -;; For more info on `use-package', see readme: -;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.emacs.d/private/mu4e/extensions.el b/spacemacs/.emacs.d/private/mu4e/extensions.el deleted file mode 100644 index a6adea8..0000000 --- a/spacemacs/.emacs.d/private/mu4e/extensions.el +++ /dev/null @@ -1,33 +0,0 @@ -;;; extensions.el --- mu4e Layer extensions File for Spacemacs -;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2015 Sylvain Benner & Contributors -;; -;; Author: Sylvain Benner -;; URL: https://github.com/syl20bnr/spacemacs -;; -;; This file is not part of GNU Emacs. -;; -;;; License: GPLv3 - -(defvar mu4e-pre-extensions - '( - ;; pre extension mu4es go here - ) - "List of all extensions to load before the packages.") - -(defvar mu4e-post-extensions - '( - ;; post extension mu4es go here - ) - "List of all extensions to load after the packages.") - -;; For each extension, define a function mu4e/init- -;; -;; (defun mu4e/init-my-extension () -;; "Initialize my extension" -;; ) -;; -;; Often the body of an initialize function uses `use-package' -;; For more info on `use-package', see readme: -;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.emacs.d/private/mu4e/packages.el b/spacemacs/.emacs.d/private/mu4e/packages.el deleted file mode 100644 index c01640e..0000000 --- a/spacemacs/.emacs.d/private/mu4e/packages.el +++ /dev/null @@ -1,147 +0,0 @@ -;;; packages.el --- mu4e Layer packages File for Spacemacs -;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2015 Sylvain Benner & Contributors -;; Copyright (c) 2015 Amin Bandali -;; -;; Authors: Amin Bandali -;; Sylvain Benner -;; URL: https://github.com/aminb/dotfiles -;; -;; This file is not part of GNU Emacs; nor that of spacemacs. -;; -;;; License: GPLv3 - -(defvar mu4e-packages - '( - ;; mu4e is not in any repos, so it's commented - ;; mu4e - smtpmail - ) - "List of all packages to install and/or initialize. Built-in packages -which require an initialization must be listed explicitly in the list.") - -(defvar mu4e-excluded-packages '() - "List of packages to exclude.") - -(defun get-string-from-file (filePath) - "Return filePath's file content." - (with-temp-buffer - (insert-file-contents filePath) - (buffer-string))) -;; thanks to “Pascal J Bourguignon” and “TheFlyingDutchman -;; 〔zzbba…@aol.com〕”. 2010-09-02 - -(defun get-passwd-file (name) - "Return name's passwd file content" - (get-string-from-file (concat "/home/amin/.passwd/" name))) - -(require 'mu4e) -(require 'smtpmail) - -;; path to our Maildir directory -(setq mu4e-maildir "/home/amin/.mail") - -(setq - mu4e-get-mail-command "mbsync -aq" ;; or fetchmail, or ... - mu4e-update-interval 300 ;; update every 5 minutes - mu4e-sent-folder "/aminb/Sent" - mu4e-drafts-folder "/aminb/Drafts" - mu4e-trash-folder "/aminb/Trash" - user-mail-address (get-passwd-file "aminb-mail") - mu4e-compose-signature - (concat - "Amin Bandali\n" - "\n") - smtpmail-default-smtp-server "mail.aminb.org" - smtpmail-local-domain "aminb.org" - smtpmail-smtp-server "mail.aminb.org" - smtpmail-stream-type 'ssl - smtpmail-smtp-service 465) - -(defvar my-mu4e-account-alist - '(("aminb" - (mu4e-sent-folder "/aminb/Sent") - (mu4e-drafts-folder "/aminb/Drafts") - (mu4e-trash-folder "/aminb/Trash") - (user-mail-address (get-passwd-file "aminb-mail")) - (user-full-name "Amin Bandali") - (smtpmail-default-smtp-server "mail.aminb.org") - (smtpmail-local-domain "aminb.org") - (smtpmail-smtp-user (get-passwd-file "aminb-user")) - (smtpmail-smtp-server "mail.aminb.org") - (smtpmail-stream-type ssl) - (smtpmail-smtp-service 465)) - (user-mail-address (get-passwd-file "gmail-mail")) - ("gmail" - (mu4e-sent-folder "/gmail/[Gmail].Sent Mail") - (mu4e-drafts-folder "/gmail/Drafts") - (mu4e-trash-folder "/gmail/Trash") - (user-full-name "Amin Bandali") - (smtpmail-default-smtp-server "smtp.gmail.com") - (smtpmail-local-domain "gmail.com") - (smtpmail-smtp-user (get-passwd-file "gmail-mail")) - (smtpmail-smtp-server "smtp.gmail.com") - (smtpmail-stream-type ssl) - (smtpmail-smtp-service 465)))) - -(defun my-mu4e-set-account () - "Set the account for composing a message." - (let* ((account - (if mu4e-compose-parent-message - (let ((maildir (mu4e-message-field mu4e-compose-parent-message :maildir))) - (string-match "/\\(.*?\\)/" maildir) - (match-string 1 maildir)) - (completing-read (format "Compose with account: (%s) " - (mapconcat #'(lambda (var) (car var)) - my-mu4e-account-alist "/")) - (mapcar #'(lambda (var) (car var)) my-mu4e-account-alist) - nil t nil nil (caar my-mu4e-account-alist)))) - (account-vars (cdr (assoc account my-mu4e-account-alist)))) - (if account-vars - (mapc #'(lambda (var) - (set (car var) (cadr var))) - account-vars) - (error "No email account found")))) - -(add-hook 'mu4e-compose-pre-hook 'my-mu4e-set-account) - - -;; Shortcut for mu4e. -(global-set-key (kbd "C-c m") 'mu4e) -(evil-leader/set-key "am" 'mu4e) - - -;; A special version of the gnus-dired-mail-buffers function -;; that understands mu4e buffers as well -(require 'gnus-dired) -;; make the `gnus-dired-mail-buffers' function also work on -;; message-mode derived modes, such as mu4e-compose-mode -(defun gnus-dired-mail-buffers () - "Return a list of active message buffers." - (let (buffers) - (save-current-buffer - (dolist (buffer (buffer-list t)) - (set-buffer buffer) - (when (and (derived-mode-p 'message-mode) - (null message-sent-message-via)) - (push (buffer-name buffer) buffers)))) - (nreverse buffers))) - -(setq gnus-dired-mail-mode 'mu4e-user-agent) -(add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode) - -(require 'mu4e-contrib) -(setq mu4e-html2text-command 'mu4e-shr2text - mu4e-view-html-plaintext-ratio-heuristic 10 - mu4e-view-prefer-html t) - -;; For each package, define a function mu4e/init- -;; -;; (defun mu4e/init-my-package () -;; "Initialize my package" -;; ) -;; -;; Often the body of an initialize function uses `use-package' -;; For more info on `use-package', see readme: -;; https://github.com/jwiegley/use-package diff --git a/spacemacs/.lein/profiles.clj b/spacemacs/.lein/profiles.clj deleted file mode 100644 index 2c98c7d..0000000 --- a/spacemacs/.lein/profiles.clj +++ /dev/null @@ -1,4 +0,0 @@ -{:user {:plugins [[cider/cider-nrepl "0.9.0-SNAPSHOT"] - [refactor-nrepl "0.3.0-SNAPSHOT"]] - :dependencies [[alembic "0.3.2"] - [org.clojure/tools.nrepl "0.2.7"]]}} diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 00a603a..a375541 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -11,6 +11,9 @@ values." ;; `+distribution'. For now available distributions are `spacemacs-base' ;; or `spacemacs'. (default 'spacemacs) dotspacemacs-distribution 'spacemacs + ;; If non-nil layers with lazy install support are lazy installed. + ;; (default nil) + dotspacemacs-enable-lazy-installation nil ;; List of additional paths where to look for configuration layers. ;; Paths must have a trailing slash (i.e. `~/.mycontribs/') dotspacemacs-configuration-layer-path '() @@ -23,35 +26,23 @@ values." ;; Uncomment some layer names and press (Vim style) or ;; (Emacs style) to install them. ;; ---------------------------------------------------------------- - auto-completion - better-defaults + spacemacs-helm + ;; auto-completion + ;; better-defaults emacs-lisp - git - markdown - org - (shell :variables - shell-default-height 30 - shell-default-position 'bottom) - spell-checking - syntax-checking - ;; mu4e - c-c++ - java - latex - ;; erc - ;; irc - ;; themes-megapack - ;; music - ;; (ranger :variables - ;; ranger-show-preview t) - xkcd - ;; (haskell :variables '(haskell-enable-hindent-style "chris-done" - ;; haskell-enable-shm-support t)) + ;; git + ;; markdown + ;; org + ;; (shell :variables + ;; shell-default-height 30 + ;; shell-default-position 'bottom) + ;; spell-checking + ;; syntax-checking ;; version-control ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these - ;; packages then consider to create a layer, you can also put the + ;; packages, then consider creating a layer. You can also put the ;; configuration in `dotspacemacs/user-config'. dotspacemacs-additional-packages '() ;; A list of packages and/or extensions that will not be install and loaded. @@ -97,12 +88,14 @@ values." ;; If the value is nil then no banner is displayed. (default 'official) dotspacemacs-startup-banner 'official ;; List of items to show in the startup buffer. If nil it is disabled. - ;; Possible values are: `recents' `bookmarks' `projects'. + ;; Possible values are: `recents' `bookmarks' `projects' `agenda' `todos'. ;; (default '(recents projects)) dotspacemacs-startup-lists '(recents projects) ;; Number of recent files to show in the startup buffer. Ignored if ;; `dotspacemacs-startup-lists' doesn't include `recents'. (default 5) dotspacemacs-startup-recent-list-size 5 + ;; Default major mode of the scratch buffer (default `text-mode') + dotspacemacs-scratch-mode 'text-mode ;; List of themes, the first of the list is loaded when spacemacs starts. ;; Press T n to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) @@ -133,6 +126,9 @@ values." ;; Major mode leader key accessible in `emacs state' and `insert state'. ;; (default "C-M-m) dotspacemacs-major-mode-emacs-leader-key "C-M-m" + ;; The key used for Emacs commands (M-x) (after pressing on the leader key). + ;; (default "SPC") + dotspacemacs-emacs-command-key "SPC" ;; These variables control whether separate commands are bound in the GUI to ;; the key pairs C-i, TAB and C-m, RET. ;; Setting it to a non-nil value, allows for separate commands under @@ -140,14 +136,11 @@ values." ;; In the terminal, these pairs are generally indistinguishable, so this only ;; works in the GUI. (default nil) dotspacemacs-distinguish-gui-tab nil - ;; (Not implemented) dotspacemacs-distinguish-gui-ret nil - ;; The command key used for Evil commands (ex-commands) and - ;; Emacs commands (M-x). - ;; By default the command key is `:' so ex-commands are executed like in Vim - ;; with `:' and Emacs commands are executed with ` :'. - dotspacemacs-command-key ":" - ;; If non nil `Y' is remapped to `y$'. (default t) - dotspacemacs-remap-Y-to-y$ t + ;; If non nil `Y' is remapped to `y$' in Evil states. (default nil) + dotspacemacs-remap-Y-to-y$ nil + ;; If non nil, inverse the meaning of `g' in `:substitute' Evil ex-command. + ;; (default nil) + dotspacemacs-ex-substitute-global nil ;; Name of the default layout (default "Default") dotspacemacs-default-layout-name "Default" ;; If non nil the default layout name is displayed in the mode-line. @@ -177,7 +170,7 @@ values." dotspacemacs-helm-position 'bottom ;; If non nil the paste micro-state is enabled. When enabled pressing `p` ;; several times cycle between the kill ring content. (default nil) - dotspacemacs-enable-paste-micro-state nil + dotspacemacs-enable-paste-transient-state nil ;; Which-key delay in seconds. The which-key buffer is the popup listing ;; the commands bound to the current keystroke sequence. (default 0.4) dotspacemacs-which-key-delay 0.4 @@ -208,11 +201,15 @@ values." ;; the transparency level of a frame when it's inactive or deselected. ;; Transparency can be toggled through `toggle-transparency'. (default 90) dotspacemacs-inactive-transparency 90 + ;; If non nil show the titles of transient states. (default t) + dotspacemacs-show-transient-state-title t + ;; If non nil show the color guide hint for transient state keys. (default t) + dotspacemacs-show-transient-state-color-guide t ;; If non nil unicode symbols are displayed in the mode line. (default t) dotspacemacs-mode-line-unicode-symbols t ;; If non nil smooth scrolling (native-scrolling) is enabled. Smooth - ;; scrolling overrides the default behavior of Emacs which recenters the - ;; point when it reaches the top or bottom of the screen. (default t) + ;; scrolling overrides the default behavior of Emacs which recenters point + ;; when it reaches the top or bottom of the screen. (default t) dotspacemacs-smooth-scrolling t ;; If non nil line numbers are turned on in all `prog-mode' and `text-mode' ;; derivatives. If set to `relative', also turns on relative line numbers. @@ -236,89 +233,26 @@ values." ;; specified with an installed package. ;; Not used for now. (default nil) dotspacemacs-default-package-repository nil - ;; Delete whitespace while saving buffer. Possible values are `all', - ;; `trailing', `changed' or `nil'. Default is `changed' (cleanup whitespace - ;; on changed lines) (default 'changed) - dotspacemacs-whitespace-cleanup 'changed - ;; Disable setting the cursor color according to states - ;; dotspacemacs-colorize-cursor-according-to-state nil + ;; Delete whitespace while saving buffer. Possible values are `all' + ;; to aggressively delete empty line and long sequences of whitespace, + ;; `trailing' to delete only the whitespace at end of lines, `changed'to + ;; delete only whitespace for changed lines or `nil' to disable cleanup. + ;; (default nil) + dotspacemacs-whitespace-cleanup nil )) (defun dotspacemacs/user-init () "Initialization function for user code. -It is called immediately after `dotspacemacs/init'. You are free to put almost any -user code here. The exception is org related code, which should be placed in -`dotspacemacs/user-config'." +It is called immediately after `dotspacemacs/init'. You are free to put almost +any user code here. The exception is org related code, which should be placed +in `dotspacemacs/user-config'." ) (defun dotspacemacs/user-config () "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." - ;; (setq powerline-default-separator nil) - (setq TeX-PDF-mode t - Tex-command-default 'TeX) - (setq undo-tree-auto-save-history t - undo-tree-history-directory-alist - `(("." . ,(concat spacemacs-cache-directory "undo")))) - (unless (file-exists-p (concat spacemacs-cache-directory "undo")) - (make-directory (concat spacemacs-cache-directory "undo"))) - - (setq TeX-view-program-selection - '(((output-dvi style-pstricks) - "dvips and gv") - (output-dvi "xdvi") - (output-pdf "zathura") - (output-html "xdg-open"))) - - (setq TeX-view-program-list - '(("zathura" - ("zathura" (mode-io-correlate "-sync.sh") - " " - (mode-io-correlate "%n:1:%t ") - "%o")))) - - ;; set the erc nick completion postfix to ": " - ;; (setq erc-pcomplete-nick-postfix ", ") - - ;; Suppress ad-handle-definition warnings - ;; (annoying "`tramp-read-passwd' got redefined" warning on startup) - ;; (setq ad-redefinition-action 'accept) - - (define-key evil-motion-state-map ";" 'evil-ex) - - ;; not very effective because of dotspacemacs-command-key - ;; (define-key evil-motion-state-map ":" 'evil-repeat-find-char) - - ;; enable when using zenburn - ;; (custom-set-faces '(evil-search-highlight-persist-highlight-face ((t (:background "#5F5F5F"))))) - - ;; set Eclipse and Eclim paths - ;; (setq eclim-eclipse-dirs "/usr/lib/eclipse" - ;; eclim-executable "/usr/lib/eclipse/eclim") - - ;; required for having working previews when using ranger - ;; (add-hook 'dired-mode-hook 'evil-emacs-state) - - ;; (add-hook 'mpc-mode-hook 'evil-emacs-state) - ;; (add-hook 'simple-mpc-mode-hook 'evil-emacs-state) - ;; (add-hook 'simple-mpc-current-playlist-mode-hook 'evil-emacs-state) -) + ) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. -(custom-set-variables - ;; custom-set-variables 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. - '(package-selected-packages - (quote - (orgit markdown-mode gitignore-mode flycheck farmhouse-theme company badwolf-theme auctex-latexmk auctex popup avy highlight helm helm-core package-build bind-key evil ws-butler persp-mode lorem-ipsum hl-todo help-fns+ evil-indent-plus ace-jump-helm-line bind-map zonokai-theme zenburn-theme zen-and-art-theme xkcd 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 sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spray spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle simple-mpc shell-pop seti-theme reverse-theme restart-emacs ranger rainbow-delimiters quelpa pyvenv pytest pyenv-mode purple-haze-theme professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme pcre2el pastels-on-dark-theme paradox page-break-lines organic-green-theme org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets open-junk-file oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc magit-gitflow macrostep lush-theme 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 highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gitignore helm-flyspell 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 gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md gandalf-theme flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator 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-jumper evil-indent-textobject evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help erc-yt erc-view-log erc-social-graph erc-image erc-hl-nicks emacs-eclim elisp-slime-nav django-theme disaster define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-statistics company-quickhelp company-c-headers company-auctex company-anaconda colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized cmake-mode clues-theme clean-aindent-mode clang-format circe cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme birds-of-paradise-plus-theme auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ac-ispell)))) -(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-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) - '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil))))) -- 2.20.1 From 6f29ca436e612f9a0e089dcb17846eb088c1ac2d Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 13 Feb 2016 19:43:54 -0500 Subject: [PATCH 15/16] [spacemacs] use bigger font & slant powerline --- spacemacs/.spacemacs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index a375541..2aaefbe 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -111,10 +111,10 @@ values." ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. dotspacemacs-default-font '("Source Code Pro" - :size 13 + :size 14 :weight normal :width normal - :powerline-scale 1.1) + :powerline-scale 1.6) ;; The leader key dotspacemacs-leader-key "SPC" ;; The leader key accessible in `emacs state' and `insert state' @@ -252,6 +252,7 @@ in `dotspacemacs/user-config'." "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." + (setq powerline-default-separator 'slant) ) ;; Do not write anything past this comment. This is where Emacs will -- 2.20.1 From 398896808d9cae13f91c550d19acfab435caa8e8 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 13 Feb 2016 20:10:14 -0500 Subject: [PATCH 16/16] [spacemacs] add some layers and stuff from before enable some layers, re-add some configurations and comments also, TODO: think about whether to use a separate custom.el file or not --- spacemacs/.spacemacs | 67 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/spacemacs/.spacemacs b/spacemacs/.spacemacs index 2aaefbe..e6874eb 100644 --- a/spacemacs/.spacemacs +++ b/spacemacs/.spacemacs @@ -27,17 +27,19 @@ values." ;; (Emacs style) to install them. ;; ---------------------------------------------------------------- spacemacs-helm - ;; auto-completion + auto-completion ;; better-defaults emacs-lisp - ;; git - ;; markdown - ;; org - ;; (shell :variables - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;; spell-checking - ;; syntax-checking + git + latex + markdown + org + rust + (shell :variables + shell-default-height 30 + shell-default-position 'bottom) + spell-checking + syntax-checking ;; version-control ) ;; List of additional packages that will be installed without being @@ -239,6 +241,8 @@ values." ;; delete only whitespace for changed lines or `nil' to disable cleanup. ;; (default nil) dotspacemacs-whitespace-cleanup nil + ;; Disable setting the cursor color according to states + ;; dotspacemacs-colorize-cursor-according-to-state nil )) (defun dotspacemacs/user-init () @@ -253,7 +257,52 @@ in `dotspacemacs/user-config'." This function is called at the very end of Spacemacs initialization after layers configuration. You are free to put any user code." (setq powerline-default-separator 'slant) + + ;; (setq undo-tree-auto-save-history t + ;; undo-tree-history-directory-alist + ;; `(("." . ,(concat spacemacs-cache-directory "undo")))) + ;; (unless (file-exists-p (concat spacemacs-cache-directory "undo")) + ;; (make-directory (concat spacemacs-cache-directory "undo"))) + + ;; Use pdflatex instead of latex + (setq TeX-PDF-mode t) + + ;; Support zathura in TeX mode + (setq TeX-view-program-selection + '(((output-dvi style-pstricks) + "dvips and gv") + (output-dvi "xdvi") + (output-pdf "zathura") + (output-html "xdg-open"))) + (setq TeX-view-program-list + '(("zathura" + ("zathura" (mode-io-correlate "-sync.sh") + " " + (mode-io-correlate "%n:1:%t ") + "%o")))) + + ;; Swap : and ; + (define-key evil-motion-state-map ";" 'evil-ex) + (define-key evil-motion-state-map ":" 'evil-repeat-find-char) + + ;; Set the erc nick completion postfix to ", " + ;; (setq erc-pcomplete-nick-postfix ", ") ) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. +(custom-set-variables + ;; custom-set-variables 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. + '(package-selected-packages + (quote + (toml-mode rustfmt racer flycheck-rust company-auctex auctex-latexmk auctex xterm-color toc-org shell-pop org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets multi-term mmm-mode markdown-toc markdown-mode htmlize helm-flyspell helm-company helm-c-yasnippet gnuplot gh-md flycheck-pos-tip flycheck eshell-z eshell-prompt-extras esh-help company-statistics company-quickhelp company auto-yasnippet auto-dictionary ac-ispell smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger evil-magit ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe use-package spacemacs-theme spaceline smooth-scrolling restart-emacs rainbow-delimiters quelpa popwin persp-mode pcre2el paradox page-break-lines open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint leuven-theme info+ indent-guide ido-vertical-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery f 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-lisp-state evil-jumper evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav define-word clean-aindent-mode buffer-move bracketed-paste auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line)))) +(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-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) + '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil))))) -- 2.20.1