From 7499cb23051c64f0eaa7b93f74a4ea479ab85bb7 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Thu, 4 Apr 2024 22:02:39 -0700 Subject: [PATCH] Add nginx-mode for Emacs --- oni/home/config/rincewind.scm | 4 ++- oni/packages/emacs.scm | 68 +++++++++++++++++++++++------------ 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm index fa9f6ab..ac8a85b 100644 --- a/oni/home/config/rincewind.scm +++ b/oni/home/config/rincewind.scm @@ -143,7 +143,8 @@ #: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 @@ -322,6 +323,7 @@ emacs-oni-tramp emacs-oni-yaml (with-my-emacs-company-package emacs-oni-python) + emacs-nginx-mode tree-sitter-bash tree-sitter-scheme diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm index a982bf6..9ff5646 100644 --- a/oni/packages/emacs.scm +++ b/oni/packages/emacs.scm @@ -423,37 +423,59 @@ 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") - (version "20210325.2015") - (source - (origin - (method url-fetch) - (uri (string-append - "https://melpa.org/packages/nroam-" - version - ".tar")) - (sha256 - (base32 - "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-org-roam" ,emacs-org-roam) - ("emacs-org" ,emacs-org))) - (home-page - "https://github.com/NicolasPetton/nroam") - (synopsis - "Org-roam backlinks within org-mode buffers") - (description - "nroam is a supplementary package for org-roam that replaces the backlink side + (name "emacs-nroam") + (version "20210325.2015") + (source + (origin + (method url-fetch) + (uri (string-append + "https://melpa.org/packages/nroam-" + version + ".tar")) + (sha256 + (base32 + "1aybc2k8kyf2dlpbq39p3k1nsvzrhw58xarbwwq0qgz91r49m4xq")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-org-roam" ,emacs-org-roam) + ("emacs-org" ,emacs-org))) + (home-page + "https://github.com/NicolasPetton/nroam") + (synopsis + "Org-roam backlinks within org-mode buffers") + (description + "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