From ce58d1f8e7f7334b30f714a56ee1a3f9054e39b3 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 15 Jun 2024 00:01:51 -0600 Subject: Renamed mpd.scm to utils.scm, added some emulators --- .config/guix/modules/mpd.scm | 26 -------------------------- .config/guix/modules/utils.scm | 36 ++++++++++++++++++++++++++++++++++++ .config/guix/vali.scm | 3 ++- 3 files changed, 38 insertions(+), 27 deletions(-) delete mode 100644 .config/guix/modules/mpd.scm create mode 100644 .config/guix/modules/utils.scm diff --git a/.config/guix/modules/mpd.scm b/.config/guix/modules/mpd.scm deleted file mode 100644 index 9a4e5a0..0000000 --- a/.config/guix/modules/mpd.scm +++ /dev/null @@ -1,26 +0,0 @@ -(define-module (modules mpd) - #:use-module (gnu packages mpd) - #:use-module (gnu services) - #:use-module (gnu services audio) - #:use-module (modules ymir) - #:export (bd-mpd-package - 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-mpd-service - (list - (service mpd-service-type - (mpd-configuration - (user user) - (music-directory "~/ik/music") - (playlist-directory "~/ik/playlist") - (default-port 6600))))) diff --git a/.config/guix/modules/utils.scm b/.config/guix/modules/utils.scm new file mode 100644 index 0000000..dfe058f --- /dev/null +++ b/.config/guix/modules/utils.scm @@ -0,0 +1,36 @@ +(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 + xonotic + )) + +(define bd-mpd-service + (list + (service mpd-service-type + (mpd-configuration + (user user) + (music-directory "~/ik/music") + (playlist-directory "~/ik/playlist") + (default-port 6600))))) diff --git a/.config/guix/vali.scm b/.config/guix/vali.scm index 46b36bb..82411c0 100644 --- a/.config/guix/vali.scm +++ b/.config/guix/vali.scm @@ -14,7 +14,7 @@ #:use-module (gnu services guix) #:use-module (guix gexp) #:use-module (modules base) - #:use-module (modules mpd) + #:use-module (modules utils) #:use-module (modules xorg) #:use-module (modules ymir)) @@ -36,6 +36,7 @@ `(,@bd-base-system-packages ,@bd-desktop-system-packages ,@bd-mpd-package + ;; ,@bd-games-packages ;; machine-specific packages ,@(list -- cgit v1.2.3