diff --git a/dotfiles/bashrc b/dotfiles/bashrc index 35822231..42b1f54e 100644 --- a/dotfiles/bashrc +++ b/dotfiles/bashrc @@ -3,3 +3,6 @@ source ~/.lib/shellenv.sh # Emulate zshs env/rc distinction source ~/.lib/shellrc.sh source ~/.lib/bash.sh + +# added by travis gem +[ -f /Users/imalison/.travis/travis.sh ] && source /Users/imalison/.travis/travis.sh diff --git a/dotfiles/config/mopidy/mopidy.conf b/dotfiles/config/mopidy/mopidy.conf deleted file mode 100644 index 2a2534d8..00000000 --- a/dotfiles/config/mopidy/mopidy.conf +++ /dev/null @@ -1,5 +0,0 @@ -[http] -hostname = 0.0.0.0 - -[mopify] -enabled = true \ No newline at end of file diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index 019fc1ee..c4c632f1 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -473,8 +473,7 @@ The current directory is assumed to be the project's root otherwise." :commands auto-complete-mode :config (diminish 'auto-complete-mode) - :init - (add-hook 'prog-mode-hook (lambda () (auto-complete-mode t)))) + ) ;; :init (add-hook 'prog-mode-hook (lambda () (auto-complete-mode t)))) (use-package company :ensure t @@ -484,7 +483,6 @@ The current directory is assumed to be the project's root otherwise." (progn (setq company-idle-delay .25) (global-company-mode) - (add-to-list 'company-backends 'mu4e-contacts-company) (diminish 'company-mode)) :init (add-hook 'prog-mode-hook (lambda () (company-mode t)))) diff --git a/dotfiles/emacs.d/load.d/helm-mpd.el b/dotfiles/emacs.d/load.d/helm-mpd.el new file mode 100644 index 00000000..e80e2a2a --- /dev/null +++ b/dotfiles/emacs.d/load.d/helm-mpd.el @@ -0,0 +1,37 @@ +;; (setq imalison-mpd-conn (mpd-conn-new "127.0.0.1" 6600)) +;; (mpd-search imalison-mpd-conn 'artist "angel olsen") + +;; (defun helm-mpd-search () +;; (mapcar 'format-mpd-result-for-helm (mpd-search imalison-mpd-conn 'artist helm-pattern))) + +;; (defun format-mpd-result-for-helm (mpd-result) +;; (list (format "%s - %s" (plist-get mpd-result 'Artist) (plist-get mpd-result 'Title)))) + +;; (mpd-execute-command mpd-inter-conn +;; (mapconcat (lambda (song) +;; (format "add %s" (mpd-safe-string song))) +;; (split-string song "\n") "\n")) + + +;; ("Angel in Blue Jeans (3m24s) +;; Train - Angel in Blue Jeans" (track-number . "1") (artists . [((name . "Train") (href . "spotify:artist:3FUY2gzHeIiaesXtOAdB7A"))]) (href . "spotify:track:2OpY5KKUvkYAkiY8FEG1Wi") (length . 204.466) (external-ids . [((id . "USSM11404307") (type . "isrc"))]) (popularity . "0.74") (name . "Angel in Blue Jeans") (album (availability (territories . "AD AR AT AU BE BG BO BR CA CH CL CO CR CY CZ DE DK DO EC EE ES FI FR GB GR GT HK HN HR HU IE IS IT LI LT LU LV MC MT MX MY NI NL NO NZ PA PE PH PL PT PY RO SE SG SI SK SV TR TW US UY")) (name . "Angel in Blue Jeans") (href . "spotify:album:00QRaEtUaplb5qxN62o9vd") (released . "2014"))) + + + +;; (plist-get '(file "spotify:album:0xvDtkNKJiLclVbjLvovFU" Time 0 Artist "Angel Olsen" Title "Album: Burn Your Fire For No Witness" Album "Burn Your Fire For No Witness" Date "2014" Track "0" AlbumArtist "Angel Olsen") 'file) + +;; (defvar helm-source-mpd-search +;; '((name . "Spotify") +;; (volatile) +;; (requires-pattern . 2) +;; (candidates-process . helm-mpd-search))) + +;; (helm-mpd-search) + +;; (helm :sources '(helm-source-mpd-search) +;; :buffer "*helm-mpd*") + +;; (let ((helm-pattern "nas")) +;; (helm-mpd-search)) + +;; (mingus-make-status-string) diff --git a/dotfiles/lib/shellenv.sh b/dotfiles/lib/shellenv.sh index 733f2b7d..71b3ddc9 100644 --- a/dotfiles/lib/shellenv.sh +++ b/dotfiles/lib/shellenv.sh @@ -41,3 +41,6 @@ done function with_shellrc { zsh -c "source ~/.zshrc && ""$@" } + +# Travis completion +[ -f "$HOME/.travis/travis.sh" ] && source "$HOME/.travis/travis.sh" diff --git a/resources/requirements.txt b/resources/requirements.txt index 8ad373e4..9d587ca4 100644 --- a/resources/requirements.txt +++ b/resources/requirements.txt @@ -7,6 +7,7 @@ flake8 invoke jinja lxml +mopidy-gmusic mopidy-moped mopidy-scrobbler mopidy-spotify