diff options
Diffstat (limited to 'oni/packages')
-rw-r--r-- | oni/packages/emacs-config.scm | 13 | ||||
-rw-r--r-- | oni/packages/emacs.scm | 21 | ||||
-rw-r--r-- | oni/packages/mpd.scm | 30 | ||||
-rw-r--r-- | oni/packages/stumpwm.scm | 35 |
4 files changed, 88 insertions, 11 deletions
diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index 9fe2d7c..2b5fa49 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -14,7 +14,7 @@ #:use-module (oni packages emacs)) (define-public emacs-oni-config - (let ((commit "6747a3693c6320f0b0f3a49283c6b4d1a53fc3fa") + (let ((commit "89f4dc62348a347ca6d8e0391d33639aef87d965") (revision "0")) (package (name "emacs-oni-config") @@ -27,7 +27,7 @@ (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0k4jqbiakxmahxxylfvzhbmhw4a12wid0smk83x016bmhb068slg")))) + (base32 "07r4vgp27mwa1ianwz0vf5ip5vd52m5czskygkbf9c9pa5hmr31n")))) (build-system emacs-build-system) (home-page "https://code.ryuslash.org/emacs-config/about/") (synopsis "My Emacs configuration") @@ -322,21 +322,14 @@ Emacs"))) #:emacs ,emacs)) (propagated-inputs (list emacs-oni-yasnippet - emacs-oni-alert emacs-oni-hydra emacs-org-roam emacs-org emacs-org-contrib - emacs-org-bullets emacs-org-edna emacs-diminish - emacs-all-the-icons emacs-olivetti - emacs-form-feed - emacs-org-pretty-table - emacs-ob-async - emacs-org-ql - emacs-org-super-agenda)) + emacs-org-pretty-table)) (synopsis "My Emacs Org configuration") (description "This package provides my configuration for org"))) diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm index 591a32a..d2d6028 100644 --- a/oni/packages/emacs.scm +++ b/oni/packages/emacs.scm @@ -642,3 +642,24 @@ faster and I highly recommend its usage if your Emacs version permits.") (description "My cat is named Yoshi and I was just working on a random new theme, which was new-theme for a while. I couldn't think of a name so I named it after him.") (license license:gpl3+)))) + +(define-public emacs-fic-mode + (let ((commit "a05fc36ed54ba0c6dc22ac216a6a72cf191ca13d") + (revision "0")) + (package + (name "emacs-fic-mode") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (uri (git-reference + (url "https://github.com/lewang/fic-mode.git") + (commit commit))) + (method git-fetch) + (file-name (git-file-name name version)) + (sha256 + (base32 "074dfwdir2dx5cpbjk1ac8d3hkjkrylivy7agir5mnmzjm3bs9gw")))) + (build-system emacs-build-system) + (home-page "https://github.com/lewang/fic-mode.git") + (synopsis "Add TODO, FIXME, etc highlighting in comments and strings.") + (description "Add TODO, FIXME, etc highlighting in comments and strings.") + (license license:gpl3+)))) diff --git a/oni/packages/mpd.scm b/oni/packages/mpd.scm index cb1cac1..a2c1e49 100644 --- a/oni/packages/mpd.scm +++ b/oni/packages/mpd.scm @@ -6,8 +6,14 @@ #:use-module (gnu packages mpd) #:use-module (gnu packages gnome) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) + #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (gnu packages python-web) + #:use-module (gnu packages music) + #:use-module (gnu packages check)) (define-public mpd-notify (let ((commit "1bf3786878eb499b6a0c56e47ba3f3e07cd81182") @@ -76,3 +82,25 @@ (synopsis "A simple script that populates the MPD playlist with all of my albums in random order.") (description "Creates a new playlist in MPD with all of the albums in my database and shuffles them by album.") (license license:gpl3+)))) + +(define-public mpdscrobble + (let ((commit "c4314b026183a2b38673db898deb98f24dfb3901") + (revision "0")) + (package + (name "python-mpdscrobble") + (version (git-version "0.3.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dbeley/mpdscrobble") + (commit commit))) + (sha256 + (base32 "1kixss0s182hhl52qrr646zswx0c81si6jxz08jc8sal8y1rm4ql")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-httpx python-pylast python-mpd2)) + (home-page "https://github.com/dbeley/mpdscrobble") + (synopsis "A simple Last.fm scrobbler for MPD.") + (description "This package provides a simple Last.fm scrobbler for MPD.") + (license license:expat)))) diff --git a/oni/packages/stumpwm.scm b/oni/packages/stumpwm.scm new file mode 100644 index 0000000..15c2478 --- /dev/null +++ b/oni/packages/stumpwm.scm @@ -0,0 +1,35 @@ +(define-module (oni packages stumpwm) + #:use-module (guix packages) + #:use-module (guix utils) + #:use-module (gnu packages wm) + #:use-module (gnu packages lisp-xyz)) + +(define-public stumpwm+swank + (package + (inherit stumpwm) + (name "stumpwm-with-swank") + (outputs '("out")) + (inputs + `(("stumpwm" ,stumpwm) + ("swank" ,sbcl-slime-swank))) + (arguments + (substitute-keyword-arguments (package-arguments stumpwm) + ((#:phases phases) + `(modify-phases ,phases + (replace 'build-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (program (string-append out "/bin/stumpwm"))) + (setenv "HOME" "/tmp") + (build-program program outputs + #:entry-program '((stumpwm:stumpwm) 0) + #:dependencies '("stumpwm" "swank") + #:dependency-prefixes + (map (lambda (input) (assoc-ref inputs input)) + '("stumpwm" "swank"))) + #t))) + (delete 'copy-source) + (delete 'build) + (delete 'check) + (delete 'remove-temporary-cache) + (delete 'cleanup))))))) |