Compare commits

..

No commits in common. '50d8e3f455f353ef7386a3116b2064536183829c' and '94f59f5b31130680eb42818a2b08ab9c13a4f847' have entirely different histories.

  1. 2
      .config/emacs/site-lisp/dot-development.el
  2. 4
      .config/emacs/site-lisp/dot-elpaca.el
  3. 4
      .config/emacs/site-lisp/dot-evil.el
  4. 2
      .config/emacs/site-lisp/dot-keybinds.el
  5. 6
      .local/bin/play

2
.config/emacs/site-lisp/dot-development.el

@ -463,7 +463,7 @@
;;; YASnippet ;;; YASnippet
(elpaca-setup yasnippet (elpaca-setup yasnippet
(:autoload yas-expand yas-insert-snippet) (:autoload yas-insert-snippet)
(setq yas-snippet-dirs (list (expand-file-name "snippets" dot-emacs-dir))) (setq yas-snippet-dirs (list (expand-file-name "snippets" dot-emacs-dir)))
(setq yas-prompt-functions '(yas-completing-prompt)) (setq yas-prompt-functions '(yas-completing-prompt))
(:when-loaded (:when-loaded

4
.config/emacs/site-lisp/dot-elpaca.el

@ -9,13 +9,13 @@
;; ----------------------------------------- ;; -----------------------------------------
;; Elpaca bootstrap ;; Elpaca bootstrap
(defvar elpaca-installer-version 0.6) (defvar elpaca-installer-version 0.5)
(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) (defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory))
(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) (defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory))
(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) (defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory))
(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" (defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git"
:ref nil :ref nil
:files (:defaults "elpaca-test.el" (:exclude "extensions")) :files (:defaults (:exclude "extensions"))
:build (:not elpaca--activate-package))) :build (:not elpaca--activate-package)))
(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) (let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory))
(build (expand-file-name "elpaca/" elpaca-builds-directory)) (build (expand-file-name "elpaca/" elpaca-builds-directory))

4
.config/emacs/site-lisp/dot-evil.el

@ -59,9 +59,7 @@ Vim equivalence: <C-D>"
"Shift line right, retains cursor position. "Shift line right, retains cursor position.
Vim equivalence: <Tab>" Vim equivalence: <Tab>"
(interactive) (interactive)
(when (not (yas-expand)) (insert "\t"))
(insert "\t")))
(defun dot/evil-visual-shift-left () (defun dot/evil-visual-shift-left ()
"Shift visual selection left, retains the selection. "Shift visual selection left, retains the selection.

2
.config/emacs/site-lisp/dot-keybinds.el

@ -521,7 +521,7 @@
"t w" '(visual-line-mode :which-key "Toggle line wrapping") "t w" '(visual-line-mode :which-key "Toggle line wrapping")
;; Update packages ;; Update packages
"U" '(elpaca-merge-all :which-key "Update packages") "U" '(elpaca-update-all :which-key "Update packages")
;; Version control ;; Version control
"v" '(:ignore t :which-key "git") "v" '(:ignore t :which-key "git")

6
.local/bin/play

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Depends: GNU getopt, mpv, socat, streamlink, xclip # Depends: GNU getopt, mpv, socat, streamlink
SOCK="/tmp/umpv-fifo" SOCK="/tmp/umpv-fifo"
@ -256,11 +256,7 @@ elif [ $shuffleOption -eq 1 ]; then
elif [ $queueOption -eq 1 ]; then elif [ $queueOption -eq 1 ]; then
queue "$*" queue "$*"
else else
if [ "$*" = "" ]; then
play "$(xclip -o)"
else
for url in "$@"; do for url in "$@"; do
play "$url" play "$url"
done done
fi
fi fi

Loading…
Cancel
Save