mpd->mpv, anki, texlive-dvipng

5 files changed, 29 insertions, 62 deletions

diff --git a/.config/emacs/modules/bd--emms.el b/.config/emacs/modules/bd--emms.el
index f12733c..ff5b192 100644
--- a/.config/emacs/modules/bd--emms.el
+++ b/.config/emacs/modules/bd--emms.el
@@ -15,13 +15,11 @@ playback."
 
 
 (use-package emms
-  :bind (("C-z C-s" . 'emms-quickstart)
-         ("C-z C-p" . 'emms-play-playlist))
+  :bind (("C-z C-s" . 'emms-quickstart))
   :config
   (emms-all)
-  (require 'emms-player-mpd)
-  (add-to-list 'emms-info-functions 'emms-info-mpd)
-  (add-to-list 'emms-player-list 'emms-player-mpd)
+  (require 'emms-player-mpv)
+  (add-to-list 'emms-player-list 'emms-player-mpv)
   (keymap-global-set "C-z C-m"  (lambda ()
                                   (interactive)
                                   (if (get-buffer emms-playlist-buffer-name)
@@ -39,16 +37,16 @@ playback."
                  title)
                 (t
                  (emms-track-simple-description track))))))
-  ;; "emms-playlist-mode-bury-buffer" plays poorly with shackle
   (keymap-set emms-playlist-mode-map "q" #'quit-window)
+  (setq-default
+   emms-playlist-default-major-mode 'emms-playlist-mode
+
+   emms-player-list '(emms-player-mpv)
+   emms-player-mpv-environment '("PULSE_PROP_media.role=music")
+   emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display" "--force-window=no" "--vo=null"))
   :custom
-  ;; make sure mpd is configured similarly
-  (emms-player-mpd-server-name "localhost")
-  (emms-player-mpd-server-port "6600")
   ;; set dir and volume keys
-  (emms-player-mpd-music-directory (expand-file-name "~/ik/music/"))
   (emms-source-file-default-directory (expand-file-name "~/ik/playlists/"))
-  (emms-volume-change-function 'emms-volume-mpd-change)
   ;; misc
   (emms-info-report-each-num-tracks 2000)
   (emms-playlist-buffer-name "*Playlist*")
diff --git a/.config/guix/garm.scm b/.config/guix/garm.scm
index 71998fe..dbf887e 100644
--- a/.config/guix/garm.scm
+++ b/.config/guix/garm.scm
@@ -19,7 +19,6 @@
   #:use-module (modules base)
   #:use-module (modules dwm)
   #:use-module (modules mail)
-  #:use-module (modules utils)
   #:use-module (modules xorg)
   #:use-module (modules ymir)
   #:use-module (modules pdf))
@@ -46,8 +45,6 @@
   `(,@bd-base-system-packages
     ,@bd-desktop-system-packages
     ,@bd-dwm-system-packages
-    ,@bd-mpd-package
-    ,@bd-games-packages
 
     ;; machine-specific packages
     ,@(list
@@ -58,7 +55,6 @@
  (services
   `(,@bd-base-system-services
     ,@bd-desktop-system-services
-    ,@bd-mpd-service
     ,(service guix-home-service-type
               `((,username ,home)))
     ,(service tlp-service-type
diff --git a/.config/guix/modules/base.scm b/.config/guix/modules/base.scm
index 9c755e4..95a9016 100644
--- a/.config/guix/modules/base.scm
+++ b/.config/guix/modules/base.scm
@@ -34,8 +34,11 @@
  cryptsetup ;; cryptsetup
  curl ;; curl
  databases ;; recutils
+ education ;; anki
+ emulators ;; mupen64plus*, bsnes, mgba
  fonts ;; font-terminus, font-openmoji, font-awesome
  fontutils ;; fontconfig
+ games ;; nethack
  gimp ;; gimp-next
  gnupg ;; gnupg, pinentry, pinentry-emacs
  gnuzilla ;; icecat
@@ -51,6 +54,7 @@
  pdf ;; xpdf
  rsync ;; rsync
  screen ;; screen
+ tex ;; texlive-dvipng
  texlive ;; texlive
  version-control ;; git
  video ;; ffmpeg, mpv, yt-dlp
@@ -71,6 +75,7 @@
    xpdf ; pdftotext
    yt-dlp
 
+   anki
    bc
    cryptsetup
    curl
@@ -83,16 +88,18 @@
    stow
    sysstat
    texlive
+   texlive-dvipng
    unzip
    vim
    ))
 
 (define desk
   (list
+   bsnes
    ffmpeg
    flameshot
-   fontconfig
    font-awesome
+   fontconfig
    font-openmoji
    font-terminus
    gimp
@@ -100,7 +107,13 @@
    icecat
    imagemagick
    librewolf
+   mgba
    mpv
+   mupen64plus-audio-sdl
+   mupen64plus-rsp-hle
+   mupen64plus-ui-console
+   mupen64plus-video-glide64mk2
+   nethack
    ))
 
 (define bd-base-system-packages
diff --git a/.config/guix/modules/dwm/config.def.h b/.config/guix/modules/dwm/config.def.h
index f1f8b46..a254b18 100644
--- a/.config/guix/modules/dwm/config.def.h
+++ b/.config/guix/modules/dwm/config.def.h
@@ -79,9 +79,9 @@ static const char *upperbgt[]    = { "brightnessctl", "set", "5%+", NULL };
 static const char *togmute[]     = { "pactl", "set-sink-mute", "@DEFAULT_SINK@", "toggle", NULL };
 static const char *lowervol[]    = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "-4%", NULL};
 static const char *uppervol[]    = { "pactl", "set-sink-volume", "@DEFAULT_SINK@", "+4%", NULL};
-static const char *mpcprev[]     = { "mpc", "prev", NULL };
-static const char *togmpc[]      = { "mpc", "toggle", NULL };
-static const char *mpcnext[]     = { "mpc", "next", NULL };
+static const char *emmsprev[]    = { "emacsclient", "-e", "(emms-previous)", NULL };
+static const char *emmstog[]     = { "emacsclient", "-e", "(emms-pause)", NULL };
+static const char *emmsnext[]    = { "emacsclient", "-e", "(emms-next)", NULL };
 /* screenshot control */
 static const char *flameselect[] = { "flameshot", "launcher", NULL };
 static const char *flameall[]    = { "flameshot", "full", NULL };
@@ -105,9 +105,9 @@ static const Key keys[] = {
   { 0,                            XK_F6,     spawn,          {.v = togmute } },
   { 0,                            XK_F7,     spawn,          {.v = lowervol } },
   { 0,                            XK_F8,     spawn,          {.v = uppervol } },
-  { 0,                            XK_F9,     spawn,          {.v = mpcprev } },
-  { 0,                            XK_F10,    spawn,          {.v = togmpc } },
-  { 0,                            XK_F11,    spawn,          {.v = mpcnext } },
+  { 0,                            XK_F9,     spawn,          {.v = emmsprev } },
+  { 0,                            XK_F10,    spawn,          {.v = emmstog } },
+  { 0,                            XK_F11,    spawn,          {.v = emmsnext } },
   { 0,                            XK_Print,  spawn,          {.v = flameselect } },
   { 0|ShiftMask,                  XK_Print,  spawn,          {.v = flameall } },
   { MODKEY,                       XK_l,      togglebar,      {0} },
diff --git a/.config/guix/modules/utils.scm b/.config/guix/modules/utils.scm
deleted file mode 100644
index 5ead6e4..0000000
--- a/.config/guix/modules/utils.scm
+++ /dev/null
@@ -1,40 +0,0 @@
-(define-module (modules utils)
-  #:use-module (gnu packages emulators)
-  #:use-module (gnu packages games)
-  #:use-module (gnu packages mpd)
-  #:use-module (gnu services)
-  #:use-module (gnu services audio)
-  #:use-module (modules ymir)
-  #:export (bd-mpd-package
-            bd-games-packages
-            bd-mpd-service))
-
-
-(define bd-mpd-package
-  (list
-   ;; if the user can't access mpd directly,
-   ;; emms will fail to parse the supported
-   ;; file types :)
-   mpd
-   mpd-mpc
-   ))
-
-(define bd-games-packages
-  (list
-   bsnes
-   mgba
-   mupen64plus-audio-sdl
-   mupen64plus-rsp-hle
-   mupen64plus-ui-console
-   mupen64plus-video-glide64mk2
-   nethack
-   ))
-
-(define bd-mpd-service
-  (list
-   (service mpd-service-type
-            (mpd-configuration
-             (user user)
-             (music-directory "~/ik/music")
-             (playlist-directory "~/ik/playlist")
-             (default-port 6600)))))