diff --git a/home.nix b/home.nix
index 10b83a1..9f91f9d 100644
--- a/home.nix
+++ b/home.nix
@@ -127,10 +127,12 @@
       terminal = "screen-256color";
     };
 
-    emacs = {
+    emacs = if (pkgs.stdenv.isLinux) then {
       enable = true;
       extraPackages = epkgs: [ epkgs.vterm ];
-    };
+    }
+    else 
+      {};
   
     vim = {
       enable = true;
diff --git a/home/.doom.d/config.el b/home/.doom.d/config.el
index f68fa32..99833c2 100644
--- a/home/.doom.d/config.el
+++ b/home/.doom.d/config.el
@@ -58,11 +58,8 @@
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
 ;;
-(after! wakatime-mode
-  (global-wakatime-mode))
-
-(after! pinentry
-  (pinentry-start))
+(global-wakatime-mode)
+(pinentry-start)
 
 (add-hook 'js2-mode-hook 'prettier-js-mode)
 (add-hook 'typescript-mode-hook 'prettier-js-mode)
diff --git a/home/.doom.d/init.el b/home/.doom.d/init.el
index f56b806..7ae5a8a 100644
--- a/home/.doom.d/init.el
+++ b/home/.doom.d/init.el
@@ -157,7 +157,7 @@
        rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        (ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       (rust +lsp)             ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor