Merge remote-tracking branch 'refs/remotes/origin/master'

5 files changed, 165 insertions, 131 deletions

diff --git a/bin/executable_Internet.m3u.sh b/bin/executable_Internet.m3u.sh
index 9b32d57..b417f07 100644
--- a/bin/executable_Internet.m3u.sh
+++ b/bin/executable_Internet.m3u.sh
@@ -14,7 +14,7 @@ EOF
 }
 
 getstream() {
-    curl -s $1 | grep '^File1=' | sed -e 's/File1=//g'
+    curl -s "$1" | grep '^File1=' | sed -e 's/File1=//g'
 }
 
 playlist "1920s"   "1920s Radio Network"           "$(getstream 'http://kara.fast-serv.com:8398/listen.pls')"
@@ -27,3 +27,14 @@ playlist "WYEP"    "WYEP 91.3 (Pittsburgh)"        'https://ais-sa3.cdnstream1.c
 playlist "WZUM"    "WZUM 88.1 (Pittsburgh)"        'http://pubmusic.streamguys1.com/wzum-aac'
 playlist "Dismuke" "Radio Dismuke"                 "$(getstream 'https://early1900s.org/radiodismuke/radiodismuke.pls')"
 playlist "russhit" "99.6 Радио Русский Хит"        "$(curl -s http://ruhit.fm/player.htm | grep ruhit_64 | sed -e 's/.*="//g;s/".*//g')"
+
+# http://colombiacrossover.com/
+playlist "salsa.dura" "Colombia Salsa Dura"        "$(getstream 'http://64.37.50.226:8054/listen.pls?sid=1')"
+
+# http://www.tenientiko.com/
+playlist "salsa.catedral" "La Catedral de la Salsa" "$(getstream 'http://176.31.120.166:4450/listen.pls?sid=1')"
+
+# http://www.rockolapegassera.com
+playlist "cumbia.rockola" "Rockola Pegassera 107.9" "$(getstream 'http://54.39.19.215:8004/listen.pls?sid=1')"
+
+playlist "salsa.metro" "El Metro Salsero" 'http://s5.voscast.com:7516/stream'
diff --git a/dot_emacs.tmpl b/dot_emacs.tmpl
index 80a52c1..8fc67a1 100644
--- a/dot_emacs.tmpl
+++ b/dot_emacs.tmpl
@@ -97,6 +97,14 @@
 (use-package autorevert
   :diminish auto-revert-mode)
 
+(use-package avy
+  :ensure t
+  :config
+  (avy-setup-default)
+  :bind
+  (("C-c C-j" . avy-resume)
+   ("C-;" . avy-goto-char-2)))
+
 (use-package bibtex
   :mode ("\\.bib\'" . bibtex-mode)
   :custom
@@ -214,14 +222,13 @@ Extended Format date in the date field and return it as a string obeing
 	   (seq-do (lambda (pair) (add-to-list 'bibtex-autokey-titleword-change-strings pair)) charMap))))
 
 (use-package bibtex-completion
-  :ensure helm-bibtex
+  :ensure ivy-bibtex
   :custom
   (bibtex-completion-bibliography "~/Documents/papers/library.bib")
   (bibtex-completion-library-path '("~/Documents/papers/pdfs/"))
   (bibtex-completion-notes-path   "~/Documents/papers/notes/")
   (bibtex-completion-notes-extension ".org")
-  (bibtex-completion-pdf-extension '(".pdf" ".djvu" ".txt"))
-  :bind (("C-c b" . helm-bibtex)))
+  (bibtex-completion-pdf-extension '(".pdf" ".djvu" ".txt")))
 
 (use-package cc-mode
   :custom
@@ -266,6 +273,13 @@ Extended Format date in the date field and return it as a string obeing
 		       (setq-local company-backends '(company-org-block))
 		       (company-mode +1)))))
 
+(use-package counsel
+  :ensure t
+  :bind (("C-x C-b" . counsel-ibuffer)
+	 ("C-x C-f" . counsel-find-file)
+	 ("M-x" . counsel-M-x)
+	 ("M-y" . counsel-yank-pop)))
+
 (use-package cus-edit
   :custom
   (custom-file null-device "Don't store customizations"))
@@ -372,19 +386,6 @@ Extended Format date in the date field and return it as a string obeing
   :hook ((haskell-mode . turn-on-haskell-doc-mode)
 	 (haskell-mode . turn-on-haskell-indentation)))
 
-(use-package helm
-  :ensure t
-  :bind (("M-x"     . helm-M-x)
-	 ("C-x C-f" . helm-find-files)
-	 ("C-x C-b" . helm-mini)
-	 :map helm-map
-	 ("<tab>"   . helm-select-action))
-  :config
-  (helm-mode 1))
-
-(use-package helm-org
-  :ensure t)
-
 (use-package info-look
   :ensure t)
 
@@ -394,6 +395,19 @@ Extended Format date in the date field and return it as a string obeing
   :custom
   (ispell-dictionary "en_CA-w_accents"))
 
+(use-package ivy
+  :ensure t
+  :diminish
+  :custom
+  (ivy-use-virtual-buffers t)
+  (ivy-count-format "(%d/%d) ")
+  :config
+  (ivy-mode 1))
+
+(use-package ivy-bibtex
+  :ensure t
+  :bind (("C-c b" . ivy-bibtex)))
+
 (use-package latex
   :ensure auctex
   :after info-look
@@ -571,7 +585,7 @@ Otherwise split the current paragraph into one sentence per line."
 
 (use-package org-ref
   :ensure t
-  :after helm-bibtex)
+  :after ivy-bibtex)
 
 (use-package org-ref-arxiv
   :ensure org-ref
@@ -675,7 +689,7 @@ Returns a formatted BibTeX entry."
   :ensure org-ref
   :after org-ref-bibtex
   :after reftex-cite
-  :after helm-bibtex
+  :after ivy-bibtex
   :bind (:map bibtex-mode-map
 	      ("C-c C-c" . org-ref-clean-bibtex-entry)
 	      ("C-c e"   . my/set-source-ev)
diff --git a/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc b/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
index 49519ee..f310573 100644
--- a/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
+++ b/dot_mutt/accounts/rak.rak.ac/encrypted_savehooks.rc.asc
@@ -1,39 +1,48 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-=WGt7
+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
+=AZJ1
 -----END PGP MESSAGE-----
diff --git a/dot_mutt/encrypted_private_alias.rc.asc b/dot_mutt/encrypted_private_alias.rc.asc
index d388555..d9b43dd 100644
--- a/dot_mutt/encrypted_private_alias.rc.asc
+++ b/dot_mutt/encrypted_private_alias.rc.asc
@@ -1,74 +1,75 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-oAlzv7xOVPpBKZnUVHj7/Q==
-=2uZF
+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
+JJ51
+=yK33
 -----END PGP MESSAGE-----
diff --git a/etc/mpd.conf b/etc/mpd.conf
index d0f4385..163e377 100644
--- a/etc/mpd.conf
+++ b/etc/mpd.conf
@@ -6,8 +6,7 @@ sticker_file		"/var/lib/mpd/sticker.sql"
 filesystem_charset	"UTF-8"
 
 user			"mpd"
-bind_to_address		"127.0.0.1"
-bind_to_address		"10.0.1.101"
+bind_to_address		"any"
 auto_update    		"yes"
 
 input {
@@ -36,9 +35,9 @@ audio_output {
 audio_output {
 	type		"httpd"
 	name		"HTTP stream"
-	bind_to_address	"10.0.1.101"
+	bind_to_address	"10.0.1.103"
 	port 		"6688"
 	quality		"5"
+	always_on	"yes"
+	tags		"yes"
 }
-
-