4 files changed, 82 insertions, 6 deletions
diff --git a/oni/home/services/emacs.scm b/oni/home/services/emacs.scm
index be0fc7c..cf8b862 100644
--- a/oni/home/services/emacs.scm
+++ b/oni/home/services/emacs.scm
@@ -87,7 +87,10 @@
             home-emacs-org-journal-configuration
 
             home-emacs-flyover-service-type
-            home-emacs-flyover-configuration))
+            home-emacs-flyover-configuration
+
+            home-emacs-org-mem-service-type
+            home-emacs-org-mem-configuration))
 
 (define-maybe string)
 
@@ -889,3 +892,37 @@
    (compose identity)
    (default-value (home-emacs-flyover-configuration))
    (description "Install and configure emacs-flyover")))
+
+;;; Org-mem
+
+(define-configuration/no-serialization home-emacs-org-mem-configuration
+  (package
+    (package emacs-org-mem)
+    "Package to installnd configure for org-mem.")
+  (extra-content
+   (text-config '())
+   "Extra content for org-mem configuration."))
+
+(define (add-emacs-org-mem-configuration config)
+  (home-emacs-extension
+   (configurations
+    (append
+     (list (local-file "emacs/org-mem.el"))
+     (home-emacs-org-mem-configuration-extra-content config)))))
+
+(define (add-emacs-org-mem-packages config)
+  (list (home-emacs-org-mem-configuration-package config)))
+
+(define home-emacs-org-mem-service-type
+  (service-type
+   (name 'home-org-mem)
+   (extensions
+    (list (service-extension
+           home-emacs-service-type
+           add-emacs-org-mem-configuration)
+          (service-extension
+           home-profile-service-type
+           add-emacs-org-mem-packages)))
+   (compose identity)
+   (default-value (home-emacs-org-mem-configuration))
+   (description "Installnd configure emacs-org-mem.")))
diff --git a/oni/home/services/emacs/org-mem.el b/oni/home/services/emacs/org-mem.el
new file mode 100644
index 0000000..55b521f
--- /dev/null
+++ b/oni/home/services/emacs/org-mem.el
@@ -0,0 +1,6 @@
+(use-package org-mem
+  :ensure nil
+  :init
+  (setq org-mem-watch-dirs (list (expand-file-name "~/documents/gtd/"))
+        org-mem-do-sync-with-org-id t)
+  (org-mem-updater-mode))
diff --git a/oni/home/services/stumpwm/stumpwm.lisp b/oni/home/services/stumpwm/stumpwm.lisp
index b8d8207..93484a4 100644
--- a/oni/home/services/stumpwm/stumpwm.lisp
+++ b/oni/home/services/stumpwm/stumpwm.lisp
@@ -30,7 +30,7 @@ after it has been unlocked."
 
 (defcommand raise-browser () ()
   "Open or show my browser"
-  (run-or-raise "firefox" '(:class "firefox|zen(-beta)?|Org\.chromium\.Chromium")))
+  (run-or-raise "firefox" '(:class "firefox|zen(-beta)?|Org\.chromium\.Chromium|glide-glide")))
 
 (defcommand raise-emacs () ()
   "Open or show Emacs"
diff --git a/oni/home/services/zsh.scm b/oni/home/services/zsh.scm
index e8b6a14..aa2eb60 100644
--- a/oni/home/services/zsh.scm
+++ b/oni/home/services/zsh.scm
@@ -7,8 +7,7 @@
   #:use-module (gnu home services utils)
   #:use-module (guix packages)
   #:use-module (guix gexp)
-  #:use-module ((oni packages atuin)
-                #:select (rust-atuin-18))
+  #:use-module (rosenthal packages rust-apps)
   #:use-module (oni packages zsh)
 
   #:export (home-zsh-autosuggestions-service-type
@@ -22,7 +21,9 @@
             home-zsh-atuin-service-type
             home-zsh-atuin-configuration
             home-zsh-completions-service-type
-            home-zsh-completions-configuration))
+            home-zsh-completions-configuration
+            home-zsh-direnv-service-type
+            home-zsh-direnv-configuration))
 
 (define-maybe string)
 
@@ -178,7 +179,7 @@
 
 (define-configuration home-zsh-atuin-configuration
   (package
-    (package rust-atuin-18)
+    (package atuin)
     "Package to use for setting atuin.")
   (inline-height
    (integer 40)
@@ -276,3 +277,35 @@ statistics. For example, consider kubectl get rather than just kubectl.")
     (compose identity)
     (default-value (home-zsh-completions-configuration))
     (description "Install and configure zsh-completions.")))
+
+(define-configuration home-zsh-direnv-configuration
+  (package
+    (package direnv)
+    "Package to use for setting direnv."))
+
+(define (add-zsh-direnv-packages config)
+  (list (home-zsh-direnv-configuration-package config)))
+
+(define (add-zsh-direnv config)
+  (home-zsh-extension
+   (zshrc
+    (list
+     (mixed-text-file
+      "zshrc"
+      "eval \"$("
+      (home-zsh-direnv-configuration-package config)
+      "/bin/direnv hook zsh)\"")))))
+
+(define home-zsh-direnv-service-type
+  (service-type
+   (name 'home-zsh-direnv)
+   (extensions
+    (list (service-extension
+           home-profile-service-type
+           add-zsh-direnv-packages)
+          (service-extension
+           home-zsh-service-type
+           add-zsh-direnv)))
+   (compose identity)
+   (default-value (home-zsh-direnv-configuration))
+   (description "Install and configure direnv.")))