oni/home/config/rincewind.scm

@@ -143,8 +143,7 @@
                 #:select (emacs-inkplate
                           oni-emacs-company
                           emacs-outli
-                          emacs-syncthing-status
+                          emacs-syncthing-status))
-                          emacs-nginx-mode))
   #:use-module ((oni packages emacs-config)
                 #:select (emacs-oni-org-roam
                           emacs-oni-elfeed
@@ -192,8 +191,7 @@
                           emacs-oni-shr
                           emacs-oni-tramp
                           emacs-oni-embrace
-                          emacs-oni-yaml
+                          emacs-oni-yaml))
-                          emacs-oni-python))
   #:use-module ((oni packages hlwm-run-or-raise)
                 #:select (hlwm-run-or-raise))
   #:use-module ((oni packages inbox-size)
@@ -322,8 +320,6 @@
                  emacs-oni-shr
                  emacs-oni-tramp
                  emacs-oni-yaml
-                 (with-my-emacs-company-package emacs-oni-python)
-                 emacs-nginx-mode
 
                  tree-sitter-bash
                  tree-sitter-scheme

oni/packages/emacs-config.scm

@@ -9,12 +9,10 @@
   #: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
-  (let ((commit "5d0fe5971995503f57798601cd3a9e9e9c4c7b9d")
+  (let ((commit "2011414821fb9175c4958bb247d0f1fc52b6fbfc")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -27,7 +25,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "0lqh3qblhlbps6742w3wv3c7nlv3mipi1cjfcbw1i3b8bsc2c6rv"))))
+          (base32 "1jm0gj680wccvksc1ng08yk6f50dvc1j2iqw5w3a9b8sqkyhc49l"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")
@@ -321,22 +319,20 @@ Emacs")))
       ;; throws an error while trying to byte-compile oni-org.
       #:emacs ,emacs))
    (propagated-inputs
-    (list emacs-oni-yasnippet
+    `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
-          emacs-oni-alert
+      ("emacs-oni-alert" ,emacs-oni-alert)
-          emacs-oni-hydra
+      ("emacs-oni-hydra" ,emacs-oni-hydra)
-          emacs-org-roam
+      ("emacs-org-roam" ,emacs-org-roam)
-          emacs-org
+      ("emacs-org" ,emacs-org)
-          emacs-org-contrib
+      ("emacs-org-contrib" ,emacs-org-contrib)
-          emacs-org-bullets
+      ("emacs-org-bullets" ,emacs-org-bullets)
-          emacs-org-edna
+      ("emacs-org-edna" ,emacs-org-edna)
-          emacs-diminish
+      ("emacs-diminish" ,emacs-diminish)
-          emacs-all-the-icons
+      ("emacs-all-the-icons" ,emacs-all-the-icons)
-          emacs-olivetti
+      ("emacs-olivetti" ,emacs-olivetti)
-          emacs-form-feed
+      ("emacs-form-feed" ,emacs-form-feed)
-          emacs-org-pretty-table
+      ("emacs-org-pretty-table" ,emacs-org-pretty-table)
-          emacs-ob-async
+      ("emacs-ob-async" ,emacs-ob-async)))
-          emacs-org-ql
-          emacs-org-super-agenda))
    (synopsis "My Emacs Org configuration")
    (description "This package provides my configuration for org")))
 
@@ -399,41 +395,21 @@ 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)
+   (inherit emacs-oni-config)
-    (name "emacs-oni-clojure")
+   (name "emacs-oni-clojure")
-    (arguments
+   (arguments
-     '(#:include '("oni-clojure.el")))
+    '(#:include '("oni-clojure.el")))
-    (propagated-inputs
+   (propagated-inputs
-     `(("emacs-clojure-mode" ,emacs-clojure-mode)
+    `(("emacs-clojure-mode" ,emacs-clojure-mode)
-       ("emacs-oni-company" ,emacs-oni-company)
+      ("emacs-oni-company" ,emacs-oni-company)
-       ("emacs-cider" ,emacs-cider)
+      ("emacs-cider" ,emacs-cider)
-       ("emacs-oni-paredit" ,emacs-oni-paredit)
+      ("emacs-oni-paredit" ,emacs-oni-paredit)
-       ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
+      ("emacs-rainbow-delimiters" ,emacs-rainbow-delimiters)
-       ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
+      ("emacs-oni-data-dir" ,emacs-oni-data-dir)))
-    (synopsis "My Emacs Clojure configuration")
+   (synopsis "My Emacs Clojure configuration")
-    (description "This package provides my configuration for Clojure")))
+   (description "This package provides my configuration for Clojure")))
 
 (define-public emacs-oni-cmake
   (package

oni/packages/emacs.scm

@@ -423,59 +423,37 @@ text.")
 with character preview in completion prompt.")
      (license license:gpl3+))))
 
-(define-public emacs-nginx-mode
-  (let ((commit "de0519941ee235dcd1587f6aab68152285e1aaaa")
-        (revision "0"))
-    (package
-      (name "emacs-nginx-mode")
-      (version (git-version "1.1.9" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "git://ryuslash.org/nginx-mode.git")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1nqyz2mkhvm8ixgxla93nfmxqn0qs8vx7ma598kmyp292b3k9whr"))))
-      (build-system emacs-build-system)
-      (home-page "https://github.com/ajc/nginx-mode")
-      (synopsis "Emacs major mode for editing nginx config files")
-      (description "This package provides an Emacs major mode for
-editing nginx config files.")
-      (license license:gpl2+))))
-
 (define-public emacs-nroam
   (package
-    (name "emacs-nroam")
+   (name "emacs-nroam")
-    (version "20210325.2015")
+   (version "20210325.2015")
-    (source
+   (source
-     (origin
+    (origin
-       (method url-fetch)
+     (method url-fetch)
-       (uri (string-append
+     (uri (string-append
-             "https://melpa.org/packages/nroam-"
+           "https://melpa.org/packages/nroam-"
-             version
+           version
-             ".tar"))
+           ".tar"))
-       (sha256
+     (sha256
-        (base32
+      (base32
-         "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq"))))
+       "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq"))))
-    (build-system emacs-build-system)
+   (build-system emacs-build-system)
-    (propagated-inputs
+   (propagated-inputs
-     `(("emacs-org-roam" ,emacs-org-roam)
+    `(("emacs-org-roam" ,emacs-org-roam)
-       ("emacs-org" ,emacs-org)))
+      ("emacs-org" ,emacs-org)))
-    (home-page
+   (home-page
-     "https://github.com/NicolasPetton/nroam")
+    "https://github.com/NicolasPetton/nroam")
-    (synopsis
+   (synopsis
-     "Org-roam backlinks within org-mode buffers")
+    "Org-roam backlinks within org-mode buffers")
-    (description
+   (description
-     "nroam is a supplementary package for org-roam that replaces the backlink side
+    "nroam is a supplementary package for org-roam that replaces the backlink side
 buffer of Org-roam.  Instead, it displays org-roam backlinks at the end of
 org-roam buffers.
 
 To setup nroam for all org-roam buffers, evaluate the following:
 (add-hook 'org-mode-hook #'nroam-setup-maybe)
 ")
-    (license license:gpl3+)))
+   (license license:gpl3+)))
 
 (define-public emacs-outli
   (package