From 331c84986c9d919ded2642b38e46f4114f40c76f Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 4 Apr 2024 22:01:12 -0700 Subject: Add oni-python configuration --- oni/packages/emacs-config.scm | 48 +++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 13 deletions(-) (limited to 'oni/packages') diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm index f550054..60400ba 100644 --- a/oni/packages/emacs-config.scm +++ b/oni/packages/emacs-config.scm @@ -9,6 +9,8 @@ #:use-module (gnu packages bash) #:use-module ((gnu packages mail) #:select (emacs-notmuch)) + #:use-module ((gnu packages python-xyz) + #:select (python-black)) #:use-module (oni packages emacs)) (define-public emacs-oni-config @@ -395,21 +397,41 @@ Emacs"))) (synopsis "My Emacs paredit configuration") (description "This package provides my configuration for paredit"))) +(define-public emacs-oni-python + (package + (inherit emacs-oni-config) + (name "emacs-oni-python") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir-oni-python + (λ _ (chdir "oni-python")))) + #:include '("\\.el$" "^snippets\\/python-mode\\/"))) + (propagated-inputs + (list emacs-oni-yasnippet + emacs-oni-company + emacs-oni-flycheck + emacs-oni-hydra + emacs-oni-lsp + emacs-rainbow-delimiters + emacs-reformatter + python-black)))) + (define-public emacs-oni-clojure (package - (inherit emacs-oni-config) - (name "emacs-oni-clojure") - (arguments - '(#:include '("oni-clojure.el"))) - (propagated-inputs - `(("emacs-clojure-mode" ,emacs-clojure-mode) - ("emacs-oni-company" ,emacs-oni-company) - ("emacs-cider" ,emacs-cider) - ("emacs-oni-paredit" ,emacs-oni-paredit) - ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters) - ("emacs-oni-data-dir" ,emacs-oni-data-dir))) - (synopsis "My Emacs Clojure configuration") - (description "This package provides my configuration for Clojure"))) + (inherit emacs-oni-config) + (name "emacs-oni-clojure") + (arguments + '(#:include '("oni-clojure.el"))) + (propagated-inputs + `(("emacs-clojure-mode" ,emacs-clojure-mode) + ("emacs-oni-company" ,emacs-oni-company) + ("emacs-cider" ,emacs-cider) + ("emacs-oni-paredit" ,emacs-oni-paredit) + ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters) + ("emacs-oni-data-dir" ,emacs-oni-data-dir))) + (synopsis "My Emacs Clojure configuration") + (description "This package provides my configuration for Clojure"))) (define-public emacs-oni-cmake (package -- cgit v1.2.3-54-g00ecf