diff --git a/doom.d/config.el b/doom.d/config.el
index eb57731..772570d 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -78,3 +78,5 @@
 (use-package! pinentry
   :init (setq epa-pinentry-mode `loopback)
   (pinentry-start))
+
+(setenv "SSH_AUTH_SOCK" "/run/user/1000/gnupg/S.gpg-agent.ssh")
diff --git a/doom.d/init.el b/doom.d/init.el
index 0706f24..db58f22 100644
--- a/doom.d/init.el
+++ b/doom.d/init.el
@@ -45,10 +45,10 @@
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
        ;;tabs              ; a tab bar for Emacs
        treemacs          ; a project drawer, like neotree but cooler
-       ;;unicode           ; extended unicode support for various languages
+       unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
-       ;;window-select     ; visually switch windows
+       window-select     ; visually switch windows
        workspaces        ; tab emulation, persistence & separate workspaces
        ;;zen               ; distraction-free coding or writing
 
@@ -56,7 +56,7 @@
        (evil +everywhere); come to the dark side, we have cookies
        file-templates    ; auto-snippets for empty files
        fold              ; (nigh) universal code folding
-       ;;(format +onsave)  ; automated prettiness
+       (format +onsave)  ; automated prettiness
        ;;god               ; run Emacs commands without modifier keys
        ;;lispy             ; vim for lisp, for people who don't like vim
        ;;multiple-cursors  ; editing in many places at once
@@ -81,14 +81,14 @@
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
-       ;;(spell +flyspell) ; tasing you for misspelling mispelling
+       (spell +flyspell) ; tasing you for misspelling mispelling
        grammar           ; tasing grammar mistake every you make
 
        :tools
        ;;ansible
        ;;biblio            ; Writes a PhD for you (citation needed)
        ;;debugger          ; FIXME stepping through code, to help you add bugs
-       ;;direnv
+       direnv
        ;;docker
        ;;editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
@@ -111,7 +111,7 @@
        :os
        (:if IS-MAC macos)  ; improve compatibility with macOS
        tty               ; improve the terminal Emacs experience
-       (exwm +status +xim)
+       (exwm +status)
 
        :lang
        ;;agda              ; types of types of types of types...
diff --git a/doom.d/modules/os/exwm/config.el b/doom.d/modules/os/exwm/config.el
index 0c7823f..3bfc38f 100644
--- a/doom.d/modules/os/exwm/config.el
+++ b/doom.d/modules/os/exwm/config.el
@@ -101,25 +101,12 @@
                     (call-process
                      "xrandr" nil nil nil
                      "--output" (match-string 1) "--primary" "--auto"
-                     "--output" default-output "--off")
+                     "--output" default-output "--off"
+		     )
                     (setq exwm-randr-workspace-monitor-plist
                           (list 0 (match-string 1))))))))
   (exwm-randr-enable))
 
-;; Configure emacs input methods in all X windows.
-(when (featurep! +xim)
-  (use-package! exwm-xim
-    :after exwm
-    :config
-    ;; These variables are required for X programs to pick up Emacs IM.
-    (setenv "XMODIFIERS" "@im=exwm-xim")
-    (setenv "GTK_IM_MODULE" "xim")
-    (setenv "QT_IM_MODULE" "xim")
-    (setenv "CLUTTER_IM_MODULE" "xim")
-    (setenv "QT_QPA_PLATFORM" "xcb")
-    (setenv "SDL_VIDEODRIVER" "x11")
-    (exwm-xim-enable)))
-
 ;; Configure the rudamentary status bar.
 (when (featurep! +status)
   (setq display-time-default-load-average nil)
diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix
index 67f4b8f..2c4bc55 100644
--- a/hmModules/emacs/default.nix
+++ b/hmModules/emacs/default.nix
@@ -9,4 +9,13 @@
   services.emacs = {
     enable = true;
   };
+
+  home.packages = with pkgs; [
+    binutils
+    (ripgrep.override {withPCRE2 = true;})
+    gnutls
+    fd
+    imagemagick
+    sqlite
+  ];
 }
diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index 3c7682f..d56e6ed 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -14,6 +14,8 @@
     nix-direnv.enable = true;
   };
 
+  services.lorri.enable = true;
+
   programs.exa = {
     enable = true;
     enableAliases = true;