diff --git a/doom/config.el b/doom/config.el
index a27c50f..889e47a 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -78,6 +78,20 @@
 ;; Elfeed
 (add-hook! 'elfeed-search-mode-hook #'elfeed-update)
 
+;; org-recur
+(use-package! org-recur
+  :hook ((org-mode . org-recur-mode)
+         (org-agenda-mode . org-recur-agenda-mode))
+  :demand t
+  :config
+  (define-key org-recur-mode-map (kbd "C-c d") 'org-recur-finish)
+
+  ;; Rebind the 'd' key in org-agenda (default: `org-agenda-day-view').
+  (define-key org-recur-agenda-mode-map (kbd "d") 'org-recur-finish)
+  (define-key org-recur-agenda-mode-map (kbd "C-c d") 'org-recur-finish)
+
+  (setq org-recur-finish-done t
+        org-recur-finish-archive t))
 ;; Latex config
 (add-hook 'LaTeX-mode-hook
           (lambda ()
diff --git a/doom/packages.el b/doom/packages.el
index d3dc39e..003bd04 100644
--- a/doom/packages.el
+++ b/doom/packages.el
@@ -9,6 +9,7 @@
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 (package! just-mode)
 (package! wakatime-mode)
+(package! org-recur)
 
 (package! prisma-mode :recipe (:host github :repo "pimeys/emacs-prisma-mode" :branch "main"))
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 4e7be68..62a189a 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -24,6 +24,11 @@
     pkgs.bat
     pkgs.just
     pkgs.tokei
+
+    pkgs.gopls
+    pkgs.delve
+    pkgs.gore
+    pkgs.gotests
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -59,8 +64,16 @@
   programs.home-manager.enable = true;
 
   # Shell configurations
+  programs.alacritty = {
+      enable = true;
+    };
+
   programs.fish = {
       enable = true;
+      shellInit = ''
+        fish_add_path $HOME/.emacs.d/bin/
+        fish_add_path $HOME/.cargo/bin/
+      '';
       loginShellInit = ''
         set -x XDG_DATA_DIRS $HOME/.nix-profile/share:$XDG_DATA_DIRS
       '';
@@ -112,6 +125,10 @@
   programs.emacs = {
       enable = true;
       package = pkgs.emacs;
+
+      extraPackages = epkgs: [
+        epkgs.vterm
+      ];
     };
 
   programs.neovim = {