From: Mart Lubbers <mart@martlubbers.net>
Date: Fri, 12 Jan 2018 09:42:23 +0000 (+0100)
Subject: Merge branch 'master' of github.com:dopefishh/dotfiles
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=29f4acd0ae2d23db79e33cc0d4d064b53771d1f6;hp=ec1f37d52d491d731b8b3463d8704102256a30ca;p=dotfiles.git

Merge branch 'master' of github.com:dopefishh/dotfiles
---

diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config
index 1bd1a72..835767d 100644
--- a/email/.config/msmtp/config
+++ b/email/.config/msmtp/config
@@ -6,8 +6,8 @@ tls on
 tls_fingerprint 04:89:EE:5E:B3:16:43:D7:48:4C:A3:4B:1A:16:68:3F:01:61:A4:E7:6A:4D:54:28:5A:E1:AD:88:62:65:3A:CD
 user mart@martlubbers.net
 passwordeval pass mail/mart@martlubbers.net
-proxy_host localhost
-proxy_port 8008
+#proxy_host localhost
+#proxy_port 8008
 from mart@martlubbers.net
 
 account ru
diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config
index 4eb871c..0fd5652 100644
--- a/email/.config/offlineimap/config
+++ b/email/.config/offlineimap/config
@@ -8,7 +8,7 @@ ui = quiet
 localrepository = Local
 remoterepository = Remote
 postsynchook = notmuch new
-proxy = SOCKS5:localhost:8008
+#proxy = SOCKS5:localhost:8008
 
 [Repository Local]
 type = Maildir
diff --git a/email/.mutt/colors.muttrc b/email/.mutt/colors.muttrc
index 99a2298..4da7645 100644
--- a/email/.mutt/colors.muttrc
+++ b/email/.mutt/colors.muttrc
@@ -1,4 +1,4 @@
-# sidebar
+# regular
 color normal white default
 color attachment brightyellow default
 color hdrdefault cyan default
diff --git a/pkgs.sh b/pkgs.sh
index 0643d81..20888ae 100644
--- a/pkgs.sh
+++ b/pkgs.sh
@@ -26,4 +26,5 @@ sudo apt-get install \
 	w3m \
 	x11-xserver-utils  \
 	xinit \
-	xautolock
+	xautolock \
+	compton
diff --git a/shell/.bashrc b/shell/.bashrc
index d5e443b..29d1747 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -19,11 +19,14 @@ export CLEAN_HOME=/opt/clean
 export PATH=~/.local/bin:$PATH
 export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
 export PATH=$PATH:~/projects/esp-open-sdk/xtensa-lx106-elf/bin
-export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero
+export PATH=$PATH:/opt/texlive/bin/x86_64-linux:/opt/zotero:/opt/firefox
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim
 
+# transparency in some applications such as mutt
+export COLORFGBG="default;default"
+
 alias ls='ls --color=auto'
 alias grep='grep --color=auto'
 alias vi=vim
diff --git a/vim/.vimrc b/vim/.vimrc
index 794c49c..3e1569d 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -67,3 +67,9 @@ let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 0
 let g:syntastic_check_on_wq = 0
+
+" Vimtex options
+let g:vimtex_compiler_enabled = 0
+
+" Background transparency
+hi Normal guibg=NONE ctermbg=NONE
diff --git a/x/.Xresources b/x/.Xresources
index 656f0ac..df96044 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -8,7 +8,9 @@ Xft.rgba: rgb
 Xft.dpi: 96
 
 !Colors
-Rxvt*background: rgb:00/00/00
+!URxvt*background: rgb:00/00/00
+URxvt*depth: 32
+URxvt*background: rgba:0000/0000/0200/c800
 URxvt*foreground: rgb:cf/cf/cf
 URxvt*color0: rgb:00/00/00
 URxvt*color1: rgb:e0/10/10
diff --git a/x/.xinitrc b/x/.xinitrc
index f2daf31..bbd42d8 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -2,6 +2,8 @@
 urxvtd -q -o -f &
 xautolock -locker ~/.local/bin/lock.sh &
 dunst &
+compton -b
+~/.fehbg
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources