pop-os: Add new Emacs configuration packagesHEADmain

3 files changed, 30 insertions, 7 deletions

diff --git a/oni/home/config/pop-os.scm b/oni/home/config/pop-os.scm
index 31350fa..8f01330 100644
--- a/oni/home/config/pop-os.scm
+++ b/oni/home/config/pop-os.scm
@@ -226,6 +226,8 @@
                    emacs-oni-js
                    emacs-oni-elfeed
                    emacs-oni-eshell
+                   emacs-oni-outline
+                   emacs-oni-sql
 
                    emacs-flycheck-phpstan
                    emacs-vue-ts-mode
diff --git a/oni/home/config/pop-os/emacs.el b/oni/home/config/pop-os/emacs.el
index daaaac9..d055d9e 100644
--- a/oni/home/config/pop-os/emacs.el
+++ b/oni/home/config/pop-os/emacs.el
@@ -1256,8 +1256,9 @@ Optional argument STOPP means stop on any defect."
 
 (require 'oni-js)
 
-(with-eval-after-load 'sh-script
-  (require 'oni-sh))
+(with-eval-after-load 'sh-script (require 'oni-sh))
+(with-eval-after-load 'sql (require 'oni-sql))
+(with-eval-after-load 'outline (require 'oni-outline))
 
 (eval-when-compile
   (require 'magit-section))
diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index 4aeee76..bab490c 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -38,7 +38,7 @@
 
 (define-public emacs-oni-config
   (let
-      ((commit "ddabed921df62062010156178317c79e612e889d")
+      ((commit "0e8038216d43d979c31a440bace1402819173207")
        (revision "0"))
     (package (name "emacs-oni-config")
              (version (git-version "0.0.1" revision commit))
@@ -46,13 +46,13 @@
               (origin (method git-fetch)
                       (uri
                        (git-reference
-                        (url
-                         "git://code.ryuslash.org/emacs-config.git")
-                        (commit commit)))
+                         (url
+                          "git://code.ryuslash.org/emacs-config.git")
+                         (commit commit)))
                       (file-name (git-file-name name version))
                       (sha256
                        (base32
-                        "02jgsg42qa6nw8bzd6rn17cnkj8pfy4i788cjsyygxy3z01kcs3c"))))
+                        "10d3nanyh86jb0g6xj63gvhmrcp6ck60frgpfx8xikgdhcj53qrs"))))
              (build-system emacs-build-system)
              (home-page "https://code.ryuslash.org/emacs-config/")
              (synopsis "My Emacs configuration")
@@ -1021,3 +1021,23 @@ Emacs")))
     (synopsis "My configuration for JavaScript.")
     (description
      "This package provides my configuration for editing JavaScript files.")))
+
+(define-public emacs-oni-outline
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-outline")
+    (arguments
+     '(#:include '("oni-outline\\.el$")))
+    (synopsis "My configuration for outline-mode and outline-minor-mode")
+    (description
+     "This package provides my configuration for outline modes.")))
+
+(define-public emacs-oni-sql
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-sql")
+    (arguments
+     '(#:include '("oni-sql\\.el$")))
+    (synopsis "My configuration for sql-mode")
+    (description
+     "This package provides my configuration for sql mode.")))