dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More stuff

Browse source
This commit is contained in:
Dustin Swan 2017-10-05 12:55:21 -04:00
parent 5c0abf4cac
commit 536543ddfc
7 changed files with 167 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config.fish
View file

@ -25,14 +25,15 @@ if command --search p4 >/dev/null
set -x P4USER dswan set -x P4USER dswan
set -x P4PORT "humu.iocom.com:1666" set -x P4PORT "humu.iocom.com:1666"
set -x P4CONFIG p4.cfg set -x P4CONFIG p4.cfg
set -x P4EDITOR vim set -x P4EDITOR nvim
set -x P4IGNORE .ignore set -x P4IGNORE .p4ignore
end end
# PATH # PATH
set -x PATH $HOME/dotfiles/bin $PATH set -x PATH $HOME/dotfiles/bin $PATH
set -x PATH $HOME/.local/bin $PATH set -x PATH $HOME/.local/bin $PATH
set -x PATH $HOME/.npm-packages/bin $PATH set -x PATH $HOME/.npm-packages/bin $PATH
set -x PATH /usr/local/opt/python/libexec/bin $PATH
# Nix TODO # Nix TODO

70
karabiner.json
View file

@ -6,34 +6,62 @@
}, },
"profiles": [ "profiles": [
{ {
"complex_modifications": {
"rules": [
{
"manipulators": [
{
"description": "Change caps_lock to control when used as modifier, escape when used alone",
"from": {
"key_code": "caps_lock",
"modifiers": {
"optional": [
"any"
]
}
},
"to": [
{
"key_code": "left_control"
}
],
"to_if_alone": [
{
"key_code": "escape",
"modifiers": {
"optional": [
"any"
]
}
}
],
"type": "basic"
}
]
}
]
},
"devices": [], "devices": [],
"fn_function_keys": { "fn_function_keys": {
"f1": "vk_consumer_brightness_down", "f1": "display_brightness_decrement",
"f10": "mute", "f10": "mute",
"f11": "volume_down", "f11": "volume_decrement",
"f12": "volume_up", "f12": "volume_increment",
"f2": "vk_consumer_brightness_up", "f2": "display_brightness_increment",
"f3": "vk_mission_control", "f3": "mission_control",
"f4": "vk_launchpad", "f4": "launchpad",
"f5": "vk_consumer_illumination_down", "f5": "illumination_decrement",
"f6": "vk_consumer_illumination_up", "f6": "illumination_increment",
"f7": "vk_consumer_previous", "f7": "rewind",
"f8": "vk_consumer_play", "f8": "play_or_pause",
"f9": "vk_consumer_next" "f9": "fastforward"
}, },
"name": "Default Profile", "name": "",
"one_to_many_mappings": {},
"selected": true, "selected": true,
"simple_modifications": { "simple_modifications": {},
"caps_lock": "left_control"
},
"standalone_keys": {
"caps_lock": "escape"
},
"virtual_hid_keyboard": { "virtual_hid_keyboard": {
"caps_lock_delay_milliseconds": 0, "caps_lock_delay_milliseconds": 0,
"keyboard_type": "ansi", "keyboard_type": "ansi"
"standalone_keys_delay_milliseconds": 200
} }
} }
] ]

2
offlineimaprc
View file

@ -14,7 +14,7 @@ localfolders = ~/Mail/IOCOM
[Repository IOCOMRemote] [Repository IOCOMRemote]
type = IMAP type = IMAP
remotehost = secure.emailsrvr.com remotehost = secure.emailsrvr.com
remoteuser = dswan@insors.com remoteuser = dswan@iocom.com
remotepasseval = decrypt_password(".iocom-password.gpg") remotepasseval = decrypt_password(".iocom-password.gpg")
realdelete = no realdelete = no
ssl = yes ssl = yes

119
spacemacs
View file

@ -54,6 +54,7 @@ values."
evil-snipe evil-snipe
vinegar vinegar
search-engine search-engine
dash
(rcirc :variables rcirc-enable-authinfo-support t) (rcirc :variables rcirc-enable-authinfo-support t)
(erc :variables (erc :variables
erc-server-list erc-server-list
@ -100,13 +101,31 @@ values."
twitter twitter
games 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 chess wttrin osm-mode mingus tumblesocks writeroom-mode beacon org-journal org-crypt vdirel circe (vue-mode :location (recipe dotspacemacs-additional-packages
:fetcher github '(spaceline-all-the-icons
:repo "codefalling/vue-mode"))) hackernews
chess
wttrin
osm-mode
mingus
tumblesocks
writeroom-mode
beacon
org-journal
org-crypt
vdirel
circe
(vue-mode
:location
(recipe
:fetcher github
:repo "codefalling/vue-mode")))
;; 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
@ -349,6 +368,11 @@ 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."
;; (use-package spaceline-all-the-icons
;; :after spaceline
;; :config
;; (spaceline-all-the-icons-theme))
;; ctrl-w when a completion dropdown is open ;; ctrl-w when a completion dropdown is open
(with-eval-after-load 'company (with-eval-after-load 'company
(define-key company-active-map (kbd "C-w") 'evil-delete-backward-word)) (define-key company-active-map (kbd "C-w") 'evil-delete-backward-word))
@ -555,17 +579,44 @@ layers configuration. You are free to put any user code."
(setq org-startup-indented t) (setq org-startup-indented t)
(setq org-agenda-files '("~/Sync/Notes")) (setq org-agenda-files '("~/Sync/Notes"))
(setq org-agenda-start-day "-0d")
(setq org-agenda-span 2)
(setq org-agenda-sorting-strategy
'((agenda time-up habit-down priority-down category-keep) ;; this was originally: (agenda habit-down time-up priority-down category-keep)
(todo priority-down category-keep)
(tags priority-down category-keep)
(search category-keep)))
(setq org-archive-location "~/Sync/Notes/archive.org::* From %s")
(setq org-directory "~/Sync/Notes/") (setq org-directory "~/Sync/Notes/")
(setq org-refile-targets '((org-agenda-files :maxlevel . 9)))
(setq org-reverse-note-order t)
(setq org-log-into-drawer t)
(add-to-list 'org-modules 'org-habit)
(setq org-todo-keywords
'((sequence "TODO" "IN-PROGRESS(p)" "WAITING(w@/!)" "|" "DONE(d/!)" "CANCELED(c@)")))
; Org-protocol
(add-to-list 'org-modules 'org-protocol)
(require 'org-protocol)
(setq org-agenda-custom-commands
'(("c" "Simple agenda view"
((agenda "" )
(alltodo "")))))
;; Capture ;; Capture
(setq org-capture-templates (setq org-capture-templates
'(("t" "TODO" entry (file+headline "~/Sync/Notes/Main.org" "Inbox") '(("t" "TODO" entry (file+headline "~/Sync/Notes/Main.org" "Inbox")
"* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n") "* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n")
("i" "IOCOM TODO" entry (file+headline "~/Sync/Notes/IOCOM.org" "Inbox") ("i" "IOCOM TODO" entry (file+headline "~/Sync/Notes/IOCOM.org" "Inbox")
"* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n"))) "* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n")
("r" "Read Later" entry (file+headline "~/Sync/Notes/Main.org" "Inbox")
"* TODO Read: %a \n")))
;; Org Journal ;; Org Journal
(setq org-journal-dir "~/Sync/Notes/" (setq org-journal-dir "~/Sync/Notes/Journal/"
org-journal-file-format "%Y%m%d.org") org-journal-file-format "%Y%m%d.org")
(evil-leader/set-key "aj" 'org-journal-new-entry) (evil-leader/set-key "aj" 'org-journal-new-entry)
(setq org-journal-date-format "%A, %B %d, %Y") (setq org-journal-date-format "%A, %B %d, %Y")
@ -586,6 +637,7 @@ layers configuration. You are free to put any user code."
;; Deft ;; Deft
(setq deft-directory "~/Sync/Notes") (setq deft-directory "~/Sync/Notes")
(setq deft-recursive t)
;; Org Publish stuff ;; Org Publish stuff
(require 'ox-html) (require 'ox-html)
@ -685,36 +737,79 @@ layers configuration. You are free to put any user code."
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(ac-ispell-requires 4 t) '(ac-ispell-requires 4 t)
'(ahs-case-fold-search nil t) '(ahs-case-fold-search nil)
'(ahs-default-range (quote ahs-range-whole-buffer) t) '(ahs-default-range (quote ahs-range-whole-buffer))
'(ahs-idle-interval 0.25 t) '(ahs-idle-interval 0.25)
'(ahs-idle-timer 0 t) '(ahs-idle-timer 0 t)
'(ahs-inhibit-face-list nil t) '(ahs-inhibit-face-list nil)
'(ansi-color-names-vector
["#272822" "#F92672" "#A6E22E" "#E6DB74" "#66D9EF" "#FD5FF0" "#A1EFE4" "#F8F8F2"])
'(compilation-message-face (quote default))
'(erc-interpret-mirc-color t) '(erc-interpret-mirc-color t)
'(erc-modules '(erc-modules
(quote (quote
(autoaway autojoin button completion fill irccontrols move-to-prompt netsplit notifications readonly ring scrolltobottom services smiley spelling youtube list match networks notify track autojoin log menu image hl-nicks))) (autoaway autojoin button completion fill irccontrols move-to-prompt netsplit notifications readonly ring scrolltobottom services smiley spelling youtube list match networks notify track autojoin log menu image hl-nicks)))
'(evil-want-Y-yank-to-eol nil) '(evil-want-Y-yank-to-eol nil)
'(fancy-battery-mode t) '(fancy-battery-mode t)
'(fci-rule-color "#20240E" t)
'(highlight-changes-colors (quote ("#FD5FF0" "#AE81FF")))
'(highlight-tail-colors
(quote
(("#20240E" . 0)
("#679A01" . 20)
("#4BBEAE" . 30)
("#1DB4D0" . 50)
("#9A8F21" . 60)
("#A75B00" . 70)
("#F309DF" . 85)
("#20240E" . 100))))
'(js-indent-level 2) '(js-indent-level 2)
'(js2-basic-offset 2) '(js2-basic-offset 2)
'(mac-auto-operator-composition-mode t) '(mac-auto-operator-composition-mode t)
'(magit-diff-use-overlays nil)
'(monokai-use-variable-pitch nil) '(monokai-use-variable-pitch nil)
'(ns-auto-hide-menu-bar nil) '(ns-auto-hide-menu-bar nil)
'(org-journal-date-format "%A, %B %d, %Y") '(org-journal-date-format "%A, %B %d, %Y")
'(org-journal-time-format "%R %Z") '(org-journal-time-format "%R %Z")
'(package-selected-packages '(package-selected-packages
(quote (quote
(diminish pdf-tools tablist f winum unfill sudoku ob-restclient multiple-cursors fuzzy company-restclient know-your-http-well flyspell-correct log4e async mmt slime rust-mode bind-key packed auto-complete avy tern iedit bind-map evil simple-httpd pcache alert php-mode purescript-mode haml-mode markdown-mode htmlize vue-mode circe rcirc-notify rcirc-color helm-themes helm-swoop helm-spotify multi helm-pydoc helm-projectile helm-mode-manager helm-hoogle helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag flyspell-correct-helm ace-jump-helm-line csv-mode inflections spinner org anaconda-mode swiper highlight projectile skewer-mode js2-mode gh magit-popup git-commit hydra inf-ruby pcre2el macrostep dash powerline auctex counsel smartparens go-mode haskell-mode flycheck magit with-editor yasnippet rake company ivy helm helm-core xterm-color auctex-latexmk yapfify yaml-mode xkcd wttrin ws-butler writeroom-mode wolfram-mode window-numbering which-key wgrep web-mode web-beautify volatile-highlights vi-tilde-fringe vdirel uuidgen use-package typit twittering-mode tumblesocks toml-mode toc-org thrift tagedit stan-mode spray spotify spacemacs-theme spaceline smex smeargle slime-company slim-mode shell-pop scss-mode scad-mode sass-mode rvm ruby-tools ruby-test-mode rubocop rspec-mode robe reveal-in-osx-finder restclient restart-emacs request rbenv ranger rainbow-mode rainbow-identifiers rainbow-delimiters racer quelpa qml-mode pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide projectile-rails popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pbcopy paradox pandoc-mode pacmacs p4 ox-pandoc ox-gfm osx-trash osx-dictionary orgit org-projectile org-present org-pomodoro org-plus-contrib org-journal org-download org-bullets open-junk-file ob-http neotree mwim multi-term mu4e-maildirs-extension mu4e-alert move-text monokai-theme mmm-mode minitest mingus matlab-mode markdown-toc magit-gitflow magit-gh-pulls lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode ledger-mode launchctl julia-mode json-mode js2-refactor js-doc ivy-hydra intero insert-shebang info+ indent-guide idris-mode ido-vertical-mode hy-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make haskell-snippets hackernews google-translate golden-ratio go-guru go-eldoc gnuplot gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gist gh-md geiser flyspell-correct-ivy flycheck-rust flycheck-pos-tip flycheck-ledger flycheck-haskell flycheck-elm flx-ido fish-mode fill-column-indicator feature-mode fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-snipe evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu eshell-z eshell-prompt-extras esh-help erc-yt erc-view-log erc-terminal-notifier erc-social-graph erc-image erc-hl-nicks engine-mode emoji-cheat-sheet-plus emmet-mode elm-mode elisp-slime-nav dumb-jump drupal-mode disaster diff-hl deft cython-mode counsel-projectile company-web company-tern company-statistics company-shell company-go company-ghci company-ghc company-emoji company-cabal company-c-headers company-auctex company-anaconda common-lisp-snippets column-enforce-mode color-identifiers-mode coffee-mode cmm-mode cmake-mode clean-aindent-mode clang-format chruby chess cargo bundler bracketed-paste beacon auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile arduino-mode aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game))) (dash-at-point counsel-dash helm-dash visual-fill-column org-category-capture ghc undo-tree s spaceline-all-the-icons all-the-icons memoize font-lock+ diminish pdf-tools tablist f winum unfill sudoku ob-restclient multiple-cursors fuzzy company-restclient know-your-http-well flyspell-correct log4e async mmt slime rust-mode bind-key packed auto-complete avy tern iedit bind-map evil simple-httpd pcache alert php-mode purescript-mode haml-mode markdown-mode htmlize vue-mode circe rcirc-notify rcirc-color helm-themes helm-swoop helm-spotify multi helm-pydoc helm-projectile helm-mode-manager helm-hoogle helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag flyspell-correct-helm ace-jump-helm-line csv-mode inflections spinner org anaconda-mode swiper highlight projectile skewer-mode js2-mode gh magit-popup git-commit hydra inf-ruby pcre2el macrostep dash powerline auctex counsel smartparens go-mode haskell-mode flycheck magit with-editor yasnippet rake company ivy helm helm-core xterm-color auctex-latexmk yapfify yaml-mode xkcd wttrin ws-butler writeroom-mode wolfram-mode window-numbering which-key wgrep web-mode web-beautify volatile-highlights vi-tilde-fringe vdirel uuidgen use-package typit twittering-mode tumblesocks toml-mode toc-org thrift tagedit stan-mode spray spotify spacemacs-theme spaceline smex smeargle slime-company slim-mode shell-pop scss-mode scad-mode sass-mode rvm ruby-tools ruby-test-mode rubocop rspec-mode robe reveal-in-osx-finder restclient restart-emacs request rbenv ranger rainbow-mode rainbow-identifiers rainbow-delimiters racer quelpa qml-mode pyvenv pytest pyenv-mode py-isort pug-mode psci psc-ide projectile-rails popwin pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pbcopy paradox pandoc-mode pacmacs p4 ox-pandoc ox-gfm osx-trash osx-dictionary orgit org-projectile org-present org-pomodoro org-plus-contrib org-journal org-download org-bullets open-junk-file ob-http neotree mwim multi-term mu4e-maildirs-extension mu4e-alert move-text monokai-theme mmm-mode minitest mingus matlab-mode markdown-toc magit-gitflow magit-gh-pulls lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode ledger-mode launchctl julia-mode json-mode js2-refactor js-doc ivy-hydra intero insert-shebang info+ indent-guide idris-mode ido-vertical-mode hy-mode hungry-delete hlint-refactor hl-todo hindent highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make haskell-snippets hackernews google-translate golden-ratio go-guru go-eldoc gnuplot gitignore-mode github-search github-clone github-browse-file gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gist gh-md geiser flyspell-correct-ivy flycheck-rust flycheck-pos-tip flycheck-ledger flycheck-haskell flycheck-elm flx-ido fish-mode fill-column-indicator feature-mode fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-snipe evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu eshell-z eshell-prompt-extras esh-help erc-yt erc-view-log erc-terminal-notifier erc-social-graph erc-image erc-hl-nicks engine-mode emoji-cheat-sheet-plus emmet-mode elm-mode elisp-slime-nav dumb-jump drupal-mode disaster diff-hl deft cython-mode counsel-projectile company-web company-tern company-statistics company-shell company-go company-ghci company-ghc company-emoji company-cabal company-c-headers company-auctex company-anaconda common-lisp-snippets column-enforce-mode color-identifiers-mode coffee-mode cmm-mode cmake-mode clean-aindent-mode clang-format chruby chess cargo bundler bracketed-paste beacon auto-yasnippet auto-highlight-symbol auto-dictionary auto-compile arduino-mode aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game)))
'(paradox-github-token t) '(paradox-github-token t)
'(pos-tip-background-color "#A6E22E")
'(pos-tip-foreground-color "#272822")
'(psc-ide-add-import-on-completion t t) '(psc-ide-add-import-on-completion t t)
'(psc-ide-rebuild-on-save nil t) '(psc-ide-rebuild-on-save nil t)
'(ring-bell-function (quote ignore))) '(ring-bell-function (quote ignore))
'(spaceline-info-mode t)
'(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" "#20240E" "#F70057" "#F92672" "#86C30D" "#A6E22E" "#BEB244" "#E6DB74" "#40CAE4" "#66D9EF" "#FB35EA" "#FD5FF0" "#74DBCD" "#A1EFE4" "#F8F8F2" "#F8F8F0")))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(default ((((class color) (min-colors 257)) (:foreground "#F8F8F2" :background "#272822")) (((class color) (min-colors 89)) (:foreground "#F5F5F5" :background "#1B1E1C")))) '(default ((((class color) (min-colors 257)) (:foreground "#F8F8F2" :background "#272822" :family "Iosevka" :foundry "nil" :slant normal :weight normal :height 130 :width normal)) (((class color) (min-colors 89)) (:foreground "#F5F5F5" :background "#1B1E1C" :family "Iosevka" :foundry "nil" :slant normal :weight normal :height 130 :width normal))))
'(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
'(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil))))) '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))

2
symlinks.sh
View file

@ -5,7 +5,7 @@ rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf rm -rf ~/.ghc; mkdir ~/.ghc; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
rm -rf ~/.config/khal; mkdir -p ~/.config/khal; ln -s ~/dotfiles/khal.conf ~/.config/khal/khal.conf rm -rf ~/.config/khal; mkdir -p ~/.config/khal; ln -s ~/dotfiles/khal.conf ~/.config/khal/config
rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config rm -rf ~/.vdirsyncer; mkdir ~/.vdirsyncer; ln -s ~/dotfiles/vdirsyncer/config ~/.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

2
vdirsyncer/config
View file

@ -14,7 +14,7 @@ fileext = ".vcf"
[storage fastmail_contacts_remote] [storage fastmail_contacts_remote]
type = "carddav" type = "carddav"
url = "https://carddav.messagingengine.com" url = "https://carddav.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"]

9
vimrc
View file

@ -2,7 +2,7 @@ set nocompatible
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
" Plug 'bling/vim-airline' Plug 'bling/vim-airline'
" Plug 'vim-airline/vim-airline-themes' " Plug 'vim-airline/vim-airline-themes'
Plug 'tpope/vim-repeat' Plug 'tpope/vim-repeat'
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
@ -42,10 +42,10 @@ Plug 'sdanielf/vim-stdtabs'
Plug 'mhinz/vim-signify' " previously 'airblade/vim-gitgutter' Plug 'mhinz/vim-signify' " previously 'airblade/vim-gitgutter'
Plug 'terryma/vim-expand-region' " previously 'gcmt/wildfire.vim' Plug 'terryma/vim-expand-region' " previously 'gcmt/wildfire.vim'
Plug 'tommcdo/vim-exchange' Plug 'tommcdo/vim-exchange'
Plug 'argtextobj.vim' Plug 'vim-scripts/argtextobj.vim'
Plug 'matchit.zip' " % will match more things Plug 'vim-scripts/matchit.zip' " % will match more things
Plug 'AndrewRadev/splitjoin.vim' Plug 'AndrewRadev/splitjoin.vim'
Plug 'utl.vim' Plug 'vim-scripts/utl.vim'
Plug 'junegunn/goyo.vim' Plug 'junegunn/goyo.vim'
Plug 'EinfachToll/DidYouMean' Plug 'EinfachToll/DidYouMean'
Plug 'jceb/vim-orgmode' Plug 'jceb/vim-orgmode'
@ -57,6 +57,7 @@ Plug 'eagletmt/ghc-mod'
Plug 'bitc/vim-hdevtools' Plug 'bitc/vim-hdevtools'
"Plug 'eagletmt/neco-ghc' "Plug 'eagletmt/neco-ghc'
"Plug 'lukerandall/haskellmode-vim' "Plug 'lukerandall/haskellmode-vim'
Plug 'ryanoasis/vim-devicons'
" Themes " Themes
"Plug 'w0ng/vim-hybrid' "Plug 'w0ng/vim-hybrid'