Various dotfile changes

master
Dustin Swan 6 years ago
parent 6cbf0294b7
commit 763a6a5f23

@ -26,7 +26,7 @@ if command --search p4 >/dev/null
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 nvim set -x P4EDITOR nvim
set -x P4IGNORE .p4ignore set -x P4IGNORE .ignore
end end
# PATH # PATH
@ -38,11 +38,11 @@ test -e /usr/local/opt/python/libexec/bin ; and set -x PATH /usr/local/opt/pytho
test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH test -e $HOME/.cargo/bin ; and set -x PATH $HOME/.cargo/bin $PATH
# Keychain # Keychain
# if status --is-interactive if status --is-interactive
# TODO Take this out when keychain fixes this bug # TODO Take this out when keychain fixes this bug
# set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1" set -x GPG_AGENT_INFO "~/.gnupg/S.gpg-agent:"(pgrep gpg-agent)":1"
# keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377 | source
# end end
# iTerm2 # iTerm2
test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish

@ -1,8 +1,5 @@
[calendars] [calendars]
[[fastmail_contacts_local]] [[Fastmail]]
path = ~/Contacts/
type = discover
[[fastmail_calendar_local]]
path = ~/Calendars/ path = ~/Calendars/
type = discover type = discover

@ -1,11 +1,9 @@
import os import os
import gnupg from subprocess import check_output
home = os.environ['HOME'] home = os.environ['HOME']
gpg = gnupg.GPG(gnupghome=home+"/.gnupg", use_agent=True)
def decrypt_password(file): def decrypt_password(file):
path = home + "/" + file path = home + "/" + file
f = open(path, 'rb') res = check_output(["gpg", "-dq", path])
decrypted = gpg.decrypt_file(f) return res.strip()
return decrypted.data.strip()

@ -108,7 +108,6 @@ values."
;; configuration in `dotspacemacs/user-config'. ;; configuration in `dotspacemacs/user-config'.
dotspacemacs-additional-packages dotspacemacs-additional-packages
'( '(
weechat
all-the-icons all-the-icons
spaceline-all-the-icons spaceline-all-the-icons
hackernews hackernews
@ -383,7 +382,10 @@ This is the place where most of your configurations should be done. Unless it is
explicitly specified that a variable should be set before a package is loaded, explicitly specified that a variable should be set before a package is loaded,
you should place your code here." you should place your code here."
(require 'weechat) (define-key evil-normal-state-map (kbd "C-h") 'evil-window-left)
(define-key evil-normal-state-map (kbd "C-l") 'evil-window-right)
(define-key evil-normal-state-map (kbd "C-j") 'evil-window-down)
(define-key evil-normal-state-map (kbd "C-k") 'evil-window-up)
(use-package spaceline-all-the-icons (use-package spaceline-all-the-icons
:after spaceline :after spaceline
@ -651,7 +653,8 @@ you should place your code here."
(require 'org-crypt) (require 'org-crypt)
(org-crypt-use-before-save-magic) (org-crypt-use-before-save-magic)
(setq org-tags-exclude-from-inheritance (quote ("crypt"))) (setq org-tags-exclude-from-inheritance (quote ("crypt")))
;; (setq org-crypt-key nil) ;; symmetric encryption (setq org-crypt-key nil) ;; symmetric encryption
(setq epg-gpg-program "/usr/local/bin/gpg")
;; Deft ;; Deft
(setq deft-directory "~/Sync/Notes") (setq deft-directory "~/Sync/Notes")

@ -8,7 +8,7 @@ mkdir ~/.ghc; ln -sf ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
ln -sf ~/dotfiles/gitconfig ~/.gitconfig ln -sf ~/dotfiles/gitconfig ~/.gitconfig
ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf ln -sf ~/dotfiles/tmux.conf ~/.tmux.conf
mkdir -p ~/.config/khal; ln -sf ~/dotfiles/khal.conf ~/.config/khal/config mkdir -p ~/.config/khal; ln -sf ~/dotfiles/khal.conf ~/.config/khal/config
mkdir ~/.vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.vdirsyncer/config mkdir ~/.config/vdirsyncer; ln -sf ~/dotfiles/vdirsyncer/config ~/.config/vdirsyncer/config
mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf mkdir ~/.gnupg; ln -sf ~/dotfiles/gpg-agent.conf ~/.gnupg/gpg-agent.conf
mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config mkdir ~/.ssh; ln -sf ~/dotfiles/ssh/config ~/.ssh/config
mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf mkdir -p ~/.config/khard; ln -sf ~/dotfiles/khard.conf ~/.config/khard/khard.conf

@ -80,8 +80,9 @@ set-option -g display-panes-colour white
# clock # clock
set-window-option -g clock-mode-colour white set-window-option -g clock-mode-colour white
# mouse
set-option -g mouse on
# Initialize TMUX plugin manager # Initialize TMUX plugin manager
run '~/.tmux/plugins/tpm/tpm' run '~/.tmux/plugins/tpm/tpm'
# mouse
set-option -g mouse on

Loading…
Cancel
Save