Bunch of dotfile changes
This commit is contained in:
parent
77913cf17a
commit
6be00ffea2
10 changed files with 228 additions and 387 deletions
2
glances.conf
Normal file
2
glances.conf
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
[network]
|
||||||
|
hide=lo,awdl0,p2p0,utun0,bridge0
|
||||||
167
khal.conf
167
khal.conf
|
|
@ -1,164 +1,9 @@
|
||||||
#/etc/khal/khal.conf.sample
|
[locale]
|
||||||
#
|
timeformat = %H:%M
|
||||||
# The default configuration file locations are:
|
dateformat = %m-%d
|
||||||
# ~/.khal/khal.conf
|
longdateformat = %Y-%m-%d
|
||||||
# ~/.config/khal/khal.conf
|
datetimeformat = %m-%d %H:%M
|
||||||
#
|
longdatetimeformat = %Y-%m-%d %H:%M
|
||||||
# In this file you need to specify:
|
|
||||||
# - CalDAV Account settings
|
|
||||||
# - khal SQLite3 Database settings
|
|
||||||
# - Timezone and Time Display Formating Interface settings
|
|
||||||
# - Debug level
|
|
||||||
#
|
|
||||||
# Look at the end of this file for an example config.
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# ## CalDAV Account Configuration ##
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# [Account home]
|
|
||||||
# # Each Account configuration must start with an Account Tag
|
|
||||||
# # Each Account Tag must be unique
|
|
||||||
#
|
|
||||||
# server_type: caldav
|
|
||||||
# # Set the protocol khal should use
|
|
||||||
# # * Default: caldav
|
|
||||||
# #
|
|
||||||
# # server_type: http
|
|
||||||
# # Setting the server_type to http makes this a simple read only resource
|
|
||||||
# # * user: and password: can still be set if needed
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# user: stallman
|
|
||||||
# # Username to access the CalDAV Account
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# password: GodSexLoveSecret
|
|
||||||
# # You can place your plain-text password here
|
|
||||||
# # If the password is not specified it will be asked for while syncing
|
|
||||||
# # If pykeychain is installed, it will store the passwords
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# resource: https://exmaple.com/davical/caldav.php/jdoe/home/
|
|
||||||
# # Specify the URL for the CalDAV Calendar
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# color: dark blue
|
|
||||||
# # Set the color for this CalDAV Account
|
|
||||||
# # If color is not set, events will be in your default terminal color
|
|
||||||
# # * Colors may not be what you expect by their name.
|
|
||||||
# # * Your terminal's terminfo and termcap define these values.
|
|
||||||
# #
|
|
||||||
# # Supported color names:
|
|
||||||
# # 'black' 'white' 'brown' 'yellow'
|
|
||||||
# # 'dark grey' 'dark green' 'dark blue'
|
|
||||||
# # 'light grey' 'light green' 'light blue'
|
|
||||||
# # 'dark magenta' 'dark cyan' 'dark red'
|
|
||||||
# # 'light magenta' 'light cyan''light red'
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# ssl_verify: True
|
|
||||||
# # SSL Certificate Verification
|
|
||||||
# # This setting is unique for each account
|
|
||||||
# #
|
|
||||||
# # ssl_verify: True
|
|
||||||
# # The servers SSL Certificate will be verified.
|
|
||||||
# # If verification fails the account will not be synchronized
|
|
||||||
# # * Default: True
|
|
||||||
# #
|
|
||||||
# # ssl_verify: False
|
|
||||||
# # SSL Certificate Verification will be disabled for this account.
|
|
||||||
# #
|
|
||||||
# # ssl_verify: /etc/ssl/certs/3b015462.0
|
|
||||||
# # Specify the CA Certificate used to sign the CalDAV Server's SSL Certificate
|
|
||||||
# # This is useful when using a Self Signed Certificate, or Corporate PKI
|
|
||||||
# ######
|
|
||||||
# ## Install SSL Certificate Authority Certificate to Trusted Key Store
|
|
||||||
# ## * See, `man update-ca-certificates`
|
|
||||||
# #
|
|
||||||
# ## Create a directory for the CA Issuer in: /usr/local/share/ca-certificates
|
|
||||||
# # mkdir -p /usr/local/share/ca-certificates/MyCACerts
|
|
||||||
# #
|
|
||||||
# ## Copy the PEM encoded CA Certificates into the directory.
|
|
||||||
# ## * Make sure to name the Certificates with extension: .crt
|
|
||||||
# # cp MyCACertificate.crt /usr/local/share/ca-certificates/MyCACerts
|
|
||||||
# #
|
|
||||||
# ## Add/Update SSL Trusted Key Store with: update-ca-certificates
|
|
||||||
# ## This utility should have been installed along with OpenSSL
|
|
||||||
# # update-ca-certificates --verbose
|
|
||||||
# #
|
|
||||||
# ## You will need the Certificate Hash for the new CA Certificate
|
|
||||||
# # _C_HASH=`locate c_hash |grep ssl/misc`
|
|
||||||
# # chmod +x ${_C_HASH}
|
|
||||||
# # ${_C_HASH} /usr/local/share/ca-certificates/MyCACert/MyCACertificate.crt
|
|
||||||
# #
|
|
||||||
# ## Almost done ;)
|
|
||||||
# ## Now you can add the, verify: line for this CalDAV Account
|
|
||||||
# ## The file name will be the Certificate Hash
|
|
||||||
# ## The Path will be, /etc/ssl/certs
|
|
||||||
# #
|
|
||||||
# # ssl_verify: /etc/ssl/certs/21c04162.0
|
|
||||||
# #
|
|
||||||
# ######
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# ## khal SQLite3 Database Configuration ##
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# [sqlite]
|
|
||||||
# # This configuration file must have a [sqlite] Tag
|
|
||||||
#
|
|
||||||
# path: ~/.khal/khal.db
|
|
||||||
# # This specifies the location of the khal SQLite3 Database file
|
|
||||||
# # * Default: ~/.local/share/khal/khal.db
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# ## Time Zone and Time Display Formating Configuration ##
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# [default]
|
|
||||||
# # This configuration file must have a [default] Tag
|
|
||||||
#
|
|
||||||
# local_timezone: Pacific/Honolulu
|
|
||||||
# # Set the Local Timezone
|
|
||||||
# # * All date are shown in the Local Timezone
|
|
||||||
#
|
|
||||||
# default_timezone: Pacific/Honolulu
|
|
||||||
# # Set the Default Timezone
|
|
||||||
# # The Default Timezone is used for new events added via khal --new
|
|
||||||
# # It is also used if vCal datetime's timezone is not understood
|
|
||||||
# #
|
|
||||||
#
|
|
||||||
# timeformat: %H:%M
|
|
||||||
# dateformat: %m-%d
|
|
||||||
# longdateformat: %Y-%m-%d
|
|
||||||
# datetimeformat: %m-%d %H:%M
|
|
||||||
# longdatetimeformat: %Y-%m-%d %H:%M
|
|
||||||
# # Set the format Time and Date should be displayed in by khal
|
|
||||||
# # * Long version should contain the current year
|
|
||||||
# #
|
|
||||||
# # Specify date/time in standard strftime format
|
|
||||||
# # http://strftime.net/
|
|
||||||
# # * Example date in ISO-8601 format, "American"
|
|
||||||
#
|
|
||||||
# encoding: utf-8
|
|
||||||
# # Enable UTF-8 encoding
|
|
||||||
# # * Set this if your terminal is using to utf-8
|
|
||||||
#
|
|
||||||
# unicode_symbols: True
|
|
||||||
# # Enable unicode symbols to display event properties
|
|
||||||
# # Set this to False if your terminal's character set dose not support them
|
|
||||||
# # * Default: True
|
|
||||||
#
|
|
||||||
# firstweekday: 6
|
|
||||||
# # Set the first day of the week, 0 is Monday, 6 is Sunday
|
|
||||||
#
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
# ## Debug Level ##
|
|
||||||
#------------------------------------------------------------------------------
|
|
||||||
#
|
|
||||||
# DEBUG: 0
|
|
||||||
# # Specify the Default Debug level (only 0 and 1 are supported at the moment)
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
[calendars]
|
[calendars]
|
||||||
[[Dustin Swan]]
|
[[Dustin Swan]]
|
||||||
|
|
|
||||||
33
khard.conf
Normal file
33
khard.conf
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
[addressbooks]
|
||||||
|
[[contacts]]
|
||||||
|
path = ~/Contacts/Default
|
||||||
|
|
||||||
|
[general]
|
||||||
|
debug = no
|
||||||
|
default_action = list
|
||||||
|
editor = vim
|
||||||
|
merge_editor = vimdiff
|
||||||
|
|
||||||
|
[contact table]
|
||||||
|
# display names by first or last name: first_name / last_name
|
||||||
|
display = first_name
|
||||||
|
# group by address book: yes / no
|
||||||
|
group_by_addressbook = no
|
||||||
|
# reverse table ordering: yes / no
|
||||||
|
reverse = no
|
||||||
|
# append nicknames to name column: yes / no
|
||||||
|
show_nicknames = no
|
||||||
|
# show uid table column: yes / no
|
||||||
|
show_uids = yes
|
||||||
|
# sort by first or last name: first_name / last_name
|
||||||
|
sort = last_name
|
||||||
|
|
||||||
|
[vcard]
|
||||||
|
# private_objects = Jabber, Skype, Twitter
|
||||||
|
private_objects = Jabber, Skype, Twitter
|
||||||
|
# preferred vcard version: 3.0 / 4.0
|
||||||
|
preferred_version = 3.0
|
||||||
|
# Look into source vcf files to speed up search queries: yes / no
|
||||||
|
search_in_source_files = no
|
||||||
|
# skip unparsable vcard files: yes / no
|
||||||
|
skip_unparsable = no
|
||||||
2
muttrc
2
muttrc
|
|
@ -7,7 +7,7 @@ set realname='Dustin Swan'
|
||||||
set sendmail="/usr/local/bin/msmtp"
|
set sendmail="/usr/local/bin/msmtp"
|
||||||
|
|
||||||
set edit_headers=yes
|
set edit_headers=yes
|
||||||
set folder=~/Mail
|
# set folder=~/Mail
|
||||||
set mbox=+mbox
|
set mbox=+mbox
|
||||||
set spoolfile=+inbox
|
set spoolfile=+inbox
|
||||||
set record=+sent
|
set record=+sent
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,8 @@ remoteuser = dswan@insors.com
|
||||||
remotepasseval = decrypt_password(".iocom-password.gpg")
|
remotepasseval = decrypt_password(".iocom-password.gpg")
|
||||||
realdelete = no
|
realdelete = no
|
||||||
ssl = yes
|
ssl = yes
|
||||||
sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
# sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
||||||
|
sslcacertfile = /usr/local/etc/openssl/cert.pem
|
||||||
|
|
||||||
[Account FastMail]
|
[Account FastMail]
|
||||||
localrepository = FastMailLocal
|
localrepository = FastMailLocal
|
||||||
|
|
@ -34,6 +35,6 @@ remotehost = mail.messagingengine.com
|
||||||
remoteuser = dustinswan@fastmail.com
|
remoteuser = dustinswan@fastmail.com
|
||||||
remotepasseval = decrypt_password(".dustinswan@fastmail.com-password.gpg")
|
remotepasseval = decrypt_password(".dustinswan@fastmail.com-password.gpg")
|
||||||
realdelete = no
|
realdelete = no
|
||||||
# sslcacertfile=/usr/local/etc/openssl/osx_cert.pem
|
# sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
||||||
sslcacertfile = ~/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
sslcacertfile = /usr/local/etc/openssl/cert.pem
|
||||||
ssl = yes
|
ssl = yes
|
||||||
|
|
|
||||||
154
spacemacs
154
spacemacs
|
|
@ -22,11 +22,11 @@ values."
|
||||||
github
|
github
|
||||||
perforce
|
perforce
|
||||||
syntax-checking
|
syntax-checking
|
||||||
spell-checking
|
(spell-checking :variables spell-checking-enable-auto-dictionary t)
|
||||||
better-defaults
|
better-defaults
|
||||||
osx
|
osx
|
||||||
nixos
|
;; nixos
|
||||||
(mu4e :variables mu4e-installation-path "/usr/local/share/emacs/site-lisp/mu/mu4e")
|
(mu4e :variables mu4e-installation-path "/usr/local/share/emacs/site-lisp/mu/mu4e" mu4e-enable-notifications t mu4e-enable-mode-line t)
|
||||||
(ranger :variables ranger-show-preview t)
|
(ranger :variables ranger-show-preview t)
|
||||||
speed-reading
|
speed-reading
|
||||||
auto-completion
|
auto-completion
|
||||||
|
|
@ -34,13 +34,17 @@ values."
|
||||||
restclient
|
restclient
|
||||||
evil-snipe
|
evil-snipe
|
||||||
vinegar
|
vinegar
|
||||||
unimpaired
|
|
||||||
eyebrowse
|
|
||||||
search-engine
|
search-engine
|
||||||
erc
|
(erc :variables
|
||||||
|
erc-server-list
|
||||||
|
'(("irc.freenode.net"
|
||||||
|
:port "6697"
|
||||||
|
:ssl t
|
||||||
|
:nick "dustinswan")))
|
||||||
(org :variables org-enable-github-support t)
|
(org :variables org-enable-github-support t)
|
||||||
;; (shell :variables shell-default-shell 'eshell shell-default-term-shell "/bin/bash")
|
deft
|
||||||
(shell :variables shell-default-term-shell "/Users/dustinswan/.nix-profile/bin/zsh")
|
;; (shell :variables shell-default-term-shell "/Users/dustinswan/.nix-profile/bin/zsh")
|
||||||
|
(shell :variables shell-default-term-shell "/usr/local/bin/zsh" shell-default-shell 'multi-term)
|
||||||
xkcd
|
xkcd
|
||||||
spotify
|
spotify
|
||||||
finance
|
finance
|
||||||
|
|
@ -69,16 +73,18 @@ values."
|
||||||
ruby-on-rails
|
ruby-on-rails
|
||||||
python
|
python
|
||||||
markdown
|
markdown
|
||||||
|
pandoc
|
||||||
yaml
|
yaml
|
||||||
extra-langs
|
extra-langs
|
||||||
latex
|
latex
|
||||||
tumblesocks
|
twitter
|
||||||
|
games
|
||||||
)
|
)
|
||||||
;; List of additional packages that will be installed without being
|
;; List of additional packages that will be installed without being
|
||||||
;; wrapped in a layer. If you need some configuration for these
|
;; wrapped in a layer. If you need some configuration for these
|
||||||
;; packages, then consider creating a layer. You can also put the
|
;; packages, then consider creating a layer. You can also put the
|
||||||
;; configuration in `dotspacemacs/user-config'.
|
;; configuration in `dotspacemacs/user-config'.
|
||||||
dotspacemacs-additional-packages '(hackernews twittering-mode el-pocket chess wttrin mingus)
|
dotspacemacs-additional-packages '(hackernews chess wttrin mingus tumblesocks writeroom-mode beacon org-journal vdirel)
|
||||||
;; A list of packages and/or extensions that will not be install and loaded.
|
;; A list of packages and/or extensions that will not be install and loaded.
|
||||||
dotspacemacs-excluded-packages '(toxi-theme)
|
dotspacemacs-excluded-packages '(toxi-theme)
|
||||||
;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
|
;; If non-nil spacemacs will delete any orphan packages, i.e. packages that
|
||||||
|
|
@ -276,10 +282,7 @@ in `dotspacemacs/user-config'."
|
||||||
(setq-default git-enable-github-support t)
|
(setq-default git-enable-github-support t)
|
||||||
|
|
||||||
(add-to-list 'exec-path "~/.local/bin/")
|
(add-to-list 'exec-path "~/.local/bin/")
|
||||||
|
(add-to-list 'exec-path "~/.npm-packages/bin/")
|
||||||
(setq-default ispell-program-name "aspell")
|
|
||||||
;; (setq-default ispell-dictionary "english")
|
|
||||||
(setq with-editor-emacsclient-executable "/Users/dustinswan/.nix-profile/bin/emacs")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
(defun dotspacemacs/user-config ()
|
(defun dotspacemacs/user-config ()
|
||||||
|
|
@ -287,14 +290,15 @@ in `dotspacemacs/user-config'."
|
||||||
This function is called at the very end of Spacemacs initialization after
|
This function is called at the very end of Spacemacs initialization after
|
||||||
layers configuration. You are free to put any user code."
|
layers configuration. You are free to put any user code."
|
||||||
|
|
||||||
|
(beacon-mode 1)
|
||||||
|
|
||||||
|
(setq ns-use-srgb-colorspace nil)
|
||||||
|
|
||||||
(setq powerline-default-separator 'arrow-fade)
|
(setq powerline-default-separator 'arrow-fade)
|
||||||
|
|
||||||
(eyebrowse-setup-opinionated-keys)
|
(setq vdirel-repository "~/Contacts/Default/")
|
||||||
|
|
||||||
;; (add-hook 'doc-view-mode-hook 'auto-revert-mode)
|
|
||||||
;; (setq org-default-notes-file (concat org-directory "~/Dropbox/Org/org.org"))
|
|
||||||
(setq org/prefix-arg-directory "/Users/dustinswan/Sync/Org/")
|
|
||||||
|
|
||||||
|
;; Mail
|
||||||
(setq mu4e-account-alist
|
(setq mu4e-account-alist
|
||||||
'(("FastMail"
|
'(("FastMail"
|
||||||
(mu4e-sent-messages-behavior sent)
|
(mu4e-sent-messages-behavior sent)
|
||||||
|
|
@ -321,18 +325,18 @@ layers configuration. You are free to put any user code."
|
||||||
"dswan@iocom.com"
|
"dswan@iocom.com"
|
||||||
"dswan@insors.com")
|
"dswan@insors.com")
|
||||||
mu4e-get-mail-command "offlineimap -q"
|
mu4e-get-mail-command "offlineimap -q"
|
||||||
mu4e-update-interval 120
|
mu4e-update-interval 180
|
||||||
mu4e-compose-signature-auto-include nil
|
mu4e-compose-signature-auto-include nil
|
||||||
|
|
||||||
;; Viewing Mail
|
;; Viewing Mail
|
||||||
mu4e-headers-show-threads t
|
mu4e-headers-show-threads t
|
||||||
mu4e-attachment-dir "~/Downloads"
|
mu4e-attachment-dir "~/Downloads"
|
||||||
mu4e-view-show-images t
|
|
||||||
mu4e-view-show-addresses t
|
mu4e-view-show-addresses t
|
||||||
|
mu4e-view-show-images t
|
||||||
mu4e-view-prefer-html t
|
mu4e-view-prefer-html t
|
||||||
mu4e-html2text-command 'mu4e-shr2text
|
;; mu4e-html2text-command 'mu4e-shr2text
|
||||||
mu4e-html2text-command "w3m -dump -T text/html"
|
mu4e-html2text-command "w3m -dump -T text/html"
|
||||||
w3m-command "/usr/bin/w3m"
|
w3m-command "/usr/local/bin/w3m"
|
||||||
|
|
||||||
;; Sending Mail
|
;; Sending Mail
|
||||||
message-send-mail-function 'message-send-mail-with-sendmail
|
message-send-mail-function 'message-send-mail-with-sendmail
|
||||||
|
|
@ -362,16 +366,27 @@ layers configuration. You are free to put any user code."
|
||||||
mu4e-maildir-shortcuts) " OR ")
|
mu4e-maildir-shortcuts) " OR ")
|
||||||
"All inboxes" ?i)))
|
"All inboxes" ?i)))
|
||||||
|
|
||||||
;; (require 'mu4e-alert)
|
(setq message-kill-buffer-on-exit t)
|
||||||
;; (mu4e-alert-set-default-style 'notifier)
|
|
||||||
;; (add-hook 'after-init-hook #'mu4e-alert-enable-notifications)
|
(with-eval-after-load 'mu4e-alert
|
||||||
;; (add-hook 'after-init-hook #'mu4e-alert-enable-mode-line-display)
|
(mu4e-alert-set-default-style 'notifier))
|
||||||
|
|
||||||
|
(setq mu4e-alert-interesting-mail-query
|
||||||
|
(concat
|
||||||
|
"flag:unread"
|
||||||
|
" AND NOT flag:trashed"
|
||||||
|
" AND (maildir:/Fastmail/INBOX"
|
||||||
|
" OR maildir:/IOCOM/INBOX)"
|
||||||
|
))
|
||||||
|
|
||||||
(setenv "PYTHONPATH" "/usr/local/lib/python2.7/site-packages") ;; Needed to find offlineimap's libs
|
|
||||||
(setenv "P4USER" "dswan")
|
(setenv "P4USER" "dswan")
|
||||||
(setenv "P4PORT" "humu.insors.net:1666")
|
(setenv "P4PORT" "humu.insors.net:1666")
|
||||||
(setenv "P4CONFIG" "p4.cfg")
|
(setenv "P4CONFIG" "p4.cfg")
|
||||||
(setq exec-path (append exec-path '("~/.nix-profile/bin")))
|
|
||||||
|
(setenv "LANG" "en_US.UTF-8")
|
||||||
|
|
||||||
|
;; (setq exec-path (append exec-path '("~/.nix-profile/bin")))
|
||||||
|
|
||||||
|
|
||||||
;; (when (configuration-layer/layer-usedp 'haskell)
|
;; (when (configuration-layer/layer-usedp 'haskell)
|
||||||
;; (add-hook 'haskell-interactive-mode-hook
|
;; (add-hook 'haskell-interactive-mode-hook
|
||||||
|
|
@ -383,7 +398,7 @@ layers configuration. You are free to put any user code."
|
||||||
;; (format-time-string "%a %Y/%m/%d %H:%M"))
|
;; (format-time-string "%a %Y/%m/%d %H:%M"))
|
||||||
;; (add-to-list 'spaceline-right 'date-time-segment)
|
;; (add-to-list 'spaceline-right 'date-time-segment)
|
||||||
|
|
||||||
;; (fancy-battery-mode)
|
(fancy-battery-mode)
|
||||||
|
|
||||||
;(org-babel-do-load-languages
|
;(org-babel-do-load-languages
|
||||||
; 'org-babel-load-languages
|
; 'org-babel-load-languages
|
||||||
|
|
@ -399,49 +414,39 @@ layers configuration. You are free to put any user code."
|
||||||
ranger-parent-depth 4
|
ranger-parent-depth 4
|
||||||
ranger-max-preview-size 10)
|
ranger-max-preview-size 10)
|
||||||
|
|
||||||
(spacemacs|define-custom-layout "Mail" :binding "m" :body (mu4e))
|
(require 'tumblesocks)
|
||||||
(spacemacs|define-custom-layout "Twitter" :binding "t" :body (twit))
|
(setq tumblesocks-blog "dustinswan.tumblr.com")
|
||||||
|
;; (eval-after-load 'tumblesocks-view-mode
|
||||||
|
;; '(progn
|
||||||
|
;; ;; (define-key twittering-mode-map (kbd "g") nil)
|
||||||
|
;; (define-key tumblesocks-view-mode-map (kbd "j") 'tumblesocks-view-next-post)
|
||||||
|
;; (define-key tumblesocks-view-mode-map (kbd "k") 'tumblesocks-view-prev-post)
|
||||||
|
;; ))
|
||||||
|
|
||||||
;; TODO remove after Spacemacs gets twittering-mode
|
;; Org
|
||||||
(require 'twittering-mode)
|
(with-eval-after-load 'org
|
||||||
(setq twittering-use-master-password t)
|
|
||||||
(eval-after-load 'twittering-mode
|
|
||||||
'(progn
|
|
||||||
(define-key twittering-mode-map (kbd "g") nil)
|
|
||||||
(define-key twittering-mode-map (kbd "g g") 'twittering-goto-first-status)
|
|
||||||
(define-key twittering-mode-map (kbd "c") 'twittering-current-timeline)
|
|
||||||
(define-key twittering-mode-map (kbd "C-d") 'twittering-scroll-up)
|
|
||||||
(define-key twittering-mode-map (kbd "C-u") 'twittering-scroll-down)
|
|
||||||
(define-key twittering-mode-map (kbd "/") 'evil-search-forward)
|
|
||||||
(define-key twittering-mode-map (kbd "?") 'evil-search-backward)
|
|
||||||
(define-key twittering-mode-map (kbd "n") 'evil-search-next)
|
|
||||||
(define-key twittering-mode-map (kbd "N") 'evil-search-previous)
|
|
||||||
(define-key twittering-edit-mode-map [escape] 'twittering-edit-cancel-status)
|
|
||||||
(define-key twittering-mode-map (kbd "<tab>") 'twittering-goto-next-uri)
|
|
||||||
;; make evil leader key work in twittering-mode
|
|
||||||
;; (add-to-list 'evil-leader/no-prefix-mode-rx "twittering-mode")
|
|
||||||
;; display icons
|
|
||||||
(setq twittering-icon-mode t)
|
|
||||||
;; the default size is 48 which I find too large
|
|
||||||
;; this requires imagemagick to be installed
|
|
||||||
(if (executable-find "convert")
|
|
||||||
(setq twittering-convert-fix-size 32))
|
|
||||||
;; This requires gzip. The icons are saved on ~/.twittering-mode-icons.gz,
|
|
||||||
;; which can be changed by the variable twittering-icon-storage-file
|
|
||||||
(if (executable-find "gzip")
|
|
||||||
(setq twittering-use-icon-storage t))
|
|
||||||
;; requires GnuPG to be installed
|
|
||||||
(if (executable-find "gpg")
|
|
||||||
(setq twittering-use-master-password t))))
|
|
||||||
|
|
||||||
;; (require 'tumblesocks)
|
(setq org-agenda-files '("~/Sync/Notes"
|
||||||
;; (setq tumblesocks-blog "dustinswan.tumblr.com")
|
"~/Sync/org.org"
|
||||||
;; (eval-after-load 'tumblesocks-view-mode
|
"~/Sync/IOCOM/IOCOM.org"))
|
||||||
;; '(progn
|
(setq org-directory "~/Sync/Notes/")
|
||||||
;; ;; (define-key twittering-mode-map (kbd "g") nil)
|
|
||||||
;; (define-key tumblesocks-view-mode-map (kbd "j") 'tumblesocks-view-next-post)
|
;; Org Journal
|
||||||
;; (define-key tumblesocks-view-mode-map (kbd "k") 'tumblesocks-view-prev-post)
|
(setq org-journal-dir "~/Sync/Notes/"
|
||||||
;; ))
|
org-journal-file-format "%Y%m%d.org")
|
||||||
|
(evil-leader/set-key "aj" 'org-journal-new-entry)
|
||||||
|
(setq org-journal-date-format "%A, %B %d, %Y")
|
||||||
|
(setq org-journal-time-format "%R %Z")
|
||||||
|
|
||||||
|
(evil-leader/set-key-for-mode 'org-journal-mode
|
||||||
|
"mn" 'org-journal-open-next-entry
|
||||||
|
"mp" 'org-journal-open-previous-entry)
|
||||||
|
|
||||||
|
(add-hook 'org-journal-mode-hook 'turn-on-auto-fill)
|
||||||
|
(add-hook 'org-journal-mode-hook 'flyspell-mode)
|
||||||
|
|
||||||
|
;; Deft
|
||||||
|
(setq deft-directory "~/Sync/Notes")
|
||||||
|
|
||||||
;; Org Publish stuff
|
;; Org Publish stuff
|
||||||
(require 'ox-html)
|
(require 'ox-html)
|
||||||
|
|
@ -517,12 +522,15 @@ layers configuration. You are free to put any user code."
|
||||||
:recursive t
|
:recursive t
|
||||||
:publishing-function org-publish-attachment
|
:publishing-function org-publish-attachment
|
||||||
)))
|
)))
|
||||||
|
)
|
||||||
|
|
||||||
(setq wttrin-default-cities '("Moriarty NM" "Albuquerque" "Chicago"))
|
(setq wttrin-default-cities '("Moriarty NM" "Albuquerque" "Chicago"))
|
||||||
|
|
||||||
(setq tramp-default-method "ssh")
|
(setq tramp-default-method "ssh")
|
||||||
|
|
||||||
(push '("*mingus" . emacs) evil-buffer-regexps)
|
(push '("*mingus" . emacs) evil-buffer-regexps)
|
||||||
|
|
||||||
|
(setq twittering-use-master-password t)
|
||||||
)
|
)
|
||||||
|
|
||||||
;; Do not write anything past this comment. This is where Emacs will
|
;; Do not write anything past this comment. This is where Emacs will
|
||||||
|
|
@ -544,8 +552,8 @@ layers configuration. You are free to put any user code."
|
||||||
'(fancy-battery-mode t)
|
'(fancy-battery-mode t)
|
||||||
'(js2-basic-offset 2)
|
'(js2-basic-offset 2)
|
||||||
'(mac-auto-operator-composition-mode t)
|
'(mac-auto-operator-composition-mode t)
|
||||||
'(org-agenda-files (quote ("~/Sync/Org/org.org")))
|
'(org-journal-date-format "%A, %B %d, %Y")
|
||||||
'(org-directory "~/Sync/Org/")
|
'(org-journal-time-format "%R %Z")
|
||||||
'(paradox-github-token t)
|
'(paradox-github-token t)
|
||||||
'(ring-bell-function (quote ignore) t))
|
'(ring-bell-function (quote ignore) t))
|
||||||
(custom-set-faces
|
(custom-set-faces
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,8 @@ rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/
|
||||||
rm ~/.jrnl_config; ln -s ~/dotfiles/jrnl_config ~/.jrnl_config
|
rm ~/.jrnl_config; ln -s ~/dotfiles/jrnl_config ~/.jrnl_config
|
||||||
rm ~/.gnupg/gpg-agent.conf; mkdir ~/.gnupg; ln -s ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
|
rm ~/.gnupg/gpg-agent.conf; mkdir ~/.gnupg; ln -s ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
|
||||||
mkdir -p ~/.ssh; rm ~/.ssh/config; ln -s ~/dotfiles/ssh/config ~/.ssh/config
|
mkdir -p ~/.ssh; rm ~/.ssh/config; ln -s ~/dotfiles/ssh/config ~/.ssh/config
|
||||||
|
rm ~/Library/Application\ Support/glances/glances.conf; mkdir ~/Library/Application\ Support/glances; ln -s ~/dotfiles/glances.conf ~/Library/Application\ Support/glances/glances.conf
|
||||||
|
rm ~/.config/khard/khard.conf; mkdir ~/.config/khard; ln -s ~/dotfiles/khard.conf ~/.config/khard/khard.conf
|
||||||
|
|
||||||
# Mail stuff
|
# Mail stuff
|
||||||
rm ~/.offlineimaprc; ln -s ~/dotfiles/offlineimaprc ~/.offlineimaprc
|
rm ~/.offlineimaprc; ln -s ~/dotfiles/offlineimaprc ~/.offlineimaprc
|
||||||
|
|
|
||||||
|
|
@ -1,65 +1,30 @@
|
||||||
# An example configuration for vdirsyncer.
|
|
||||||
# Optional parameters are commented out.
|
|
||||||
|
|
||||||
[general]
|
[general]
|
||||||
# A folder where vdirsyncer can store some metadata about each pair.
|
|
||||||
status_path = ~/.vdirsyncer/status/
|
status_path = ~/.vdirsyncer/status/
|
||||||
|
|
||||||
# CONTACTS
|
[pair fastmail_contacts]
|
||||||
#[pair google_contacts]
|
a = fastmail_contacts_local
|
||||||
## A `[pair <name>]` block defines two storages `a` and `b` that should be
|
b = fastmail_contacts_remote
|
||||||
## synchronized. The definition of these storages follows in `[storage <name>]`
|
collections = ["from b"]
|
||||||
## blocks. This is similar to accounts in OfflineIMAP.
|
conflict_resolution = b wins
|
||||||
#a = google_contacts_local
|
|
||||||
#b = google_contacts_remote
|
|
||||||
|
|
||||||
## If you want to synchronize several addressbooks, calendars etc that share
|
[storage fastmail_contacts_local]
|
||||||
## the same storage location and differ only in a suffix to this location
|
type = filesystem
|
||||||
## (i.e., a subdirectory) you can use collections. The comma-separated values
|
path = ~/Contacts/
|
||||||
## in this parameter represent these subdirectories and are added as URL
|
fileext = .vcf
|
||||||
## segments or similar.
|
|
||||||
|
|
||||||
## Together with the definition of the following two `[storage]` blocks below
|
[storage fastmail_contacts_remote]
|
||||||
## in this example it means that
|
type = carddav
|
||||||
## - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/default/
|
url = https://carddav.messagingengine.com
|
||||||
## will get synced with ~/.contacts/default/
|
auth = basic
|
||||||
## - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/work/
|
username = dustinswan@fastmail.com
|
||||||
## will get synced with ~/.contacts/work/
|
password.fetch = ["command", "~/dotfiles/bin/decrypt_password.sh", "dustinswan@fastmail.com"]
|
||||||
|
|
||||||
## Omitting this parameter implies that the given path and URL in the
|
|
||||||
## corresponding `[storage <name>]` blocks are already pointing to a
|
|
||||||
## collection each.
|
|
||||||
##collections = default,work
|
|
||||||
|
|
||||||
## conflict_resolution = None # abort when collisions occur (default)
|
|
||||||
## conflict_resolution = a wins # assume a's items to be more up-to-date
|
|
||||||
## conflict_resolution = b wins # assume b's items to be more up-to-date
|
|
||||||
|
|
||||||
#[storage google_contacts_local]
|
|
||||||
## A storage references actual data on a remote server or on the local disk.
|
|
||||||
## Similar to repositories in OfflineIMAP.
|
|
||||||
#type = filesystem
|
|
||||||
#path = ~/.contacts/
|
|
||||||
#fileext = .vcf
|
|
||||||
#create = True # create directory if it doesn't exist
|
|
||||||
#encoding = utf-8
|
|
||||||
|
|
||||||
#[storage google_contacts_remote]
|
|
||||||
#type = carddav
|
|
||||||
#url = http://google.com
|
|
||||||
##auth = basic # basic|digest
|
|
||||||
#username = dustinswan@gmail.com # for http auth, if empty, no auth will be used
|
|
||||||
|
|
||||||
#true: The NSA can spy on you with some effort
|
|
||||||
#false: Everybody can spy on you with no effort
|
|
||||||
#path to SSL cert: People will call you paranoid
|
|
||||||
#verify = True
|
|
||||||
|
|
||||||
# CALDAV
|
|
||||||
[pair fastmail_calendar]
|
[pair fastmail_calendar]
|
||||||
a = fastmail_calendar_local
|
a = fastmail_calendar_local
|
||||||
b = fastmail_calendar_remote
|
b = fastmail_calendar_remote
|
||||||
collections = ["from b"]
|
collections = ["from b"]
|
||||||
|
conflict_resolution = b wins
|
||||||
|
metadata = ["color", "displayname"]
|
||||||
|
|
||||||
[storage fastmail_calendar_local]
|
[storage fastmail_calendar_local]
|
||||||
type = filesystem
|
type = filesystem
|
||||||
|
|
@ -72,35 +37,3 @@ url = https://caldav.messagingengine.com/
|
||||||
auth = basic
|
auth = basic
|
||||||
username = dustinswan@fastmail.com
|
username = dustinswan@fastmail.com
|
||||||
password.fetch = ["command", "~/dotfiles/bin/decrypt_password.sh", "dustinswan@fastmail.com"]
|
password.fetch = ["command", "~/dotfiles/bin/decrypt_password.sh", "dustinswan@fastmail.com"]
|
||||||
#verify = True
|
|
||||||
|
|
||||||
# Optional: Specify a time range which should be synchronized. Either both
|
|
||||||
# start_date and end_date or neither have to be set. The default is to
|
|
||||||
# synchronize everything. The following example synchronizes from one year in
|
|
||||||
# the past to one year in the future.
|
|
||||||
|
|
||||||
# All Python expressions are allowed here. The global namespace contains
|
|
||||||
# everything from the datetime module. The expression has to evaluate to a
|
|
||||||
# datetime.
|
|
||||||
#start_date = datetime.now() - timedelta(days=365)
|
|
||||||
|
|
||||||
# Here, start_date is also in the namespace.
|
|
||||||
#end_date = datetime.now() + timedelta(days=365)
|
|
||||||
|
|
||||||
# HTTP CALENDAR
|
|
||||||
#[pair holidays]
|
|
||||||
#a = holidays_local
|
|
||||||
#b = holidays_remote
|
|
||||||
|
|
||||||
#[storage holidays_local]
|
|
||||||
#type = filesystem
|
|
||||||
#path = ~/.config/vdir/calendars/holidays/
|
|
||||||
#fileext = .ics
|
|
||||||
|
|
||||||
#[storage holidays_remote]
|
|
||||||
#type = http
|
|
||||||
#url = https://mozorg.cdn.mozilla.net/media/caldata/QueenslandHolidays.ics
|
|
||||||
#auth = basic
|
|
||||||
#username =
|
|
||||||
#password =
|
|
||||||
#verify = True
|
|
||||||
|
|
|
||||||
1
vimrc
1
vimrc
|
|
@ -67,6 +67,7 @@ Plug 'junegunn/goyo.vim'
|
||||||
Plug 'EinfachToll/DidYouMean'
|
Plug 'EinfachToll/DidYouMean'
|
||||||
Plug 'jceb/vim-orgmode'
|
Plug 'jceb/vim-orgmode'
|
||||||
Plug 'raichoo/purescript-vim'
|
Plug 'raichoo/purescript-vim'
|
||||||
|
Plug 'ctrlpvim/ctrlp.vim'
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
|
|
||||||
32
zshrc
32
zshrc
|
|
@ -14,8 +14,8 @@ HISTFILE=~/.history
|
||||||
|
|
||||||
bindkey -e
|
bindkey -e
|
||||||
|
|
||||||
# alias vi=nvim
|
alias vi=nvim
|
||||||
# alias vim=nvim
|
alias vim=nvim
|
||||||
alias l="ls -la"
|
alias l="ls -la"
|
||||||
alias ta="tmux attach -d"
|
alias ta="tmux attach -d"
|
||||||
alias dustinswan="ssh dustinswan@dustinswan.com"
|
alias dustinswan="ssh dustinswan@dustinswan.com"
|
||||||
|
|
@ -40,19 +40,22 @@ alias er='rm -rf logs; unzip -o'
|
||||||
export PATH=$HOME/.local/bin:$PATH # Stack
|
export PATH=$HOME/.local/bin:$PATH # Stack
|
||||||
export PATH=$HOME/dotfiles/bin:$PATH
|
export PATH=$HOME/dotfiles/bin:$PATH
|
||||||
export PATH=$HOME/.npm-packages/bin:$PATH
|
export PATH=$HOME/.npm-packages/bin:$PATH
|
||||||
export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages
|
# export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages
|
||||||
|
|
||||||
# nix
|
# nix
|
||||||
if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
|
if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi
|
||||||
export OPENSSL_X509_CERT_FILE=${HOME}/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
# export OPENSSL_X509_CERT_FILE=${HOME}/.nix-profile/etc/ssl/certs/ca-bundle.crt
|
||||||
export OPENSSL_X509_CERT_FILE=~/.ssh/cacert.pem
|
# export OPENSSL_X509_CERT_FILE=~/.ssh/cacert.pem
|
||||||
export GIT_SSL_CAINFO=${OPENSSL_X509_CERT_FILE}
|
# export GIT_SSL_CAINFO=${OPENSSL_X509_CERT_FILE}
|
||||||
export CURL_CA_BUNDLE=${OPENSSL_X509_CERT_FILE}
|
# export CURL_CA_BUNDLE=${OPENSSL_X509_CERT_FILE}
|
||||||
export SSL_CERT_FILE=${OPENSSL_X509_CERT_FILE}
|
# export SSL_CERT_FILE=${OPENSSL_X509_CERT_FILE}
|
||||||
|
|
||||||
# Keychain
|
# Keychain
|
||||||
eval `keychain --eval id_rsa`
|
eval `keychain --eval id_rsa`
|
||||||
|
|
||||||
|
# Homebrew Github Token
|
||||||
|
export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`
|
||||||
|
|
||||||
# Heroku Toolbelt
|
# Heroku Toolbelt
|
||||||
export PATH="/usr/local/heroku/bin:$PATH"
|
export PATH="/usr/local/heroku/bin:$PATH"
|
||||||
|
|
||||||
|
|
@ -64,3 +67,16 @@ test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell
|
||||||
|
|
||||||
source /usr/local/opt/chruby/share/chruby/chruby.sh
|
source /usr/local/opt/chruby/share/chruby/chruby.sh
|
||||||
source /usr/local/opt/chruby/share/chruby/auto.sh
|
source /usr/local/opt/chruby/share/chruby/auto.sh
|
||||||
|
|
||||||
|
# Colored Man
|
||||||
|
man() {
|
||||||
|
env \
|
||||||
|
LESS_TERMCAP_mb=$(printf "\e[1;31m") \
|
||||||
|
LESS_TERMCAP_md=$(printf "\e[1;31m") \
|
||||||
|
LESS_TERMCAP_me=$(printf "\e[0m") \
|
||||||
|
LESS_TERMCAP_se=$(printf "\e[0m") \
|
||||||
|
LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
|
||||||
|
LESS_TERMCAP_ue=$(printf "\e[0m") \
|
||||||
|
LESS_TERMCAP_us=$(printf "\e[1;32m") \
|
||||||
|
man "$@"
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue