aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvaskozl <vasil.zlatanov@gmail.com>2015-04-09 19:53:12 +0200
committervaskozl <vasil.zlatanov@gmail.com>2015-04-09 19:53:12 +0200
commit8e18d2c0bf5a3feb8aa804e2e98794e5e1211bf9 (patch)
tree4262e9121d8255d7cbc48742186aa2e9ea93bbf0
parentd53d62b2a4b9105717208dfbd5b5016a329791ac (diff)
parentededf43f7746f1bb98555c4e0dc594b40e5a8266 (diff)
downloaddotfiles-8e18d2c0bf5a3feb8aa804e2e98794e5e1211bf9.tar.gz
dotfiles-8e18d2c0bf5a3feb8aa804e2e98794e5e1211bf9.tar.bz2
dotfiles-8e18d2c0bf5a3feb8aa804e2e98794e5e1211bf9.zip
Merge branch 'master' of github.com:Vaskozl/dotfiles
-rw-r--r--bashrc2
-rw-r--r--config/sxhkd/sxhkdrc9
-rw-r--r--msmtprc13
-rw-r--r--muttrc4
-rwxr-xr-xxinitrc6
5 files changed, 21 insertions, 13 deletions
diff --git a/bashrc b/bashrc
index c554c9a..fed088c 100644
--- a/bashrc
+++ b/bashrc
@@ -116,7 +116,7 @@ fi
shopt -s autocd
shopt -s cdspell
-export GPGKEY="895134C5"
+export GPGKEY="B54608CC"
export PATH="$HOME/bin:$HOME/bin/perl6:$PATH"
export EDITOR="vim"
export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 5cb8025..d7baf7d 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -168,19 +168,16 @@ grave ; y ; {1-9}
grave ; y ; y
~/.ratpoison/clipboard menu_set
-grave ; shift + p
- xclip -o | curl -F 'sprunge=<-' http://sprunge.us | xclip
-
#
-# Sprunge and Imgur hotkeys
+# Paste and Image share hotkeys
#
grave ; P
- xclip -o | curl -F 'sprunge=<-' http://sprunge.us | xclip
+ exec ~/bin/safepaste
grave; g
- exec ~/bin/imgur
+ exec ~/bin/safeimg
#
# music control
#
diff --git a/msmtprc b/msmtprc
index 74aa1fa..297afde 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,3 +1,14 @@
+account default
+host skozl.com
+port 587
+protocol smtp
+auth on
+from v@skozl.com
+user v@skozl.com
+tls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+
+
account bitmessage
host mail.bitmessage.ch
port 465
@@ -9,7 +20,7 @@ tls on
tls_starttls off
tls_nocertcheck
-account default
+account gmail
host smtp.gmail.com
port 587
protocol smtp
diff --git a/muttrc b/muttrc
index 8990b1f..30aff3b 100644
--- a/muttrc
+++ b/muttrc
@@ -8,7 +8,7 @@ source $alias_file
#Offline Imap config
set mbox_type = Maildir
-set sendmail = ~/bin/mail
+set sendmail = /usr/bin/msmtp
set folder = ~/.mail/
set spoolfile = "+dove/INBOX"
@@ -27,7 +27,7 @@ macro index S \
"mark message as spam"
# Dove conf
-set from = "vasko@wherewe.servebeer.com"
+set from = "v@skozl.com"
set realname = "Vasil Zlatanov"
# Change the following line to a different editor you prefer.
diff --git a/xinitrc b/xinitrc
index 1b34b94..1bdab34 100755
--- a/xinitrc
+++ b/xinitrc
@@ -37,8 +37,8 @@ wmname LG3D
~/.ratpoison/clipboard init
#Run dropbox
-dropboxd &
-~/bin/mountsecure
+#dropboxd &
+#~/bin/mountsecure
# Allow user to edit brightness
sudo /usr/bin/brightchown
@@ -145,7 +145,7 @@ fi
# windows 1: screen notebok
if [ $run_everything = true -o $run_workspace = 5 ]; then
$workspace ^4
- cd $HOME/Dropbox/notes
+ cd $HOME/Sync/notes
# $xtoolwait $term $screen_run school
fi
#