Fix stumpwm ‘*user-keybindings*’ definition

oni/home/config/rincewind.scm

@@ -29,7 +29,12 @@
   #:use-module ((gnu packages music)
                 #:select (easytag))
   #:use-module ((gnu packages tree-sitter)
-                #:select (tree-sitter-bash))
+                #:select (tree-sitter-bash
+                          tree-sitter-scheme
+                          tree-sitter-python
+                          tree-sitter-org
+                          tree-sitter-json
+                          tree-sitter-css))
   #:use-module ((gnu packages video)
                 #:select (mpv
                           mpv-mpris))
@@ -113,7 +118,8 @@
                           emacs-oni-gui
                           emacs-oni-magit
                           emacs-oni-notmuch
-                          emacs-oni-hy))
+                          emacs-oni-hy
+                          emacs-oni-project))
   #:use-module ((oni packages hlwm-run-or-raise)
                 #:select (hlwm-run-or-raise))
   #:use-module ((oni packages inbox-size)
@@ -222,7 +228,13 @@
                  emacs-oni-magit
                  emacs-oni-notmuch
                  emacs-oni-hy
+                 emacs-oni-project
                  tree-sitter-bash
+                 tree-sitter-scheme
+                 tree-sitter-python
+                 tree-sitter-org
+                 tree-sitter-json
+                 tree-sitter-css
                  gforth
                  recutils
                  emacs-rec-mode
@@ -295,6 +307,7 @@
                (mixed-text-file
                 "init.el"
                 "(with-eval-after-load 'hy-mode (require 'oni-hy))\n"
+                "(with-eval-after-load 'project (require 'oni-project))\n"
                 "(setq custom-file \"~/.config/emacs/custom.el\")\n"
                 "(load custom-file)\n"
                 "(provide 'init)\n"
@@ -330,4 +343,5 @@
              (database-path "/home/chelys/documents/mail")
              (user-primary-email "tom@ryuslash.org")
              (user-other-email '("ryuslash@gmail.com" "tom@iactor.nl"))
-             (new-ignore '(".nnmaildir" ".mbsyncstate" ".uidvalidity")))))))
+             (new-ignore '(".nnmaildir" ".mbsyncstate" ".uidvalidity"
+                           ".mbsyncstate.journal" ".mbsyncstate.new")))))))

oni/home/services/stumpwm/config

@@ -152,7 +152,8 @@ after it has been unlocked."
 
 (defvar *user-bindings*
   (let ((m (make-sparse-keymap)))
-    (define-key m (kbd "s") '*screenshot-bindings*)))
+    (define-key m (kbd "s") '*screenshot-bindings*)
+    m))
 
 (define-key *top-map* (kbd "s-c") '*user-bindings*)
 

oni/packages/emacs-config.scm

@@ -13,7 +13,7 @@
   #:use-module (oni packages go))
 
 (define-public emacs-oni-config
-  (let ((commit "6c97f1359599c8329f51ba8051fdd3fc1ccc82ef")
+  (let ((commit "b8c519dd2b2f3b9e300f6547cd0e2ea7c2fcf7ed")
         (revision "0"))
     (package
       (name "emacs-oni-config")
@@ -26,7 +26,7 @@
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1za8ywvx0q24f2mqy0dbskj7irp73ypvjxy7l5d4724icpj38ycx"))))
+          (base32 "1i3097qz28v4pmsfwg33l0zqpg4js8yz10jqvsgqgfnr60034nfy"))))
       (build-system emacs-build-system)
       (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
       (synopsis "My Emacs configuration")
@@ -615,3 +615,12 @@ Emacs")))
            emacs-rainbow-delimiters))
     (synopsis "My Hy configuration")
     (description "This package provides my configuration for Hy.")))
+
+(define-public emacs-oni-project
+  (package
+    (inherit emacs-oni-config)
+    (name "emacs-oni-project")
+    (arguments
+     '(#:include '("oni-project\\.el$")))
+    (synopsis "My project.el configuration")
+    (description "This package provides my configuration for project.el.")))